Merge pull request #153 from navikt/pdfgen_core_upgrade

Upgrade pdfgen-core dependency

README.md

@@ -67,6 +67,8 @@ The template and data directory structure both follow the `<application>/<templa
 To enable HTML document support, use the environment variable `ENABLE_HTML_ENDPOINT=true`. This will enable the 
 HTML endpoints on `/api/v1/genhtml/<application>/<template>`. 
 
+By default pdfgen will load all assets (`templates`, `resources`, `data`) to memory on startup. Any change on files inside these folders will not be loaded before a restart of the application. However if you are developing templates you can make the application to reload the assets on every request by setting `DEV_MODE=true`.
+
 ### Upgrading the gradle wrapper
 Find the newest version of gradle here: https://gradle.org/releases/ Then run this command:
 

build.gradle.kts

@@ -16,7 +16,7 @@ val junitJupiterVersion = "5.10.1"
 val verapdfVersion = "1.24.1"
 val ktfmtVersion = "0.44"
 val testcontainersVersion=  "1.19.3"
-val pdfgencoreVersion = "1.0.3"
+val pdfgencoreVersion = "1.1.0"
 
 
 plugins {
@@ -68,6 +68,7 @@ tasks {
 
 repositories {
     mavenCentral()
+    mavenLocal()
     maven {
         url = uri("https://github-package-registry-mirror.gc.nav.no/cached/maven-release")
     }

src/main/kotlin/no/nav/pdfgen/Bootstrap.kt

@@ -12,6 +12,7 @@ import io.ktor.http.content.TextContent
 import io.ktor.http.withCharset
 import io.ktor.serialization.jackson.jackson
 import io.ktor.server.application.call
+import io.ktor.server.application.createApplicationPlugin
 import io.ktor.server.application.install
 import io.ktor.server.engine.ApplicationEngine
 import io.ktor.server.engine.embeddedServer
@@ -30,26 +31,29 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import no.nav.pdfgen.api.setupGeneratePdfApi
-import no.nav.pdfgen.core.PDFgen
-import no.nav.pdfgen.core.template.loadTemplates
+import no.nav.pdfgen.core.Environment
+import no.nav.pdfgen.core.PDFGenCore
+
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.verapdf.gf.foundry.VeraGreenfieldFoundryProvider
 
 val log: Logger = LoggerFactory.getLogger("pdfgen")
 
+
 fun main() {
-    initializeApplication(8080).start(wait = true)
+    initializeApplication(no.nav.pdfgen.Environment().port).start(wait = true)
 }
 
 fun initializeApplication(port: Int): ApplicationEngine {
     System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider")
     VeraGreenfieldFoundryProvider.initialise()
 
-    PDFgen.init(no.nav.pdfgen.core.Environment())
+    val environment = no.nav.pdfgen.Environment()
+    val coreEnvironment = Environment()
+    PDFGenCore.init(coreEnvironment)
 
-    val env = no.nav.pdfgen.core.Environment()
-    val templates = loadTemplates()
+    val templates = coreEnvironment.templates
     val collectorRegistry: CollectorRegistry = CollectorRegistry.defaultRegistry
 
     XRLog.setLoggerImpl(Slf4jLogger())
@@ -75,6 +79,11 @@ fun initializeApplication(port: Int): ApplicationEngine {
                 )
             }
         }
+        install(createApplicationPlugin(name = "ReloadPDFGenCorePlugin") {
+            onCallReceive { call ->
+                if (environment.isDevMode) PDFGenCore.reloadEnvironment()
+            }
+        })
         routing {
             get("/internal/is_ready") { call.respondText("I'm ready") }
             get("/internal/is_alive") { call.respondText("I'm alive") }
@@ -91,7 +100,7 @@ fun initializeApplication(port: Int): ApplicationEngine {
                     }
                 }
             }
-            setupGeneratePdfApi(env)
+            setupGeneratePdfApi(environment)
         }
     }
 }

src/main/kotlin/no/nav/pdfgen/Environment.kt

@@ -0,0 +1,9 @@
+package no.nav.pdfgen
+
+data class Environment(
+    val port: Int = System.getenv("SERVER_PORT")?.toInt() ?: 8080,
+    val isDevMode: Boolean = System.getenv("DEV_MODE")?.let { it == "true" } ?: false,
+    val disablePdfGet: Boolean = System.getenv("DISABLE_PDF_GET")?.let { it == "true" } ?: false,
+    val enableHtmlEndpoint: Boolean =
+        System.getenv("ENABLE_HTML_ENDPOINT")?.let { it == "true" } ?: false,
+)

src/main/kotlin/no/nav/pdfgen/api/GeneratePdfApi.kt

@@ -16,7 +16,7 @@ import io.ktor.server.routing.post
 import io.ktor.server.routing.route
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import no.nav.pdfgen.core.Environment
+import no.nav.pdfgen.Environment
 import no.nav.pdfgen.core.OPENHTMLTOPDF_RENDERING_SUMMARY
 import no.nav.pdfgen.core.pdf.createHtml
 import no.nav.pdfgen.core.pdf.createHtmlFromTemplateData
@@ -25,7 +25,7 @@ import no.nav.pdfgen.log
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
-fun Routing.setupGeneratePdfApi(env: Environment) {
+fun Routing.setupGeneratePdfApi(env: Environment = Environment()) {
     route("/api/v1/genpdf") {
         if (!env.disablePdfGet) {
             get("/{applicationName}/{template}") {

src/main/resources/logback-test.xml

@@ -8,6 +8,7 @@
     </appender>
 
     <logger name="pdfgen" level="INFO"/>
+<!--    <logger name="no.nav.pdfgen.core" level="DEBUG"/>-->
 
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>

src/test/kotlin/no/nav/pdfgen/PdfGenITest.kt

@@ -16,6 +16,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.concurrent.Executors
 import kotlinx.coroutines.*
+import no.nav.pdfgen.core.Environment
 import no.nav.pdfgen.core.template.loadTemplates
 import org.apache.pdfbox.io.IOUtils
 import org.apache.pdfbox.pdmodel.PDDocument
@@ -28,7 +29,7 @@ internal class PdfGenITest {
     private val applicationPort = getRandomPort()
     private val application = initializeApplication(applicationPort)
     private val client = HttpClient(CIO) { expectSuccess = false }
-    private val templates = loadTemplates()
+    private val templates = Environment().templates
     private val timeoutSeconds: Long = 10
 
     @AfterEach

src/test/kotlin/no/nav/pdfgen/RenderingTest.kt

@@ -2,6 +2,7 @@ package no.nav.pdfgen
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
+import no.nav.pdfgen.core.Environment
 import java.io.ByteArrayInputStream
 import no.nav.pdfgen.core.pdf.createPDFA
 import no.nav.pdfgen.core.pdf.render
@@ -15,7 +16,7 @@ import org.verapdf.pdfa.flavours.PDFAFlavour
 import org.verapdf.pdfa.results.TestAssertion
 
 internal class RenderingTest {
-    private val templates = loadTemplates()
+    private val templates = Environment().templates
     private val objectMapper = ObjectMapper()
 
     @BeforeEach