Remove obsolete files and dependencies

Deleted unused Java classes and test config files to streamline the codebase and improve project organization. This cleanup helps maintain a leaner structure and eliminates redundant components.
navikt · Aug 15, 2024 · 0da783c · 0da783c
1 parent ad5265f
commit 0da783c
Show file tree

Hide file tree

Showing 63 changed files with 149 additions and 1,415 deletions.
diff --git a/...ge/levendearbeidsforholdansettelse/consumers/command/aareg/HentArbeidsforholdCommand.java b/...ge/levendearbeidsforholdansettelse/consumers/command/aareg/HentArbeidsforholdCommand.java
@@ -39,26 +39,24 @@ private static String getNavCallId() {
     public Flux<Arbeidsforhold> call() {
 
         return webClient
-                    .get()
-                    .uri(builder -> builder
-                            .path("/{miljoe}/api/v1/arbeidstaker/arbeidsforhold")
-                            .queryParam("arbeidsforholdtype", "forenkletOppgjoersordning",
-                                    "frilanserOppdragstakerHonorarPersonerMm", "maritimtArbeidsforhold",
-                                    "ordinaertArbeidsforhold")
-                            .build(miljoe))
-                    .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                    .header(NAV_PERSON_IDENT, ident)
-                    .header(NavHeaders.NAV_CONSUMER_ID, CONSUMER)
-                    .header(NavHeaders.NAV_CALL_ID, getNavCallId())
-                    .retrieve()
-                    .bodyToFlux(Arbeidsforhold.class)
-                    .retryWhen(Retry
-                            .backoff(3, Duration.ofSeconds(5))
-                            .filter(WebClientFilter::is5xxException))
-                    .onErrorResume(WebClientResponseException.NotFound.class, error -> Mono.empty())
-                    .onErrorResume(WebClientResponseException.class, error -> {
-                        WebClientFilter.logErrorMessage(error);
-                        return Mono.empty();
-                    });
+                .get()
+                .uri(builder -> builder
+                        .path("/{miljoe}/api/v1/arbeidstaker/arbeidsforhold")
+                        .queryParam("arbeidsforholdtype", "forenkletOppgjoersordning",
+                                "frilanserOppdragstakerHonorarPersonerMm", "maritimtArbeidsforhold",
+                                "ordinaertArbeidsforhold")
+                        .build(miljoe))
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(NAV_PERSON_IDENT, ident)
+                .header(NavHeaders.NAV_CONSUMER_ID, CONSUMER)
+                .header(NavHeaders.NAV_CALL_ID, getNavCallId())
+                .retrieve()
+                .bodyToFlux(Arbeidsforhold.class)
+                .retryWhen(Retry
+                        .backoff(3, Duration.ofSeconds(5))
+                        .filter(WebClientFilter::is5xxException))
+                .doOnError(WebClientFilter::logErrorMessage)
+                .onErrorResume(WebClientResponseException.NotFound.class, error -> Mono.empty())
+                .onErrorResume(WebClientResponseException.class, error -> Mono.empty());
     }
 }
diff --git a/...levendearbeidsforholdansettelse/consumers/command/aareg/OpprettArbeidsforholdCommand.java b/...levendearbeidsforholdansettelse/consumers/command/aareg/OpprettArbeidsforholdCommand.java
@@ -37,6 +37,7 @@ public Mono<ResponseEntity<Void>> call() {
                 .retrieve()
                 .toBodilessEntity()
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                        .filter(WebClientFilter::is5xxException));
+                        .filter(WebClientFilter::is5xxException))
+                .doOnError(WebClientFilter::logErrorMessage);
     }
 }
diff --git a/...deArbeidsforholdSchedulerApplication.java → ...deArbeidsforholdSchedulerApplication.java b/...deArbeidsforholdSchedulerApplication.java → ...deArbeidsforholdSchedulerApplication.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler;
+package no.nav.testnav.levendearbeidsforholdscheduler;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...ldscheduler/config/ApplicationConfig.java → ...ldscheduler/config/ApplicationConfig.java b/...ldscheduler/config/ApplicationConfig.java → ...ldscheduler/config/ApplicationConfig.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.config;
+package no.nav.testnav.levendearbeidsforholdscheduler.config;
 
 import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
 import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;

diff --git a/...idsforholdscheduler/config/Consumers.java → ...idsforholdscheduler/config/Consumers.java b/...idsforholdscheduler/config/Consumers.java → ...idsforholdscheduler/config/Consumers.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.config;
+package no.nav.testnav.levendearbeidsforholdscheduler.config;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/...vendearbeidsforhold/config/DevConfig.java → ...idsforholdscheduler/config/DevConfig.java b/...vendearbeidsforhold/config/DevConfig.java → ...idsforholdscheduler/config/DevConfig.java
@@ -1,4 +1,4 @@
-package no.nav.registre.testnorge.levendearbeidsforhold.config;
+package no.nav.testnav.levendearbeidsforholdscheduler.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

diff --git a/...earbeidsforhold/config/OpenApiConfig.java → ...orholdscheduler/config/OpenApiConfig.java b/...earbeidsforhold/config/OpenApiConfig.java → ...orholdscheduler/config/OpenApiConfig.java
@@ -1,4 +1,4 @@
-package no.nav.registre.testnorge.levendearbeidsforhold.config;
+package no.nav.testnav.levendearbeidsforholdscheduler.config;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -7,15 +7,14 @@
 import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import no.nav.testnav.libs.servletcore.config.ApplicationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.Arrays;
 
-import no.nav.testnav.libs.servletcore.config.ApplicationProperties;
-
 @Configuration
 public class OpenApiConfig implements WebMvcConfigurer {
 

diff --git a/...holdscheduler/config/SchedulerConfig.java → ...holdscheduler/config/SchedulerConfig.java b/...holdscheduler/config/SchedulerConfig.java → ...holdscheduler/config/SchedulerConfig.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.config;
+package no.nav.testnav.levendearbeidsforholdscheduler.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...rholdscheduler/config/SecurityConfig.java → ...rholdscheduler/config/SecurityConfig.java b/...rholdscheduler/config/SecurityConfig.java → ...rholdscheduler/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.config;
+package no.nav.testnav.levendearbeidsforholdscheduler.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...cheduler/consumer/AnsettelseConsumer.java → ...cheduler/consumer/AnsettelseConsumer.java b/...cheduler/consumer/AnsettelseConsumer.java → ...cheduler/consumer/AnsettelseConsumer.java
@@ -1,7 +1,7 @@
-package no.nav.levendearbeidsforholdscheduler.consumer;
+package no.nav.testnav.levendearbeidsforholdscheduler.consumer;
 
-import no.nav.levendearbeidsforholdscheduler.config.Consumers;
-import no.nav.levendearbeidsforholdscheduler.consumer.command.AnsettelsesCommand;
+import no.nav.testnav.levendearbeidsforholdscheduler.config.Consumers;
+import no.nav.testnav.levendearbeidsforholdscheduler.consumer.command.AnsettelsesCommand;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Component;

diff --git a/.../consumer/command/AnsettelsesCommand.java → .../consumer/command/AnsettelsesCommand.java b/.../consumer/command/AnsettelsesCommand.java → .../consumer/command/AnsettelsesCommand.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.consumer.command;
+package no.nav.testnav.levendearbeidsforholdscheduler.consumer.command;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;

diff --git a/...dscheduler/controller/JobbController.java → ...dscheduler/controller/JobbController.java b/...dscheduler/controller/JobbController.java → ...dscheduler/controller/JobbController.java
@@ -1,11 +1,11 @@
-package no.nav.levendearbeidsforholdscheduler.controller;
+package no.nav.testnav.levendearbeidsforholdscheduler.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.levendearbeidsforholdscheduler.domain.StatusRespons;
-import no.nav.levendearbeidsforholdscheduler.scheduler.JobbScheduler;
+import no.nav.testnav.levendearbeidsforholdscheduler.domain.StatusRespons;
+import no.nav.testnav.levendearbeidsforholdscheduler.scheduler.JobbScheduler;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,7 +15,7 @@
 
 import java.util.Optional;
 
-import static no.nav.levendearbeidsforholdscheduler.utils.Utils.sifferTilHeltall;
+import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.sifferTilHeltall;
 
 @Slf4j
 @RestController

diff --git a/...orholdscheduler/domain/StatusRespons.java → ...orholdscheduler/domain/StatusRespons.java b/...orholdscheduler/domain/StatusRespons.java → ...orholdscheduler/domain/StatusRespons.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.domain;
+package no.nav.testnav.levendearbeidsforholdscheduler.domain;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...heduler/scheduler/AnsettelsesService.java → ...heduler/scheduler/AnsettelsesService.java b/...heduler/scheduler/AnsettelsesService.java → ...heduler/scheduler/AnsettelsesService.java
@@ -1,12 +1,13 @@
-package no.nav.levendearbeidsforholdscheduler.scheduler;
+package no.nav.testnav.levendearbeidsforholdscheduler.scheduler;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.levendearbeidsforholdscheduler.consumer.AnsettelseConsumer;
+import no.nav.testnav.levendearbeidsforholdscheduler.consumer.AnsettelseConsumer;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class AnsettelsesService {
+
     private final AnsettelseConsumer ansettelseConsumer;
 
     public void hent(){

diff --git a/...oldscheduler/scheduler/JobbScheduler.java → ...oldscheduler/scheduler/JobbScheduler.java b/...oldscheduler/scheduler/JobbScheduler.java → ...oldscheduler/scheduler/JobbScheduler.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.scheduler;
+package no.nav.testnav.levendearbeidsforholdscheduler.scheduler;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,8 +13,8 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import static no.nav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelayNaa;
-import static no.nav.levendearbeidsforholdscheduler.utils.Utils.hentKalender;
+import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelayNaa;
+import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.hentKalender;
 
 @Slf4j
 @Component

diff --git a/...earbeidsforholdscheduler/utils/Utils.java → ...earbeidsforholdscheduler/utils/Utils.java b/...earbeidsforholdscheduler/utils/Utils.java → ...earbeidsforholdscheduler/utils/Utils.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler.utils;
+package no.nav.testnav.levendearbeidsforholdscheduler.utils;
 
 import java.util.Calendar;
 import java.util.Date;

diff --git a/...eidsforholdSchedulerApplicationTests.java → ...eidsforholdSchedulerApplicationTests.java b/...eidsforholdSchedulerApplicationTests.java → ...eidsforholdSchedulerApplicationTests.java
@@ -1,4 +1,4 @@
-package no.nav.levendearbeidsforholdscheduler;
+package no.nav.testnav.levendearbeidsforholdscheduler;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/...cheduler/scheduler/JobbSchedulerTest.java → ...cheduler/scheduler/JobbSchedulerTest.java b/...cheduler/scheduler/JobbSchedulerTest.java → ...cheduler/scheduler/JobbSchedulerTest.java
@@ -1,9 +1,9 @@
-package no.nav.levendearbeidsforholdscheduler.scheduler;
+package no.nav.testnav.levendearbeidsforholdscheduler.scheduler;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 
-import static no.nav.levendearbeidsforholdscheduler.scheduler.JobbScheduler.sjekkGyldigTidsrom;
+import static no.nav.testnav.levendearbeidsforholdscheduler.scheduler.JobbScheduler.sjekkGyldigTidsrom;
 
 @Slf4j
 class JobbSchedulerTest {

diff --git a/...eidsforholdscheduler/utils/UtilsTest.java → ...eidsforholdscheduler/utils/UtilsTest.java b/...eidsforholdscheduler/utils/UtilsTest.java → ...eidsforholdscheduler/utils/UtilsTest.java
@@ -1,9 +1,8 @@
-package no.nav.levendearbeidsforholdscheduler.utils;
+package no.nav.testnav.levendearbeidsforholdscheduler.utils;
 
 import org.junit.jupiter.api.Test;
 
-import static no.nav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelay;
-import static org.junit.jupiter.api.Assertions.*;
+import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelay;
 
 class UtilsTest {
 

diff --git a/apps/levende-arbeidsforhold-service/build.gradle b/apps/levende-arbeidsforhold-service/build.gradle
@@ -50,6 +50,7 @@ dependencies {
     implementation 'no.nav.testnav.libs:servlet-insecure-security'
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:reactive-core'
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
 
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-web'

diff --git a/apps/levende-arbeidsforhold-service/settings.gradle b/apps/levende-arbeidsforhold-service/settings.gradle
@@ -10,6 +10,7 @@ includeBuild '../../libs/security-core'
 includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/servlet-insecure-security'
+includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../.github/workflows'
 
 develocity {

diff --git a/...rc/main/java/no/nav/registre/testnorge/levendearbeidsforhold/consumers/AaregConsumer.java b/...rc/main/java/no/nav/registre/testnorge/levendearbeidsforhold/consumers/AaregConsumer.java
diff --git a/...in/java/no/nav/registre/testnorge/levendearbeidsforhold/domain/v1/Ansettelsesperiode.java b/...in/java/no/nav/registre/testnorge/levendearbeidsforhold/domain/v1/Ansettelsesperiode.java