diff --git a/apps/oppdrag-service/Dockerfile b/apps/oppdrag-service/Dockerfile index 99a3394716..b8026e2502 100644 --- a/apps/oppdrag-service/Dockerfile +++ b/apps/oppdrag-service/Dockerfile @@ -1,8 +1,8 @@ FROM ghcr.io/navikt/baseimages/temurin:21 LABEL maintainer="Team Dolly" -ENV JAVA_OPTS="-Dspring.profiles.active=prod --add-opens java.base/java.lang=ALL-UNNAMED" +COPY /build/libs/app.jar /app/app.jar -ADD /build/libs/app.jar /app/app.jar +ENV JAVA_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED -Dspring.profiles.active=prod" EXPOSE 8080 diff --git a/apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/DevConfig.java b/apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/DevConfig.java index a93f3cd275..55c35c48b9 100644 --- a/apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/DevConfig.java +++ b/apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/DevConfig.java @@ -3,11 +3,9 @@ import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import org.springframework.vault.annotation.VaultPropertySource; @Configuration @Profile("dev") -@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false) public class DevConfig extends AbstractLocalVaultConfiguration { } \ No newline at end of file diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/oppdragservice/v1/OppdragKodeverk.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/oppdragservice/v1/OppdragKodeverk.java index 798bd4320d..d34a61fa39 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/oppdragservice/v1/OppdragKodeverk.java +++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/oppdragservice/v1/OppdragKodeverk.java @@ -1,8 +1,10 @@ package no.nav.testnav.libs.dto.oppdragservice.v1; import lombok.Getter; +import lombok.RequiredArgsConstructor; @Getter +@RequiredArgsConstructor public enum OppdragKodeverk { JA_NEI (Oppdrag.JaNei.class), @@ -16,10 +18,6 @@ public enum OppdragKodeverk { UTBETALING_FREKVENS_TYPE(Oppdrag.UtbetalingFrekvensType.class), VALUTA_TYPE(Oppdrag.ValutaType.class); - private Class implementasjon; - - private OppdragKodeverk(Class implementasjon) { - this.implementasjon = implementasjon; - } - } + private final Class implementasjon; + } \ No newline at end of file