Skip to content

Commit 0099df9

Browse files
krharumkrharum
committed
Refactor package structure from 'no.nav.testnav.libs.domain.dto' to 'no.nav.testnav.libs.dto' for consistency across DTOs
1 parent ff30adc commit 0099df9

File tree

210 files changed

+277
-5873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+277
-5873
lines changed

‎apps/joark-dokument-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ sonarqube {
1010
}
1111

1212
dependencies {
13-
implementation "no.nav.testnav.libs:domain"
1413
implementation "no.nav.testnav.libs:reactive-core"
1514
implementation "no.nav.testnav.libs:security-core"
1615
implementation "no.nav.testnav.libs:servlet-core"

‎apps/joark-dokument-service/settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ rootProject.name = "joark-dokument-service"
77
includeBuild "../../plugins/java"
88

99
includeBuild "../../libs/data-transfer-objects"
10-
includeBuild "../../libs/domain"
1110
includeBuild "../../libs/reactive-core"
1211
includeBuild "../../libs/security-core"
1312
includeBuild "../../libs/servlet-core"

‎apps/synt-vedtakshistorikk-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ sonarqube {
1111

1212
dependencies {
1313
implementation "no.nav.testnav.libs:data-transfer-objects"
14-
implementation "no.nav.testnav.libs:domain"
1514
implementation "no.nav.testnav.libs:security-core"
1615
implementation "no.nav.testnav.libs:servlet-core"
1716
implementation "no.nav.testnav.libs:servlet-insecure-security"

‎apps/synt-vedtakshistorikk-service/settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ rootProject.name = "synt-vedtakshistorikk-service"
77
includeBuild "../../plugins/java"
88

99
includeBuild "../../libs/data-transfer-objects"
10-
includeBuild "../../libs/domain"
1110
includeBuild "../../libs/security-core"
1211
includeBuild "../../libs/servlet-core"
1312
includeBuild "../../libs/servlet-insecure-security"

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.FinnTiltakRequest;
1414
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetRequest;
1515
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.arena.EndreInnsatsbehovResponse;
16-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.Arbeidsoeker;
17-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyBruker;
18-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyeBrukereResponse;
19-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakResponse;
16+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.Arbeidsoeker;
17+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyBruker;
18+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
19+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
2020
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerRequestDTO;
2121
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerResponseDTO;
2222
import no.nav.testnav.libs.securitycore.domain.ServerProperties;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.extern.slf4j.Slf4j;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers;
55
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.synt.HentVedtakshistorikkCommand;
6-
import no.nav.testnav.libs.domain.dto.arena.testnorge.historikk.Vedtakshistorikk;
6+
import no.nav.testnav.libs.dto.arena.testnorge.historikk.Vedtakshistorikk;
77
import no.nav.testnav.libs.securitycore.domain.ServerProperties;
88
import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
99
import org.springframework.stereotype.Component;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/GetArenaBrukereCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

33
import lombok.AllArgsConstructor;
4-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyeBrukereResponse;
4+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
55
import org.springframework.util.MultiValueMap;
66
import org.springframework.web.reactive.function.client.WebClient;
77
import reactor.core.publisher.Mono;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostArenaBrukerCommand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

33
import lombok.extern.slf4j.Slf4j;
4-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyBruker;
5-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyeBrukereResponse;
4+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyBruker;
5+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
66
import org.springframework.core.ParameterizedTypeReference;
77
import org.springframework.http.HttpHeaders;
88
import org.springframework.http.MediaType;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostFinnTiltakCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import lombok.extern.slf4j.Slf4j;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.FinnTiltakRequest;
5-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakResponse;
5+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
66
import org.springframework.http.HttpHeaders;
77
import org.springframework.http.MediaType;
88
import org.springframework.web.reactive.function.BodyInserters;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostRettighetCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import lombok.AllArgsConstructor;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetRequest;
5-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakResponse;
5+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
66
import org.springframework.http.HttpHeaders;
77
import org.springframework.http.MediaType;
88
import org.springframework.web.reactive.function.BodyInserters;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/synt/HentVedtakshistorikkCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.AllArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.WebClientFilter;
6-
import no.nav.testnav.libs.domain.dto.arena.testnorge.historikk.Vedtakshistorikk;
6+
import no.nav.testnav.libs.dto.arena.testnorge.historikk.Vedtakshistorikk;
77
import org.springframework.core.ParameterizedTypeReference;
88
import org.springframework.web.reactive.function.BodyInserters;
99
import org.springframework.web.reactive.function.client.WebClient;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/EndreInnsatsbehovRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
4-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
54

65
import java.util.List;
76

@@ -10,6 +9,7 @@
109
import lombok.Setter;
1110
import lombok.AllArgsConstructor;
1211
import lombok.NoArgsConstructor;
12+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
1313

1414

1515
@Getter

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/FinnTiltakRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.Getter;
55
import lombok.NoArgsConstructor;
66
import lombok.Setter;
7-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
7+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
88

99
import java.util.List;
1010

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetAap115Request.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetAapRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetEndreDeltakerstatusRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetFritakMeldekortRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
99
import lombok.Setter;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
11-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
12-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
11+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
12+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1313

1414
import java.io.Serializable;
1515
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTilleggRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTilleggsytelseRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTiltaksaktivitetRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTiltaksdeltakelseRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTiltakspengerRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTvungenForvaltningRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetUngUfoerRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
8+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/response/arena/EndreInnsatsbehovResponse.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.arena;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import lombok.*;
5-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
6-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyEndreInnsatsbehovFeil;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Builder;
6+
import lombok.Getter;
7+
import lombok.NoArgsConstructor;
8+
import lombok.Setter;
9+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
10+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyEndreInnsatsbehovFeil;
711

812
import java.util.List;
913

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/provider/BrukerController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.TagsService;
77
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.ArenaForvalterService;
88
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.ArenaDagpengerService;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
910
import no.nav.testnav.libs.dto.personsearchservice.v1.PersonDTO;
1011
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerResponseDTO;
1112
import no.nav.testnav.apps.syntvedtakshistorikkservice.provider.request.SyntetiserArenaRequest;
12-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyeBrukereResponse;
1313
import org.springframework.web.bind.annotation.PostMapping;
1414
import org.springframework.web.bind.annotation.RequestBody;
1515
import org.springframework.web.bind.annotation.RequestMapping;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/provider/VedtakshistorikkController.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.provider.request.SyntetiserArenaRequest;
55
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.VedtakshistorikkService;
6+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
67
import org.springframework.web.bind.annotation.PostMapping;
78
import org.springframework.web.bind.annotation.RequestBody;
89
import org.springframework.web.bind.annotation.RequestMapping;
910
import org.springframework.web.bind.annotation.RestController;
1011

11-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakResponse;
12-
1312
import java.util.List;
1413
import java.util.Map;
1514

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/service/ArenaAapService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetRequest;
5-
import no.nav.testnav.libs.domain.dto.arena.testnorge.historikk.Vedtakshistorikk;
6-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakAap;
5+
import no.nav.testnav.libs.dto.arena.testnorge.historikk.Vedtakshistorikk;
6+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
77
import no.nav.testnav.libs.dto.personsearchservice.v1.PersonDTO;
88
import org.springframework.stereotype.Service;
99

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/service/ArenaForvalterService.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.exception.ArbeidssoekerException;
99
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.exception.VedtakshistorikkException;
1010
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.ArenaBrukerUtils;
11-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.Kvalifiseringsgrupper;
12-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyBruker;
13-
import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
14-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.*;
11+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.Kvalifiseringsgrupper;
12+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyBruker;
13+
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
14+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
15+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtak;
16+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
17+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
18+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
19+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.RettighetType;
1520
import no.nav.testnav.libs.dto.personsearchservice.v1.PersonDTO;
1621
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerRequestDTO;
1722
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerResponseDTO;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/service/ArenaTilleggService.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,23 @@
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetRequest;
55
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetTiltaksaktivitetRequest;
66
import no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.RequestUtils;
7-
import no.nav.testnav.libs.domain.dto.arena.testnorge.historikk.Vedtakshistorikk;
8-
import no.nav.testnav.libs.domain.dto.arena.testnorge.tilleggsstoenad.Vedtaksperiode;
9-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtak;
10-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
11-
import no.nav.testnav.libs.domain.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
7+
import no.nav.testnav.libs.dto.arena.testnorge.historikk.Vedtakshistorikk;
8+
import no.nav.testnav.libs.dto.arena.testnorge.tilleggsstoenad.Vedtaksperiode;
9+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtak;
10+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
11+
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1212
import org.springframework.stereotype.Service;
1313

1414
import java.time.LocalDate;
1515
import java.util.ArrayList;
1616
import java.util.List;
1717
import java.util.Objects;
1818

19-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.RequestUtils.getRettighetTilleggRequest;
20-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.VedtakUtils.getTilleggSekvenser;
21-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.DatoUtils.datoErInnenforPeriode;
22-
2319
import static java.util.Objects.isNull;
2420
import static java.util.Objects.nonNull;
21+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.DatoUtils.datoErInnenforPeriode;
22+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.RequestUtils.getRettighetTilleggRequest;
23+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.VedtakUtils.getTilleggSekvenser;
2524

2625
@Service
2726
@RequiredArgsConstructor

0 commit comments

Comments
 (0)