Main must have body

Author: androa

dp-inntekt-api/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 
 application {
     applicationName = "dp-inntekt-api"
-    mainClassName = "no.nav.dagpenger.inntekt.InntektApiKt"
+    mainClassName = "no.nav.dagpenger.inntekt.ApplicationKt"
 }
 
 val grpcVersion = "1.29.0"

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/Application.kt

@@ -25,84 +25,86 @@ import no.nav.dagpenger.oidc.StsOidcClient
 private val LOGGER = KotlinLogging.logger {}
 private val config = Configuration()
 
-fun main() = runBlocking {
-    migrate(config)
-    DefaultExports.initialize()
+fun main() {
+    runBlocking {
+        migrate(config)
+        DefaultExports.initialize()
 
-    val dataSource = dataSourceFrom(config)
-    val authApiKeyVerifier = AuthApiKeyVerifier(
-        apiKeyVerifier = ApiKeyVerifier(config.application.apiSecret),
-        clients = config.application.allowedApiKeys
-    )
-    val postgresInntektStore = PostgresInntektStore(dataSource)
-    val stsOidcClient = StsOidcClient(
-        config.application.oicdStsUrl,
-        config.application.username,
-        config.application.password
-    )
-    val inntektskomponentHttpClient = InntektskomponentHttpClient(
-        config.application.hentinntektListeUrl,
-        stsOidcClient
-    )
-    val cachedInntektsGetter = BehandlingsInntektsGetter(inntektskomponentHttpClient, postgresInntektStore)
-    val oppslagClient = OppslagClient(config.application.oppslagUrl, stsOidcClient)
-    val jwkProvider = JwkProviderBuilder(URL(config.application.jwksUrl))
-        .cached(10, 24, TimeUnit.HOURS)
-        .rateLimited(10, 1, TimeUnit.MINUTES)
-        .build()
+        val dataSource = dataSourceFrom(config)
+        val authApiKeyVerifier = AuthApiKeyVerifier(
+            apiKeyVerifier = ApiKeyVerifier(config.application.apiSecret),
+            clients = config.application.allowedApiKeys
+        )
+        val postgresInntektStore = PostgresInntektStore(dataSource)
+        val stsOidcClient = StsOidcClient(
+            config.application.oicdStsUrl,
+            config.application.username,
+            config.application.password
+        )
+        val inntektskomponentHttpClient = InntektskomponentHttpClient(
+            config.application.hentinntektListeUrl,
+            stsOidcClient
+        )
+        val cachedInntektsGetter = BehandlingsInntektsGetter(inntektskomponentHttpClient, postgresInntektStore)
+        val oppslagClient = OppslagClient(config.application.oppslagUrl, stsOidcClient)
+        val jwkProvider = JwkProviderBuilder(URL(config.application.jwksUrl))
+            .cached(10, 24, TimeUnit.HOURS)
+            .rateLimited(10, 1, TimeUnit.MINUTES)
+            .build()
 
-    // Marks inntekt as used
-    val subsumsjonBruktDataConsumer =
-        KafkaSubsumsjonBruktDataConsumer(config, postgresInntektStore).apply {
-            listen()
-        }.also {
-            Runtime.getRuntime().addShutdownHook(Thread {
-                it.stop()
-            })
-        }
+        // Marks inntekt as used
+        val subsumsjonBruktDataConsumer =
+            KafkaSubsumsjonBruktDataConsumer(config, postgresInntektStore).apply {
+                listen()
+            }.also {
+                Runtime.getRuntime().addShutdownHook(Thread {
+                    it.stop()
+                })
+            }
 
-    // Provides a gRPC server for getting inntekt
-    InntektGrpcServer(
-        port = 50051,
-        inntektStore = postgresInntektStore,
-        apiKeyVerifier = authApiKeyVerifier
-    ).also {
-        launch {
-            it.start()
-            it.blockUntilShutdown()
+        // Provides a gRPC server for getting inntekt
+        InntektGrpcServer(
+            port = 50051,
+            inntektStore = postgresInntektStore,
+            apiKeyVerifier = authApiKeyVerifier
+        ).also {
+            launch {
+                it.start()
+                it.blockUntilShutdown()
+            }
         }
-    }
 
-    // Provides a HTTP API for getting inntekt
-    embeddedServer(Netty, port = config.application.httpPort) {
-        inntektApi(
-            inntektskomponentHttpClient,
-            postgresInntektStore,
-            cachedInntektsGetter,
-            oppslagClient,
-            authApiKeyVerifier,
-            jwkProvider,
-            listOf(
-                postgresInntektStore as HealthCheck,
-                subsumsjonBruktDataConsumer as HealthCheck
+        // Provides a HTTP API for getting inntekt
+        embeddedServer(Netty, port = config.application.httpPort) {
+            inntektApi(
+                inntektskomponentHttpClient,
+                postgresInntektStore,
+                cachedInntektsGetter,
+                oppslagClient,
+                authApiKeyVerifier,
+                jwkProvider,
+                listOf(
+                    postgresInntektStore as HealthCheck,
+                    subsumsjonBruktDataConsumer as HealthCheck
+                )
             )
-        )
-    }.start().also {
-        Runtime.getRuntime().addShutdownHook(Thread {
-            it.stop(5, 60, TimeUnit.SECONDS)
-        })
-    }
-
-    // Cleans up unused inntekt on a regular interbal
-    Vaktmester(dataSource).also {
-        fixedRateTimer(
-            name = "vaktmester",
-            initialDelay = TimeUnit.MINUTES.toMillis(10),
-            period = TimeUnit.HOURS.toMillis(12),
-            action = {
-                LOGGER.info { "Vaktmesteren rydder" }
-                it.rydd()
-                LOGGER.info { "Vaktmesteren er ferdig... for denne gang" }
+        }.start().also {
+            Runtime.getRuntime().addShutdownHook(Thread {
+                it.stop(5, 60, TimeUnit.SECONDS)
             })
+        }
+
+        // Cleans up unused inntekt on a regular interbal
+        Vaktmester(dataSource).also {
+            fixedRateTimer(
+                name = "vaktmester",
+                initialDelay = TimeUnit.MINUTES.toMillis(10),
+                period = TimeUnit.HOURS.toMillis(12),
+                action = {
+                    LOGGER.info { "Vaktmesteren rydder" }
+                    it.rydd()
+                    LOGGER.info { "Vaktmesteren er ferdig... for denne gang" }
+                })
+        }
     }
 }