Remove unnecessary CacheConfig and related classes.

navikt · Jun 25, 2024 · ea53a02 · ea53a02
1 parent cd3d28f
commit ea53a02
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 119 deletions.
diff --git a/src/main/kotlin/no/nav/syfo/brukertilgang/BrukertilgangService.kt b/src/main/kotlin/no/nav/syfo/brukertilgang/BrukertilgangService.kt
@@ -1,19 +1,13 @@
 package no.nav.syfo.brukertilgang
 
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.stereotype.Service
 
 @Service
 class BrukertilgangService @Autowired constructor(
     private var brukertilgangClient: BrukertilgangClient
 ) {
 
-    @Cacheable(
-        cacheNames = ["tilgangtilident"],
-        key = "#innloggetIdent.concat(#oppslaattFnr)",
-        condition = "#innloggetIdent != null && #oppslaattFnr != null"
-    )
     fun tilgangTilOppslattIdent(innloggetIdent: String, oppslaattFnr: String): Boolean {
         return oppslaattFnr == innloggetIdent || brukertilgangClient.hasAccessToAnsatt(oppslaattFnr)
     }

diff --git a/src/main/kotlin/no/nav/syfo/config/ApplicationConfig.kt b/src/main/kotlin/no/nav/syfo/config/ApplicationConfig.kt
diff --git a/src/main/kotlin/no/nav/syfo/config/CacheConfig.kt b/src/main/kotlin/no/nav/syfo/config/CacheConfig.kt
diff --git a/src/main/kotlin/no/nav/syfo/config/RedisConfig.kt b/src/main/kotlin/no/nav/syfo/config/RedisConfig.kt
diff --git a/src/main/kotlin/no/nav/syfo/ereg/EregClient.kt b/src/main/kotlin/no/nav/syfo/ereg/EregClient.kt
@@ -1,16 +1,13 @@
 package no.nav.syfo.ereg
 
 import javax.inject.Inject
-import no.nav.syfo.config.CacheConfig
 import no.nav.syfo.metric.Metrikk
 import no.nav.syfo.util.APP_CONSUMER_ID
 import no.nav.syfo.util.NAV_CALL_ID_HEADER
 import no.nav.syfo.util.NAV_CONSUMER_ID_HEADER
 import no.nav.syfo.util.createCallId
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
@@ -23,11 +20,10 @@ import org.springframework.web.client.RestTemplate
 class EregClient @Inject constructor(
     @Value("\${ereg.url}") private val baseUrl: String,
     private val metric: Metrikk,
-    @param:Qualifier("scheduler") private val restTemplate: RestTemplate,
 ) {
     fun eregResponse(virksomhetsnummer: String): EregOrganisasjonResponse {
         try {
-            val response = restTemplate.exchange(
+            val response = RestTemplate().exchange(
                 getEregUrl(),
                 HttpMethod.GET,
                 entity(),
@@ -47,11 +43,6 @@ class EregClient @Inject constructor(
         }
     }
 
-    @Cacheable(
-        value = [CacheConfig.CACHENAME_EREG_VIRKSOMHETSNAVN],
-        key = "#virksomhetsnummer",
-        condition = "#virksomhetsnummer != null",
-    )
     fun virksomhetsnavn(virksomhetsnummer: String): String {
         return eregResponse(virksomhetsnummer).navn()
     }

diff --git a/src/main/kotlin/no/nav/syfo/kontaktinfo/KrrClient.kt b/src/main/kotlin/no/nav/syfo/kontaktinfo/KrrClient.kt
@@ -7,7 +7,6 @@ import no.nav.syfo.util.NAV_PERSONIDENT_HEADER
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
@@ -25,7 +24,6 @@ class KrrClient @Autowired constructor(
     @Value("\${krr.scope}") private val krrScope: String,
     @Value("\${krr.url}") val krrUrl: String,
 ) {
-    @Cacheable(cacheNames = ["krr_fnr"], key = "#fnr", condition = "#fnr != null")
     fun kontaktinformasjon(fnr: String): DigitalKontaktinfo {
         val accessToken = "Bearer ${azureAdTokenConsumer.getSystemToken(krrScope)}"
         val response = RestTemplate().exchange(

diff --git a/src/main/kotlin/no/nav/syfo/narmesteleder/NarmesteLederClient.kt b/src/main/kotlin/no/nav/syfo/narmesteleder/NarmesteLederClient.kt
@@ -9,7 +9,6 @@ import no.nav.syfo.util.NAV_PERSONIDENT_HEADER
 import no.nav.syfo.util.bearerHeader
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.cache.annotation.Cacheable
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
@@ -27,7 +26,6 @@ class NarmesteLederClient(
     private val tokenDingsConsumer: TokenDingsConsumer,
     private val contextHolder: TokenValidationContextHolder,
 ) {
-    @Cacheable(value = ["aktive_ledere"], key = "#ansattFnr", condition = "#ansattFnr != null")
     fun alleLedereForSykmeldt(
         ansattFnr: String,
     ): List<NarmesteLederRelasjonDTO> {
@@ -53,11 +51,6 @@ class NarmesteLederClient(
         }
     }
 
-    @Cacheable(
-        value = ["aktive_ansatte"],
-        key = "{#ansattFnr, #virksomhetsnummer}",
-        condition = "{#ansattFnr != null, #virksomhetsnummer != null}"
-    )
     fun aktivNarmesteLederIVirksomhet(
         ansattFnr: String,
         virksomhetsnummer: String,