format: formatering med fp-sak editorconfig

.deploy/naiserator.yaml

@@ -9,8 +9,8 @@ spec:
   image: {{image}}
   port: 8080
   ingresses:
-  {{#each ingresses as |url|}}
-    - {{url}}
+  { { #each ingresses as |url|}}
+      - {{url } }
   {{/each}}
   liveness:
     path: /fpabakus/internal/health/isAlive
@@ -69,30 +69,30 @@ spec:
           - "NAVident"
           - "azp_name"
         groups:
-          {{#each groups as |group|}}
-          - id: "{{group}}"
-          {{/each}}
-  {{#if AZURE_IAC_RULES}}
-  accessPolicy:
-    inbound:
-      rules:
-      {{#each AZURE_IAC_RULES}}
-      - application: {{app}}
-        namespace: {{namespace}}
-        cluster: {{cluster}}
-        {{#if scopes}}
-        permissions:
-          scopes:
-          {{#each scopes}}
-            - "{{this}}"
-          {{/each}}
-        {{/if}}
-        {{#if roles}}
-        permissions:
-          roles:
-          {{#each roles}}
-            - "{{this}}"
-          {{/each}}
-        {{/if}}
-      {{/each}}
+          { { #each groups as |group|}}
+              - id: "{{group}}"
+                      {{/each } }
+  { { #if AZURE_IAC_RULES}}
+    accessPolicy:
+      inbound:
+        rules:
+        { { #each AZURE_IAC_RULES}}
+            - application: {{app } }
+        namespace: {{namespace } }
+  cluster: {{cluster}}
+  { { #if scopes}}
+    permissions:
+      scopes:
+      { { #each scopes}}
+          - "{{this}}"
+              {{/each } }
+      {{/if } }
+  { { #if roles}}
+    permissions:
+      roles:
+      { { #each roles}}
+          - "{{this}}"
+              {{/each } }
+      {{/if } }
+  {{/each}}
   {{/if}}

.editorconfig

@@ -123,7 +123,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = always
-ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *, |
+ij_java_imports_layout = $*, |, java.**, |, javax.**, |, jakarta.**, |, org.**, |, com.**, |, *, |
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true

.github/labeler.yml

@@ -1,22 +1,22 @@
 kontrakt:
-- any:
-  - changed-files:
-    - any-glob-to-any-file: "kontrakt/src/main/java/**/*"
-    - any-glob-to-any-file: "kontrakt-vedtak/src/main/java/**/*"
-    - any-glob-to-any-file: "kodeverk/src/main/java/**/*"
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: "kontrakt/src/main/java/**/*"
+          - any-glob-to-any-file: "kontrakt-vedtak/src/main/java/**/*"
+          - any-glob-to-any-file: "kodeverk/src/main/java/**/*"
 
 migreringer:
-- any:
-  - changed-files:
-    - any-glob-to-any-file: "migreringer/src/main/resources/**/*"
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: "migreringer/src/main/resources/**/*"
 
 web:
-- any:
-  - changed-files:
-    - any-glob-to-any-file: "web/src/main/java/**/*"
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: "web/src/main/java/**/*"
 
 pom:
-- any:
-  - changed-files:
-    - any-glob-to-any-file: "**/*/pom.xml"
-    - any-glob-to-any-file: "pom.xml"
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: "**/*/pom.xml"
+          - any-glob-to-any-file: "pom.xml"

.github/workflows/build.yml

@@ -71,7 +71,7 @@ jobs:
   notify:
     name: Notify
     if: github.ref_name == 'master' && (success() || failure()) && !contains(needs.*.result, 'skipped')
-    needs: [build-app, fpsak-tester, verdikjede-tester]
+    needs: [ build-app, fpsak-tester, verdikjede-tester ]
     uses: navikt/fp-autotest/.github/workflows/report-and-notify.yml@master
     with:
       fpsak: ${{ needs.fpsak-tester.outputs.resultat }}
@@ -84,7 +84,7 @@ jobs:
     permissions:
       id-token: write
     if: github.ref_name == 'master'
-    needs: [build-app, fpsak-tester, verdikjede-tester]
+    needs: [ build-app, fpsak-tester, verdikjede-tester ]
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
       gar: true
@@ -97,7 +97,7 @@ jobs:
     permissions:
       id-token: write
     if: github.ref_name == 'master'
-    needs: [build-app, fpsak-tester, verdikjede-tester, deploy-dev]
+    needs: [ build-app, fpsak-tester, verdikjede-tester, deploy-dev ]
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
       gar: true

.github/workflows/codeql.yml

@@ -10,10 +10,10 @@ on:
 
 jobs:
   codeql:
-   name: CodeQl
-   permissions:
-     actions: read
-     contents: read
-     security-events: write
-   uses: navikt/fp-gha-workflows/.github/workflows/codeql.yml@main
-   secrets: inherit
+    name: CodeQl
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    uses: navikt/fp-gha-workflows/.github/workflows/codeql.yml@main
+    secrets: inherit

README.md

@@ -12,6 +12,7 @@ FP-ABAKUS
 [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-abakus&metric=sqale_index)](https://sonarcloud.io/dashboard?id=navikt_fp-abakus)
 
 ### Abakus kontrakt
+
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/navikt/fp-abakus)](https://github.com/navikt/fp-abakus/releases)
 ![GitHub](https://img.shields.io/github/license/navikt/fp-abakus)
 

domenetjenester/iay/pom.xml

@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>no.nav.foreldrepenger.abakus</groupId>
-		<artifactId>domenetjenester</artifactId>
-		<version>1.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>no.nav.foreldrepenger.abakus</groupId>
+        <artifactId>domenetjenester</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>iay</artifactId>
-	<packaging>jar</packaging>
-	<name>Abakus :: Domenetjeneste :: IAY</name>
+    <artifactId>iay</artifactId>
+    <packaging>jar</packaging>
+    <name>Abakus :: Domenetjeneste :: IAY</name>
 
-	<dependencies>
-		<dependency>
+    <dependencies>
+        <dependency>
             <groupId>no.nav.fpsak.tidsserie</groupId>
             <artifactId>fpsak-tidsserie</artifactId>
         </dependency>
 
         <dependency>
-			<groupId>no.nav.vedtak.prosesstask</groupId>
-			<artifactId>prosesstask-kontekst</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>no.nav.foreldrepenger.abakus</groupId>
-			<artifactId>prosesstask</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>no.nav.foreldrepenger.abakus</groupId>
-			<artifactId>kobling</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>no.nav.foreldrepenger.felles</groupId>
-			<artifactId>felles-db</artifactId>
-		</dependency>
+            <groupId>no.nav.vedtak.prosesstask</groupId>
+            <artifactId>prosesstask-kontekst</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.abakus</groupId>
+            <artifactId>prosesstask</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.abakus</groupId>
+            <artifactId>kobling</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.felles</groupId>
+            <artifactId>felles-db</artifactId>
+        </dependency>
         <dependency>
             <groupId>no.nav.foreldrepenger.felles</groupId>
             <artifactId>felles-abac-kontekst</artifactId>
@@ -45,51 +45,51 @@
             <artifactId>fp-ws-proxy-v1</artifactId>
         </dependency>
 
-		<!-- integrasjoner -->
-		<dependency>
-			<groupId>no.nav.foreldrepenger.abakus</groupId>
-			<artifactId>vedtak</artifactId>
-		</dependency>
+        <!-- integrasjoner -->
+        <dependency>
+            <groupId>no.nav.foreldrepenger.abakus</groupId>
+            <artifactId>vedtak</artifactId>
+        </dependency>
         <dependency>
             <groupId>no.nav.foreldrepenger.abakus</groupId>
             <artifactId>lonnskomp</artifactId>
         </dependency>
-		<dependency>
-			<groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
-			<artifactId>infotrygd-grunnlag-klient</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
+            <artifactId>infotrygd-grunnlag-klient</artifactId>
+        </dependency>
         <dependency>
             <groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
             <artifactId>spokelse-klient</artifactId>
         </dependency>
-		<dependency>
-			<groupId>no.nav.foreldrepenger.kontrakter</groupId>
-			<artifactId>fp-feed-vedtak-tjenestespesifikasjon</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>no.nav.foreldrepenger.abakus</groupId>
-			<artifactId>abakus-kontrakt</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.kontrakter</groupId>
+            <artifactId>fp-feed-vedtak-tjenestespesifikasjon</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.abakus</groupId>
+            <artifactId>abakus-kontrakt</artifactId>
+        </dependency>
 
-		<!-- Andre NAV tjenestespesifikasjoner -->
-		<dependency>
-			<groupId>no.nav.tjenester</groupId>
-			<artifactId>aordningen-inntektsinformasjon-v1</artifactId>
-		</dependency>
+        <!-- Andre NAV tjenestespesifikasjoner -->
+        <dependency>
+            <groupId>no.nav.tjenester</groupId>
+            <artifactId>aordningen-inntektsinformasjon-v1</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
-			<artifactId>felles-integrasjon-rest-klient</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
+            <artifactId>felles-integrasjon-rest-klient</artifactId>
+        </dependency>
         <dependency>
             <groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
             <artifactId>ereg-klient</artifactId>
         </dependency>
 
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-annotations-jakarta</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 </project>

domenetjenester/iay/src/main/java/no/nav/foreldrepenger/abakus/domene/iay/AktivitetsAvtale.java

@@ -17,6 +17,7 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 import jakarta.persistence.Version;
+
 import no.nav.abakus.iaygrunnlag.kodeverk.IndexKey;
 import no.nav.foreldrepenger.abakus.felles.diff.ChangeTracked;
 import no.nav.foreldrepenger.abakus.felles.diff.IndexKeyComposer;
@@ -205,13 +206,8 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "<" +
-            "periode=" + periode +
-            ", overstyrtPeriode=" + overstyrtPeriode +
-            ", prosentsats=" + prosentsats +
-            ", beskrivelse=" + beskrivelse +
-            ", sisteLønnsendringsdato=" + sisteLønnsendringsdato +
-            '>';
+        return getClass().getSimpleName() + "<" + "periode=" + periode + ", overstyrtPeriode=" + overstyrtPeriode + ", prosentsats=" + prosentsats
+            + ", beskrivelse=" + beskrivelse + ", sisteLønnsendringsdato=" + sisteLønnsendringsdato + '>';
     }
 
     boolean hasValues() {

domenetjenester/iay/src/main/java/no/nav/foreldrepenger/abakus/domene/iay/AktørYtelse.java

@@ -22,6 +22,7 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.persistence.Version;
+
 import no.nav.abakus.iaygrunnlag.kodeverk.Fagsystem;
 import no.nav.abakus.iaygrunnlag.kodeverk.IndexKey;
 import no.nav.abakus.iaygrunnlag.kodeverk.YtelseType;
@@ -145,13 +146,11 @@ YtelseBuilder getYtelseBuilderForType(Fagsystem fagsystem,
         return YtelseBuilder.oppdatere(ytelse).medYtelseType(type).medKilde(fagsystem).medSaksreferanse(saksnummer);
     }
 
-    YtelseBuilder getYtelseBuilderForType(Fagsystem fagsystem,
-                                          YtelseType type, IntervallEntitet periode,
-                                          Optional<LocalDate> tidligsteAnvistFom) {
+    YtelseBuilder getYtelseBuilderForType(Fagsystem fagsystem, YtelseType type, IntervallEntitet periode, Optional<LocalDate> tidligsteAnvistFom) {
         // OBS kan være flere med samme Tema/TUK+FOM: Konvensjon ifm rammevedtak BS
         List<Ytelse> aktuelleYtelser = getAlleYtelser().stream()
-            .filter(ya -> ya.getKilde().equals(fagsystem) && ya.getRelatertYtelseType().equals(type)
-                && (periode.getFomDato().equals(ya.getPeriode().getFomDato())))
+            .filter(ya -> ya.getKilde().equals(fagsystem) && ya.getRelatertYtelseType().equals(type) && (periode.getFomDato()
+                .equals(ya.getPeriode().getFomDato())))
             .collect(Collectors.toList());
         Optional<Ytelse> ytelse = aktuelleYtelser.stream().filter(ya -> periode.equals(ya.getPeriode())).findFirst();
         if (ytelse.isEmpty() && !aktuelleYtelser.isEmpty()) {

domenetjenester/iay/src/main/java/no/nav/foreldrepenger/abakus/domene/iay/InntektArbeidYtelseAggregatBuilder.java

@@ -350,7 +350,8 @@ public YtelseBuilder getYtelselseBuilderForType(Fagsystem fagsystem,
         }
 
         public YtelseBuilder getYtelselseBuilderForType(Fagsystem fagsystem,
-                                                        YtelseType type, IntervallEntitet periode,
+                                                        YtelseType type,
+                                                        IntervallEntitet periode,
                                                         Optional<LocalDate> tidligsteAnvistFom) {
             return kladd.getYtelseBuilderForType(fagsystem, type, periode, tidligsteAnvistFom);
         }

domenetjenester/iay/src/main/java/no/nav/foreldrepenger/abakus/domene/iay/InntektArbeidYtelseGrunnlag.java

@@ -20,6 +20,7 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Version;
+
 import no.nav.foreldrepenger.abakus.domene.iay.arbeidsforhold.ArbeidsforholdInformasjon;
 import no.nav.foreldrepenger.abakus.domene.iay.søknad.OppgittOpptjening;
 import no.nav.foreldrepenger.abakus.felles.diff.ChangeTracked;