Oppdatert versjoner, justert litt på konfig, tatt inn ny avhengighet …

…til bidrag-felles ++
navikt · Jan 15, 2024 · e8cb835 · e8cb835
1 parent a8da4ba
commit e8cb835
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 33 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,7 +2,6 @@
 ktlint_code_style = intellij_idea
 max_line_length = 150
 tab_width = 4
-ktlint_standard_discouraged-comment-location = disabled
 
 [**/test/**/*.{kt,kts}]
 ktlint_standard_max-line-length = disabled
diff --git a/.nais/nais.yaml b/.nais/nais.yaml
@@ -56,7 +56,7 @@ spec:
       cpu: 1000m
       memory: 2048Mi
     requests:
-      cpu: 500m
+      cpu: 100m
       memory: 1024Mi
     replicas:
       cpuThresholdPercentage: 80

diff --git a/pom.xml b/pom.xml
@@ -23,33 +23,19 @@
     <build-helper-maven.version>3.2.0</build-helper-maven.version>
     <token-support.version>3.2.0</token-support.version>
     <!-- dependencies -->
-    <bidrag-commons.version>20231201131246_f719b2b</bidrag-commons.version>
     <bidrag-commons-test.version>1.20230511093912_dc35d81</bidrag-commons-test.version>
-    <bidrag-transport.version>20240111084215_a364fb8</bidrag-transport.version>
+    <bidrag-felles.version>2024.0112.100957</bidrag-felles.version>
     <bidrag-tilgangskontroll.version>1.10.4</bidrag-tilgangskontroll.version>
     <mockito-kotlin.version>5.2.1</mockito-kotlin.version>
-    <springdoc-openapi-ui.version>2.2.0</springdoc-openapi-ui.version>
+    <springdoc-openapi-ui.version>2.3.0</springdoc-openapi-ui.version>
     <nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
-    <springframework-cloud.version>4.0.4</springframework-cloud.version>
+    <springframework-cloud.version>4.1.0</springframework-cloud.version>
     <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
     <aordningen-inntektsinformasjon-v1.version>1.7</aordningen-inntektsinformasjon-v1.version>
+    <jackson-datatype.version>2.16.1</jackson-datatype.version>
+    <ktlint.version>1.1.1</ktlint.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>io.swagger.core.v3</groupId>
-        <artifactId>swagger-annotations</artifactId>
-        <version>2.2.19</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <!-- spring -->
     <dependency>
@@ -85,7 +71,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>2.16.0</version>
+      <version>${jackson-datatype.version}</version>
     </dependency>
 
     <!-- nav -->
@@ -96,13 +82,13 @@
     </dependency>
     <dependency>
       <groupId>no.nav.bidrag</groupId>
-      <artifactId>bidrag-commons</artifactId>
-      <version>${bidrag-commons.version}</version>
+      <artifactId>bidrag-commons-felles</artifactId>
+      <version>${bidrag-felles.version}</version>
     </dependency>
     <dependency>
       <groupId>no.nav.bidrag</groupId>
-      <artifactId>bidrag-transport</artifactId>
-      <version>${bidrag-transport.version}</version>
+      <artifactId>bidrag-transport-felles</artifactId>
+      <version>${bidrag-felles.version}</version>
     </dependency>
     <dependency>
       <groupId>no.nav.bidrag</groupId>
@@ -291,7 +277,7 @@
           <dependency>
             <groupId>com.pinterest.ktlint</groupId>
             <artifactId>ktlint-cli</artifactId>
-            <version>1.1.0</version>
+            <version>${ktlint.version}</version>
           </dependency>
           <!-- additional 3rd party ruleset(s) can be specified here -->
         </dependencies>

diff --git a/src/test/kotlin/no/nav/bidrag/grunnlag/BidragGrunnlagTestConfig.kt b/src/test/kotlin/no/nav/bidrag/grunnlag/BidragGrunnlagTestConfig.kt
@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
 import org.springframework.http.HttpHeaders
+import org.springframework.http.client.observation.DefaultClientRequestObservationConvention
 
 @Configuration
 @OpenAPIDefinition(
@@ -34,6 +35,9 @@ class BidragGrunnlagTestConfig {
         return httpHeaderTestRestTemplate
     }
 
+    @Bean
+    fun clientRequestObservationConvention() = DefaultClientRequestObservationConvention()
+
     fun generateTestToken(): String {
         val iss = mockOAuth2Server.issuerUrl("aad")
         val newIssuer = iss.newBuilder().host("localhost").build()

diff --git a/src/test/kotlin/no/nav/bidrag/grunnlag/comparator/PeriodComparatorTest.kt b/src/test/kotlin/no/nav/bidrag/grunnlag/comparator/PeriodComparatorTest.kt
@@ -92,7 +92,10 @@ class PeriodComparatorTest {
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
         newEntities =
-            createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(beskrivelse = "Beskrivelse2")))
+            createPeriodEntities(
+                Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
+                listOf(createAinntektspost(beskrivelse = "Beskrivelse2")),
+            )
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
@@ -102,12 +105,18 @@ class PeriodComparatorTest {
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
         newEntities =
-            createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(inntektType = "Inntekttype2")))
+            createPeriodEntities(
+                Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
+                listOf(createAinntektspost(inntektType = "Inntekttype2")),
+            )
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
         newEntities =
-            createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(opplysningspliktigId = "Opp2")))
+            createPeriodEntities(
+                Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
+                listOf(createAinntektspost(opplysningspliktigId = "Opp2")),
+            )
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
@@ -125,7 +134,10 @@ class PeriodComparatorTest {
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
-        newEntities = createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(virksomhetId = "Virk2")))
+        newEntities = createPeriodEntities(
+            Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
+            listOf(createAinntektspost(virksomhetId = "Virk2")),
+        )
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
@@ -135,12 +147,18 @@ class PeriodComparatorTest {
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
         newEntities =
-            createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(etterbetalingsperiodeFom = LocalDate.of(2021, 10, 1))))
+            createPeriodEntities(
+                Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
+                listOf(createAinntektspost(etterbetalingsperiodeFom = LocalDate.of(2021, 10, 1))),
+            )
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
 
         newEntities =
-            createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(etterbetalingsperiodeTom = LocalDate.of(2021, 10, 1))))
+            createPeriodEntities(
+                Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
+                listOf(createAinntektspost(etterbetalingsperiodeTom = LocalDate.of(2021, 10, 1))),
+            )
 
         assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
     }