Merge branch 'main' into NAV_22311/bestemmer-arbeidsfordelingsenhet-u…

…tenfor-opprett-oppgave-task
navikt · Oct 8, 2024 · fbb9aa2 · fbb9aa2
2 parents 1066e7c + 0d1a6b6
commit fbb9aa2
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 1,563 deletions.
diff --git a/.deploy/ba-sak-proxy/nais.yaml b/.deploy/ba-sak-proxy/nais.yaml
@@ -64,8 +64,6 @@ spec:
           cluster: dev-gcp
         - application: familie-prosessering
           cluster: dev-gcp
-        - application: familie-ba-skatteetaten-api
-          cluster: dev-gcp
         - application: familie-ba-migrering
           cluster: dev-gcp
         - application: bidrag-grunnlag-feature

diff --git a/.deploy/nais/app-preprod.yaml b/.deploy/nais/app-preprod.yaml
@@ -73,8 +73,6 @@ spec:
           cluster: dev-gcp
         - application: familie-prosessering
           cluster: dev-gcp
-        - application: familie-ba-skatteetaten-api
-          cluster: dev-gcp
         - application: familie-klage
           cluster: dev-gcp
         - application: bidrag-grunnlag-feature

diff --git a/.deploy/nais/app-prod.yaml b/.deploy/nais/app-prod.yaml
@@ -72,8 +72,6 @@ spec:
           cluster: prod-gcp
         - application: familie-prosessering
           cluster: prod-gcp
-        - application: familie-ba-skatteetaten-api
-          cluster: prod-gcp
         - application: familie-klage
           cluster: prod-gcp
         - application: bidrag-grunnlag-feature

diff --git a/pom.xml b/pom.xml
@@ -24,11 +24,10 @@
         <prosessering.version>2.20240925091323_ea1bd3c</prosessering.version>
         <felles.version>3.20240913110742_adb42f8</felles.version>
         <eksterne-kontrakter-bisys.version>2.0_20230214104704_706e9c0</eksterne-kontrakter-bisys.version>
-        <felles-kontrakter.version>3.0_20240919121839_57daa74</felles-kontrakter.version>
+        <felles-kontrakter.version>3.0_20241004134208_2962899</felles-kontrakter.version>
         <familie.kontrakter.saksstatistikk>2.0_20230214104704_706e9c0</familie.kontrakter.saksstatistikk>
         <familie.kontrakter.stønadsstatistikk>2.0_20240311083956_0558f2a</familie.kontrakter.stønadsstatistikk>
         <utbetalingsgenerator.version>1.0_20240902095239_88c7bc0</utbetalingsgenerator.version>
-        <familie.kontrakter.skatteetaten>2.0_20230214104704_706e9c0</familie.kontrakter.skatteetaten>
         <cucumber.version>7.19.0</cucumber.version>
         <mockk.version>1.13.12</mockk.version>
         <wiremock.version>3.9.1</wiremock.version>
@@ -45,7 +44,7 @@
 
         <medeia-validator-jackson.version>1.1.1</medeia-validator-jackson.version>
         <logback-syslog4j.version>1.0.0</logback-syslog4j.version>
-        <testcontainers.postgresql.version>1.20.1</testcontainers.postgresql.version>
+        <testcontainers.postgresql.version>1.20.2</testcontainers.postgresql.version>
         <unleash.version>9.2.4</unleash.version>
         <testcontainers.postgresql.version>1.20.1</testcontainers.postgresql.version>
         <maven.model.version>3.9.9</maven.model.version>
@@ -73,7 +72,7 @@
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations</artifactId>
-                <version>2.2.24</version>
+                <version>2.2.25</version>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -335,11 +334,6 @@
             <artifactId>saksstatistikk</artifactId>
             <version>${familie.kontrakter.saksstatistikk}</version>
         </dependency>
-        <dependency>
-            <groupId>no.nav.familie.eksterne.kontrakter</groupId>
-            <artifactId>skatteetaten</artifactId>
-            <version>${familie.kontrakter.skatteetaten}</version>
-        </dependency>
         <dependency>
             <groupId>no.nav.familie.felles</groupId>
             <artifactId>familie-utbetalingsgenerator</artifactId>

diff --git a/src/main/kotlin/no/nav/familie/ba/sak/config/CacheConfig.kt b/src/main/kotlin/no/nav/familie/ba/sak/config/CacheConfig.kt
@@ -63,23 +63,6 @@ class CacheConfig {
                 return ConcurrentMapCache(name, concurrentMap, true)
             }
         }
-
-    @Bean("skattPersonerCache")
-    fun skattPersonerCache(): CacheManager =
-        object : ConcurrentMapCacheManager() {
-            override fun createConcurrentMapCache(name: String): Cache {
-                val concurrentMap =
-                    Caffeine
-                        .newBuilder()
-                        .initialCapacity(100)
-                        .maximumSize(1000)
-                        .expireAfterWrite(1, TimeUnit.DAYS)
-                        .recordStats()
-                        .build<Any, Any>()
-                        .asMap()
-                return ConcurrentMapCache(name, concurrentMap, true)
-            }
-        }
 }
 
 fun CacheManager.getCacheOrThrow(cache: String) = this.getCache(cache) ?: error("Finner ikke cache=$cache")

diff --git a/src/main/kotlin/no/nav/familie/ba/sak/ekstern/skatteetaten/AndelTilkjentYtelsePeriode.kt b/src/main/kotlin/no/nav/familie/ba/sak/ekstern/skatteetaten/AndelTilkjentYtelsePeriode.kt
diff --git a/src/main/kotlin/no/nav/familie/ba/sak/ekstern/skatteetaten/SkatteetatenController.kt b/src/main/kotlin/no/nav/familie/ba/sak/ekstern/skatteetaten/SkatteetatenController.kt