Add directory for default database location

Modify default database connection from in-memory to on-disk
skfit-uni-luebeck · Jun 2, 2024 · 50e931f · 50e931f
1 parent 0975c23
commit 50e931f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,7 @@
 /build/
 /.gradle/
 /src/main/resources/db/
-/src/main/kotlin/de/itcr/termite/Test.kt
+/src/main/kotlin/de/itcr/termite/Test.kt
+
+/database/*
+!/database/.gitkeep
diff --git a/database/.gitkeep b/database/.gitkeep
diff --git a/logging.log b/logging.log
@@ -94,3 +94,14 @@ Caused by: java.io.FileNotFoundException: class path resource [keystore/termite.
 2024-05-14 14:31:48.692  INFO 3952 --- [https-jsse-nio-8083-exec-2] o.a.c.c.C.[.[.[/]                        : Initializing Spring DispatcherServlet 'dispatcherServlet'
 2024-05-14 14:31:48.692  INFO 3952 --- [https-jsse-nio-8083-exec-2] o.s.w.s.DispatcherServlet                : Initializing Servlet 'dispatcherServlet'
 2024-05-14 14:31:48.704  INFO 3952 --- [https-jsse-nio-8083-exec-2] o.s.w.s.DispatcherServlet                : Completed initialization in 12 ms
+2024-06-02 21:47:36.380  INFO 5436 --- [main] d.i.t.TermiteKt                          : Starting TermiteKt using Java 17.0.2 on DESKTOP-0ON02S6 with PID 5436 (E:\Paul\projects\termite-itcr\build\classes\kotlin\main started by Admin in E:\Paul\projects\termite-itcr)
+2024-06-02 21:47:36.384  INFO 5436 --- [main] d.i.t.TermiteKt                          : No active profile set, falling back to 1 default profile: "default"
+2024-06-02 21:47:37.093  INFO 5436 --- [main] o.s.b.w.e.t.TomcatWebServer              : Tomcat initialized with port(s): 8083 (http)
+2024-06-02 21:47:37.101  INFO 5436 --- [main] o.a.c.c.StandardService                  : Starting service [Tomcat]
+2024-06-02 21:47:37.102  INFO 5436 --- [main] o.a.c.c.StandardEngine                   : Starting Servlet engine: [Apache Tomcat/9.0.60]
+2024-06-02 21:47:37.201  INFO 5436 --- [main] o.a.c.c.C.[.[.[/]                        : Initializing Spring embedded WebApplicationContext
+2024-06-02 21:47:37.202  INFO 5436 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 781 ms
+2024-06-02 21:47:39.098  INFO 5436 --- [main] c.u.f.u.VersionUtil                      : HAPI FHIR version 6.1.1 - Rev af3fcda0af
+2024-06-02 21:47:39.101  INFO 5436 --- [main] c.u.f.c.FhirContext                      : Creating new FHIR context for FHIR version [R4]
+2024-06-02 21:47:39.524  INFO 5436 --- [main] o.s.b.w.e.t.TomcatWebServer              : Tomcat started on port(s): 8083 (http) with context path ''
+2024-06-02 21:47:39.535  INFO 5436 --- [main] d.i.t.TermiteKt                          : Started TermiteKt in 3.618 seconds (JVM running for 4.486)
diff --git a/src/main/kotlin/de/itcr/termite/Termite.kt b/src/main/kotlin/de/itcr/termite/Termite.kt
@@ -18,7 +18,7 @@ open class Termite{
     open fun fhirContext(): FhirContext = FhirContext.forR4()
 
     @Bean
-    open fun database(): TerminologyDatabase = TerminologyDatabase("jdbc:sqlite::memory:")
+    open fun database(): TerminologyDatabase = TerminologyDatabase("jdbc:sqlite:database/termite.db")
 
 }
 fun main(args: Array<String>){

diff --git a/src/main/kotlin/de/itcr/termite/api/ResourceController.kt b/src/main/kotlin/de/itcr/termite/api/ResourceController.kt
@@ -12,7 +12,7 @@ import org.springframework.http.RequestEntity
 abstract class ResourceController(protected val database: TerminologyStorage, private val fhirContext: FhirContext) {
 
     protected val parsers: Map<String, Pair<IParser, String>>
-    protected val jsonParser = fhirContext.newJsonParser().setPrettyPrint(true)
+    protected val jsonParser: IParser = fhirContext.newJsonParser().setPrettyPrint(true)
 
     init{
         val json = jsonParser to "json"