Merge pull request #241 from navikt/deps

Deps

Author: bjornhun

Diff for: build.gradle.kts

@@ -4,9 +4,9 @@ plugins {
     val versions = object {
         val kotlin = "1.9.0"
         val shadow = "8.1.1"
-        val versions = "0.47.0"
+        val versions = "0.48.0"
     }
-    
+
     kotlin("jvm") version(versions.kotlin)
     kotlin("plugin.allopen") version(versions.kotlin)
     kotlin("plugin.serialization") version(versions.kotlin)
@@ -28,17 +28,15 @@ repositories {
 dependencies {
     val versions = object {
         val auth0Jwt = "4.4.0"
-        val caffeine = "3.1.7"
-        val ktor = "2.3.2"
-        val logback = "1.4.8"
+        val caffeine = "3.1.8"
+        val ktor = "2.3.4"
+        val logback = "1.4.11"
         val logstash = "7.4"
-        val micrometer = "1.11.2"
-        val mockk = "1.13.5"
-        val navSecurity = "3.1.0"
-        val navCommon = "2.2023.01.10_13.49-81ddc732df3a"
-        val unleash = "4.4.1"
+        val micrometer = "1.11.4"
+        val mockk = "1.13.7"
+        val navSecurity = "3.1.5"
         val kotlin = "1.9.0"
-        val tmsKtorTokenSupport = "2.1.3"
+        val tmsKtorTokenSupport = "2.2.0"
     }
 
     implementation("com.auth0:java-jwt:${versions.auth0Jwt}")
@@ -60,8 +58,6 @@ dependencies {
     implementation("com.github.navikt.tms-ktor-token-support:token-support-tokendings-exchange:${versions.tmsKtorTokenSupport}")
     implementation("net.logstash.logback:logstash-logback-encoder:${versions.logstash}")
     implementation("ch.qos.logback:logback-classic:${versions.logback}")
-    implementation("no.nav.common:feature-toggle:${versions.navCommon}")
-    implementation("no.finn.unleash:unleash-client-java:${versions.unleash}")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:${versions.kotlin}")
     testImplementation("io.ktor:ktor-server-test-host:${versions.ktor}")
     testImplementation("io.ktor:ktor-client-mock:${versions.ktor}")

Diff for: gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Diff for: src/main/kotlin/no/nav/personopplysninger/config/ApplicationContext.kt

@@ -4,11 +4,6 @@ import com.github.benmanes.caffeine.cache.Cache
 import com.github.benmanes.caffeine.cache.Caffeine
 import io.micrometer.prometheus.PrometheusConfig
 import io.micrometer.prometheus.PrometheusMeterRegistry
-import no.finn.unleash.strategy.Strategy
-import no.nav.common.featuretoggle.UnleashClient
-import no.nav.common.featuretoggle.UnleashClientImpl
-import no.nav.common.featuretoggle.UnleashUtils
-import no.nav.common.utils.EnvironmentUtils
 import no.nav.personopplysninger.common.consumer.kodeverk.KodeverkConsumer
 import no.nav.personopplysninger.common.consumer.kodeverk.KodeverkService
 import no.nav.personopplysninger.common.consumer.kodeverk.dto.Kodeverk
@@ -17,7 +12,6 @@ import no.nav.personopplysninger.common.consumer.pdl.PdlConsumer
 import no.nav.personopplysninger.common.consumer.pdl.PdlService
 import no.nav.personopplysninger.endreopplysninger.EndreOpplysningerService
 import no.nav.personopplysninger.endreopplysninger.consumer.PdlMottakConsumer
-import no.nav.personopplysninger.featuretoggles.ByApplicationStrategy
 import no.nav.personopplysninger.institusjon.InstitusjonService
 import no.nav.personopplysninger.institusjon.consumer.InstitusjonConsumer
 import no.nav.personopplysninger.kontaktinformasjon.KontaktinformasjonService
@@ -27,7 +21,6 @@ import no.nav.personopplysninger.medl.consumer.MedlConsumer
 import no.nav.personopplysninger.personalia.PersonaliaService
 import no.nav.personopplysninger.personalia.consumer.Norg2Consumer
 import no.nav.tms.token.support.tokendings.exchange.TokendingsServiceBuilder
-import java.util.*
 import java.util.concurrent.TimeUnit
 
 class ApplicationContext {
@@ -39,7 +32,6 @@ class ApplicationContext {
     val metricsCollector = MetricsCollector(appMicrometerRegistry.prometheusRegistry)
 
     val tokendingsService = TokendingsServiceBuilder.buildTokendingsService()
-    val unleashClient = unleashClient()
 
     val institusjonConsumer = InstitusjonConsumer(httpClient, env, tokendingsService)
     val kontaktinfoConsumer = KontaktinfoConsumer(httpClient, env, tokendingsService)
@@ -67,13 +59,4 @@ class ApplicationContext {
             .expireAfterWrite(environment.subjectNameCacheExpiryMinutes, TimeUnit.MINUTES)
             .build()
     }
-
-    private fun unleashClient(): UnleashClient {
-        return UnleashClientImpl(
-            EnvironmentUtils.getOptionalProperty(UnleashUtils.UNLEASH_URL_ENV_NAME)
-                .orElse("https://unleash.nais.io/api/"),
-            EnvironmentUtils.getRequiredProperty("NAIS_APP_NAME"),
-            Collections.singletonList(ByApplicationStrategy()) as List<Strategy>?
-        )
-    }
 }

Diff for: src/main/kotlin/no/nav/personopplysninger/config/bootstrap.kt

@@ -19,7 +19,6 @@ import io.ktor.server.request.path
 import io.ktor.server.request.uri
 import io.ktor.server.routing.routing
 import no.nav.personopplysninger.endreopplysninger.endreOpplysninger
-import no.nav.personopplysninger.featuretoggles.featureToggles
 import no.nav.personopplysninger.health.health
 import no.nav.personopplysninger.institusjon.institusjon
 import no.nav.personopplysninger.kontaktinformasjon.kontaktinformasjon
@@ -80,7 +79,6 @@ fun Application.mainModule(appContext: ApplicationContext = ApplicationContext()
         health(appContext.appMicrometerRegistry)
         authenticate {
             endreOpplysninger(appContext.endreOpplysningerService, appContext.metricsCollector)
-            featureToggles(appContext.unleashClient)
             institusjon(appContext.institusjonService)
             medl(appContext.medlService)
             personalia(appContext.personaliaService)