Skip to content

Commit 0da783c

Browse files
krharumkrharum
committed
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.
1 parent ad5265f commit 0da783c

File tree

63 files changed

+149
-1415
lines changed

Some content is hidden

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

63 files changed

+149
-1415
lines changed

‎apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/consumers/command/aareg/HentArbeidsforholdCommand.java

+19-21
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,24 @@ private static String getNavCallId() {
3939
public Flux<Arbeidsforhold> call() {
4040

4141
return webClient
42-
.get()
43-
.uri(builder -> builder
44-
.path("/{miljoe}/api/v1/arbeidstaker/arbeidsforhold")
45-
.queryParam("arbeidsforholdtype", "forenkletOppgjoersordning",
46-
"frilanserOppdragstakerHonorarPersonerMm", "maritimtArbeidsforhold",
47-
"ordinaertArbeidsforhold")
48-
.build(miljoe))
49-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
50-
.header(NAV_PERSON_IDENT, ident)
51-
.header(NavHeaders.NAV_CONSUMER_ID, CONSUMER)
52-
.header(NavHeaders.NAV_CALL_ID, getNavCallId())
53-
.retrieve()
54-
.bodyToFlux(Arbeidsforhold.class)
55-
.retryWhen(Retry
56-
.backoff(3, Duration.ofSeconds(5))
57-
.filter(WebClientFilter::is5xxException))
58-
.onErrorResume(WebClientResponseException.NotFound.class, error -> Mono.empty())
59-
.onErrorResume(WebClientResponseException.class, error -> {
60-
WebClientFilter.logErrorMessage(error);
61-
return Mono.empty();
62-
});
42+
.get()
43+
.uri(builder -> builder
44+
.path("/{miljoe}/api/v1/arbeidstaker/arbeidsforhold")
45+
.queryParam("arbeidsforholdtype", "forenkletOppgjoersordning",
46+
"frilanserOppdragstakerHonorarPersonerMm", "maritimtArbeidsforhold",
47+
"ordinaertArbeidsforhold")
48+
.build(miljoe))
49+
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
50+
.header(NAV_PERSON_IDENT, ident)
51+
.header(NavHeaders.NAV_CONSUMER_ID, CONSUMER)
52+
.header(NavHeaders.NAV_CALL_ID, getNavCallId())
53+
.retrieve()
54+
.bodyToFlux(Arbeidsforhold.class)
55+
.retryWhen(Retry
56+
.backoff(3, Duration.ofSeconds(5))
57+
.filter(WebClientFilter::is5xxException))
58+
.doOnError(WebClientFilter::logErrorMessage)
59+
.onErrorResume(WebClientResponseException.NotFound.class, error -> Mono.empty())
60+
.onErrorResume(WebClientResponseException.class, error -> Mono.empty());
6361
}
6462
}

‎apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/registre/testnorge/levendearbeidsforholdansettelse/consumers/command/aareg/OpprettArbeidsforholdCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public Mono<ResponseEntity<Void>> call() {
3737
.retrieve()
3838
.toBodilessEntity()
3939
.retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
40-
.filter(WebClientFilter::is5xxException));
40+
.filter(WebClientFilter::is5xxException))
41+
.doOnError(WebClientFilter::logErrorMessage);
4142
}
4243
}

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/LevendeArbeidsforholdSchedulerApplication.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/LevendeArbeidsforholdSchedulerApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler;
1+
package no.nav.testnav.levendearbeidsforholdscheduler;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/config/ApplicationConfig.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/ApplicationConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.config;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.config;
22

33
import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
44
import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/config/Consumers.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/Consumers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.config;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.config;
22

33
import lombok.Getter;
44
import lombok.NoArgsConstructor;

‎apps/levende-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/levendearbeidsforhold/config/DevConfig.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/DevConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.registre.testnorge.levendearbeidsforhold.config;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.config;
22

33
import org.springframework.context.annotation.Configuration;
44
import org.springframework.context.annotation.Profile;

‎apps/levende-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/levendearbeidsforhold/config/OpenApiConfig.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/OpenApiConfig.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.registre.testnorge.levendearbeidsforhold.config;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.config;
22

33
import io.swagger.v3.oas.models.Components;
44
import io.swagger.v3.oas.models.OpenAPI;
@@ -7,15 +7,14 @@
77
import io.swagger.v3.oas.models.info.License;
88
import io.swagger.v3.oas.models.security.SecurityRequirement;
99
import io.swagger.v3.oas.models.security.SecurityScheme;
10+
import no.nav.testnav.libs.servletcore.config.ApplicationProperties;
1011
import org.springframework.context.annotation.Bean;
1112
import org.springframework.context.annotation.Configuration;
1213
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
1314
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1415

1516
import java.util.Arrays;
1617

17-
import no.nav.testnav.libs.servletcore.config.ApplicationProperties;
18-
1918
@Configuration
2019
public class OpenApiConfig implements WebMvcConfigurer {
2120

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/config/SchedulerConfig.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/SchedulerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.config;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.config;
22

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/config/SecurityConfig.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/SecurityConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.config;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.config;
22

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/consumer/AnsettelseConsumer.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/consumer/AnsettelseConsumer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package no.nav.levendearbeidsforholdscheduler.consumer;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.consumer;
22

3-
import no.nav.levendearbeidsforholdscheduler.config.Consumers;
4-
import no.nav.levendearbeidsforholdscheduler.consumer.command.AnsettelsesCommand;
3+
import no.nav.testnav.levendearbeidsforholdscheduler.config.Consumers;
4+
import no.nav.testnav.levendearbeidsforholdscheduler.consumer.command.AnsettelsesCommand;
55
import no.nav.testnav.libs.securitycore.domain.ServerProperties;
66
import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
77
import org.springframework.stereotype.Component;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/consumer/command/AnsettelsesCommand.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/consumer/command/AnsettelsesCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.consumer.command;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.consumer.command;
22

33
import lombok.RequiredArgsConstructor;
44
import org.springframework.http.HttpHeaders;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/controller/JobbController.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/controller/JobbController.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package no.nav.levendearbeidsforholdscheduler.controller;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.controller;
22

33
import io.swagger.v3.oas.annotations.Operation;
44
import io.swagger.v3.oas.annotations.media.Schema;
55
import lombok.RequiredArgsConstructor;
66
import lombok.extern.slf4j.Slf4j;
7-
import no.nav.levendearbeidsforholdscheduler.domain.StatusRespons;
8-
import no.nav.levendearbeidsforholdscheduler.scheduler.JobbScheduler;
7+
import no.nav.testnav.levendearbeidsforholdscheduler.domain.StatusRespons;
8+
import no.nav.testnav.levendearbeidsforholdscheduler.scheduler.JobbScheduler;
99
import org.springframework.http.HttpStatus;
1010
import org.springframework.http.ResponseEntity;
1111
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,7 +15,7 @@
1515

1616
import java.util.Optional;
1717

18-
import static no.nav.levendearbeidsforholdscheduler.utils.Utils.sifferTilHeltall;
18+
import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.sifferTilHeltall;
1919

2020
@Slf4j
2121
@RestController

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/domain/StatusRespons.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/domain/StatusRespons.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.domain;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.domain;
22

33
import lombok.Getter;
44
import lombok.Setter;

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/scheduler/AnsettelsesService.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/scheduler/AnsettelsesService.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
package no.nav.levendearbeidsforholdscheduler.scheduler;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.scheduler;
22

33
import lombok.RequiredArgsConstructor;
4-
import no.nav.levendearbeidsforholdscheduler.consumer.AnsettelseConsumer;
4+
import no.nav.testnav.levendearbeidsforholdscheduler.consumer.AnsettelseConsumer;
55
import org.springframework.stereotype.Service;
66

77
@Service
88
@RequiredArgsConstructor
99
public class AnsettelsesService {
10+
1011
private final AnsettelseConsumer ansettelseConsumer;
1112

1213
public void hent(){

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/scheduler/JobbScheduler.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/scheduler/JobbScheduler.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.scheduler;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.scheduler;
22

33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
@@ -13,8 +13,8 @@
1313
import java.util.concurrent.ScheduledFuture;
1414
import java.util.concurrent.TimeUnit;
1515

16-
import static no.nav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelayNaa;
17-
import static no.nav.levendearbeidsforholdscheduler.utils.Utils.hentKalender;
16+
import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelayNaa;
17+
import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.hentKalender;
1818

1919
@Slf4j
2020
@Component

‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/levendearbeidsforholdscheduler/utils/Utils.java ‎apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/utils/Utils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler.utils;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.utils;
22

33
import java.util.Calendar;
44
import java.util.Date;

‎apps/levende-arbeidsforhold-scheduler/src/test/java/no/nav/levendearbeidsforholdscheduler/LevendeArbeidsforholdSchedulerApplicationTests.java ‎apps/levende-arbeidsforhold-scheduler/src/test/java/no/nav/testnav/levendearbeidsforholdscheduler/LevendeArbeidsforholdSchedulerApplicationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.levendearbeidsforholdscheduler;
1+
package no.nav.testnav.levendearbeidsforholdscheduler;
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.boot.test.context.SpringBootTest;

‎apps/levende-arbeidsforhold-scheduler/src/test/java/no/nav/levendearbeidsforholdscheduler/scheduler/JobbSchedulerTest.java ‎apps/levende-arbeidsforhold-scheduler/src/test/java/no/nav/testnav/levendearbeidsforholdscheduler/scheduler/JobbSchedulerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package no.nav.levendearbeidsforholdscheduler.scheduler;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.scheduler;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.junit.jupiter.api.Test;
55

6-
import static no.nav.levendearbeidsforholdscheduler.scheduler.JobbScheduler.sjekkGyldigTidsrom;
6+
import static no.nav.testnav.levendearbeidsforholdscheduler.scheduler.JobbScheduler.sjekkGyldigTidsrom;
77

88
@Slf4j
99
class JobbSchedulerTest {

‎apps/levende-arbeidsforhold-scheduler/src/test/java/no/nav/levendearbeidsforholdscheduler/utils/UtilsTest.java ‎apps/levende-arbeidsforhold-scheduler/src/test/java/no/nav/testnav/levendearbeidsforholdscheduler/utils/UtilsTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package no.nav.levendearbeidsforholdscheduler.utils;
1+
package no.nav.testnav.levendearbeidsforholdscheduler.utils;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static no.nav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelay;
6-
import static org.junit.jupiter.api.Assertions.*;
5+
import static no.nav.testnav.levendearbeidsforholdscheduler.utils.Utils.beregnEkstraDelay;
76

87
class UtilsTest {
98

‎apps/levende-arbeidsforhold-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ dependencies {
5050
implementation 'no.nav.testnav.libs:servlet-insecure-security'
5151
implementation 'no.nav.testnav.libs:servlet-core'
5252
implementation 'no.nav.testnav.libs:reactive-core'
53+
implementation 'no.nav.testnav.libs:data-transfer-objects'
5354

5455
implementation 'org.springframework.boot:spring-boot-starter-webflux'
5556
implementation 'org.springframework.boot:spring-boot-starter-web'

‎apps/levende-arbeidsforhold-service/settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ includeBuild '../../libs/security-core'
1010
includeBuild '../../libs/servlet-core'
1111
includeBuild '../../libs/reactive-core'
1212
includeBuild '../../libs/servlet-insecure-security'
13+
includeBuild '../../libs/data-transfer-objects'
1314
includeBuild '../../.github/workflows'
1415

1516
develocity {

‎apps/levende-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/levendearbeidsforhold/consumers/AaregConsumer.java

-77
This file was deleted.

‎apps/levende-arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/levendearbeidsforhold/domain/v1/Ansettelsesperiode.java

-42
This file was deleted.

0 commit comments

Comments
 (0)