Revert "allow running without db for testing"

This reverts commit 8caea56.
kartverket · Jul 9, 2024 · d2437f9 · d2437f9
1 parent c7da069
commit d2437f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/src/main/kotlin/no/kartverket/matrikkel/bygning/Application.kt b/src/main/kotlin/no/kartverket/matrikkel/bygning/Application.kt
@@ -92,17 +92,15 @@ fun Application.internalModule() {
 
     DatabaseSingleton.init()
     val dbConnection = DatabaseSingleton.getConnection()
+    val healthRepository = HealthRepository(dbConnection)
+    val healthService = HealthService(healthRepository)
 
-    if (dbConnection != null) {
-        val healthRepository = HealthRepository(dbConnection)
-        val healthService = HealthService(healthRepository)
-
-        routing {
-            get("/metrics") {
-                call.respondText(appMicrometerRegistry.scrape())
-            }
-
-            probeRouting(healthService)
+    routing {
+        get("/metrics") {
+            call.respondText(appMicrometerRegistry.scrape())
         }
+
+        probeRouting(healthService)
     }
+
 }
diff --git a/src/main/kotlin/no/kartverket/matrikkel/bygning/db/DBSingleton.kt b/src/main/kotlin/no/kartverket/matrikkel/bygning/db/DBSingleton.kt
@@ -38,18 +38,11 @@ object DatabaseSingleton {
         }
     }
 
-    fun getConnection(): Connection? {
-        try {
-            if (connection != null) {
-                return connection as Connection
-            }
-
-            throw RuntimeException("Kunne ikke koble til database")
-
-        } catch (e: Exception) {
-            LOGGER.error(e.stackTraceToString())
-
-            return null
+    fun getConnection(): Connection {
+        if (connection != null) {
+            return connection as Connection
         }
+
+        throw RuntimeException("Kunne ikke koble til database")
     }
 }