Simplify StubServiceBuilder etc.

Author: hestad

.env.azure.template

@@ -1,5 +1,5 @@
 # Spesifikke azure-variable dersom man ønsker å kjøre auth direkte mot azure i pre-prod istedenfor en mock.
-# Husk at du må endre tilsvarende i su-se-bakover
+# Husk at du må endre tilsvarende i su-se-framover
 AZURE_APP_WELL_KNOWN_URL=https://login.microsoftonline.com/966ac572-f5b7-4bbe-aa88-c76419c0f851/v2.0/.well-known/openid-configuration
 AZURE_APP_CLIENT_ID=<hent fra kubernetes>
 

service/src/main/kotlin/no/nav/su/se/bakover/service/ProdServiceBuilder.kt

@@ -24,8 +24,8 @@ import no.nav.su.se.bakover.service.utbetaling.UtbetalingServiceImpl
 import no.nav.su.se.bakover.service.vedtak.snapshot.OpprettVedtakssnapshotService
 import java.time.Clock
 
-object ProdServiceBuilder : ServiceBuilder {
-    override fun build(
+object ProdServiceBuilder {
+    fun build(
         databaseRepos: DatabaseRepos,
         clients: Clients,
         behandlingMetrics: BehandlingMetrics,

service/src/main/kotlin/no/nav/su/se/bakover/service/ServiceBuilder.kt service/src/main/kotlin/no/nav/su/se/bakover/service/Services.kt

@@ -1,10 +1,5 @@
 package no.nav.su.se.bakover.service
 
-import no.finn.unleash.Unleash
-import no.nav.su.se.bakover.client.Clients
-import no.nav.su.se.bakover.database.DatabaseRepos
-import no.nav.su.se.bakover.domain.behandling.BehandlingMetrics
-import no.nav.su.se.bakover.domain.søknad.SøknadMetrics
 import no.nav.su.se.bakover.service.avstemming.AvstemmingService
 import no.nav.su.se.bakover.service.brev.BrevService
 import no.nav.su.se.bakover.service.oppgave.OppgaveService
@@ -18,18 +13,6 @@ import no.nav.su.se.bakover.service.søknadsbehandling.FerdigstillSøknadsbehand
 import no.nav.su.se.bakover.service.søknadsbehandling.SøknadsbehandlingService
 import no.nav.su.se.bakover.service.toggles.ToggleService
 import no.nav.su.se.bakover.service.utbetaling.UtbetalingService
-import java.time.Clock
-
-interface ServiceBuilder {
-    fun build(
-        databaseRepos: DatabaseRepos,
-        clients: Clients,
-        behandlingMetrics: BehandlingMetrics,
-        søknadMetrics: SøknadMetrics,
-        clock: Clock,
-        unleash: Unleash,
-    ): Services
-}
 
 data class Services(
     val avstemming: AvstemmingService,

service/src/main/kotlin/no/nav/su/se/bakover/service/StubServiceBuilder.kt

@@ -25,6 +25,7 @@ import io.ktor.routing.Route
 import io.ktor.routing.routing
 import io.ktor.util.KtorExperimentalAPI
 import no.finn.unleash.DefaultUnleash
+import no.finn.unleash.FakeUnleash
 import no.finn.unleash.util.UnleashConfig
 import no.nav.su.se.bakover.client.Clients
 import no.nav.su.se.bakover.client.ProdClientsBuilder
@@ -44,7 +45,6 @@ import no.nav.su.se.bakover.domain.søknadsbehandling.StatusovergangVisitor
 import no.nav.su.se.bakover.service.AccessCheckProxy
 import no.nav.su.se.bakover.service.ProdServiceBuilder
 import no.nav.su.se.bakover.service.Services
-import no.nav.su.se.bakover.service.StubServiceBuilder
 import no.nav.su.se.bakover.service.Tilgangssjekkfeil
 import no.nav.su.se.bakover.web.features.Authorization
 import no.nav.su.se.bakover.web.features.AuthorizationException
@@ -105,29 +105,32 @@ internal fun Application.susebakover(
                 jmsConfig,
                 clock = clock,
             ).build(applicationConfig),
-    services: Services =
-        with(
-            if (applicationConfig.runtimeEnvironment == ApplicationConfig.RuntimeEnvironment.Nais)
-                ProdServiceBuilder
-            else
-                StubServiceBuilder
-        ) {
-            build(
-                databaseRepos = databaseRepos,
-                clients = clients,
-                behandlingMetrics = behandlingMetrics,
-                søknadMetrics = søknadMetrics,
-                clock = clock,
-                unleash = DefaultUnleash(
-                    UnleashConfig.builder()
-                        .appName(applicationConfig.unleash.appName)
-                        .instanceId(applicationConfig.unleash.appName)
-                        .unleashAPI(applicationConfig.unleash.unleashUrl)
-                        .build(),
-                    IsNotProdStrategy(applicationConfig.naisCluster == ApplicationConfig.NaisCluster.Prod)
-                )
+    services: Services = if (applicationConfig.runtimeEnvironment == ApplicationConfig.RuntimeEnvironment.Nais) {
+        ProdServiceBuilder.build(
+            databaseRepos = databaseRepos,
+            clients = clients,
+            behandlingMetrics = behandlingMetrics,
+            søknadMetrics = søknadMetrics,
+            clock = clock,
+            unleash = DefaultUnleash(
+                UnleashConfig.builder()
+                    .appName(applicationConfig.unleash.appName)
+                    .instanceId(applicationConfig.unleash.appName)
+                    .unleashAPI(applicationConfig.unleash.unleashUrl)
+                    .build(),
+                IsNotProdStrategy(applicationConfig.naisCluster == ApplicationConfig.NaisCluster.Prod)
             )
-        },
+        )
+    } else {
+        ProdServiceBuilder.build(
+            databaseRepos = databaseRepos,
+            clients = clients,
+            behandlingMetrics = behandlingMetrics,
+            søknadMetrics = søknadMetrics,
+            clock = clock,
+            unleash = FakeUnleash()
+        )
+    },
     accessCheckProxy: AccessCheckProxy = AccessCheckProxy(databaseRepos.person, services)
 ) {
     install(StatusPages) {