hubert/camp2camp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use correct Pebble version + caffeine cache for templates

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-09-27 18:37:53 +02:00
parent d3bcff470c
commit d8b3c5ac72
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -74,9 +74,9 @@
<version>${openhtml.version}</version> <version>${openhtml.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mitchellbosecke</groupId> <groupId>io.pebbletemplates</groupId>
<artifactId>pebble</artifactId> <artifactId>pebble</artifactId>
<version>2.4.0</version> <version>3.1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>

2
src/main/kotlin/Modules.kt
View File

@ -43,7 +43,7 @@ val apiModule = module {
val utilsModule = module { val utilsModule = module {
single { Jackson.mapper } single { Jackson.mapper }
single { PebbleEngine(cache = false, prefix = "templates/") } single { PebbleEngine(cache = true, prefix = "templates/") }
} }
val pdfModule = module { val pdfModule = module {

8
src/main/kotlin/templates/Templates.kt
View File

@ -1,6 +1,8 @@
package be.simplenotes.c2c.templates package be.simplenotes.c2c.templates
import com.mitchellbosecke.pebble.PebbleEngine import com.mitchellbosecke.pebble.PebbleEngine
import com.mitchellbosecke.pebble.cache.tag.CaffeineTagCache
import com.mitchellbosecke.pebble.cache.template.CaffeineTemplateCache
import com.mitchellbosecke.pebble.loader.ClasspathLoader import com.mitchellbosecke.pebble.loader.ClasspathLoader
import com.mitchellbosecke.pebble.template.PebbleTemplate import com.mitchellbosecke.pebble.template.PebbleTemplate
import java.io.StringWriter import java.io.StringWriter
@ -18,4 +20,8 @@ fun PebbleEngine(cache: Boolean, prefix: String? = null, suffix: String? = ".twi
PebbleEngine.Builder().loader(ClasspathLoader().also { loader -> PebbleEngine.Builder().loader(ClasspathLoader().also { loader ->
prefix?.let { loader.prefix = it } prefix?.let { loader.prefix = it }
suffix?.let { loader.suffix = it } suffix?.let { loader.suffix = it }
}).cacheActive(cache).build() })
.cacheActive(cache)
.templateCache(CaffeineTemplateCache())
.tagCache(CaffeineTagCache())
.build()