Skip to content

Commit

Permalink
Omarbeide Los-Dto, Jakarta ELv5 (#536)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jolarsen
jolarsen authored Apr 10, 2024
1 parent 8a9a8a8 commit a97780d
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 48 deletions.
4 changes: 2 additions & 2 deletions fp-topics/hendelser-behandling/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 7 additions & 0 deletions ...ndelser-behandling/src/main/java/no/nav/vedtak/hendelser/behandling/Behandlingsårsak.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@

public enum Behandlingsårsak {
SØKNAD,
INNTEKTSMELDING,
FOLKEREGISTER,
PLEIEPENGER,
ETTERKONTROLL,
MANUELL,
BERØRT,
UTSATT_START,
OPPHØR_NY_SAK,
REGULERING,
KLAGE_OMGJØRING,
KLAGE_TILBAKEBETALING,
ANNET
}
20 changes: 13 additions & 7 deletions ...ser-behandling/src/main/java/no/nav/vedtak/hendelser/behandling/los/LosBehandlingDto.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
package no.nav.vedtak.hendelser.behandling.los;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;

import jakarta.validation.constraints.NotNull;

import no.nav.vedtak.hendelser.behandling.Aksjonspunktstatus;
import no.nav.vedtak.hendelser.behandling.AktørId;
import no.nav.vedtak.hendelser.behandling.Behandlingsstatus;
Expand All @@ -16,6 +9,12 @@
import no.nav.vedtak.hendelser.behandling.Kildesystem;
import no.nav.vedtak.hendelser.behandling.Ytelse;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;

public record LosBehandlingDto(@NotNull UUID behandlingUuid,
@NotNull Kildesystem kildesystem,
@NotNull String saksnummer,
Expand All @@ -31,8 +30,15 @@ public record LosBehandlingDto(@NotNull UUID behandlingUuid,
List<Behandlingsårsak> behandlingsårsaker,
boolean faresignaler,
boolean refusjonskrav,
// Inntil fagsak-merkingen er stabil - enum senere
// Foreløpig: NASJONAL, EØS_BOSATT_NORGE, BOSATT_UTLAND, SAMMENSATT_KONTROLL, DØD, NÆRING, PRAKSIS_UTSETTELSE
// Muligens: BARE_FAR_RETT, GRUPPE2
List<String> saksegenskaper,
LosFagsakEgenskaperDto fagsakEgenskaper,
LosForeldrepengerDto foreldrepengerDto,
// Inntil kriteriene er stabil - enum senere
// Foreløpig: SYKDOMSVURDERING, GRADERING, BARE_FAR_RETT, FARESIGNALER, DIREKTE_UTBETALING, REFUSJONSKRAV
List<String> behandlingsegenskaper,
LosTilbakeDto tilbakeDto) {


Expand Down
47 changes: 16 additions & 31 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,6 @@
<sonar.projectName>fp-kontrakter</sonar.projectName>
<sonar.projectKey>navikt_fp-kontrakter</sonar.projectKey>

<jakarta.jakartaee-bom.version>10.0.0</jakarta.jakartaee-bom.version>

<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>

<jaxb-bom.version>4.0.4</jaxb-bom.version>

<jakarta.el.version>4.0.2</jakarta.el.version>

<!-- maven jakarta kompatible plugins -->
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>

<junit.version>5.10.2</junit.version>
<assertj.version>3.25.3</assertj.version>
<logback.version>1.5.3</logback.version>

<xsd.packagename/>
</properties>

Expand Down Expand Up @@ -98,7 +83,7 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-bom</artifactId>
<version>${jakarta.jakartaee-bom.version}</version>
<version>10.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -116,7 +101,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-bom</artifactId>
<version>${jaxb-bom.version}</version>
<version>4.0.5</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -125,13 +110,13 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
<version>8.0.1.Final</version>
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${jakarta.el.version}</version>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<version>5.0.0</version>
</dependency>

<!-- Interne modul avhengigheter -->
Expand Down Expand Up @@ -221,21 +206,21 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<version>3.25.3</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<version>1.5.4</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -277,13 +262,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.1</version>
</plugin>
<!-- Plugin required to build java classes from XSD using XJC -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>${jaxb2-maven-plugin.version}</version>
<version>3.1.0</version>
<executions>
<execution>
<configuration>
Expand Down Expand Up @@ -311,7 +296,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand Down Expand Up @@ -373,7 +358,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand Down Expand Up @@ -401,7 +386,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -435,7 +420,7 @@
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>3.1.6</version>
<version>3.1.7</version>
<executions>
<execution>
<id>make-index</id>
Expand All @@ -449,7 +434,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.10.0.2594</version>
<version>3.11.0.3922</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
4 changes: 2 additions & 2 deletions vl-kontrakt-fp-abonnent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions vl-kontrakt-fp-formidling/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions vl-kontrakt-fp-risk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions vl-kontrakt-simulering-resultat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.glassfish.expressly</groupId>
<artifactId>expressly</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit a97780d

Please sign in to comment.