**Refactor project structure and dependencies**

Remove unnecessary DevConfig and centralize logic under oppdragservice package. Also, streamline build configuration by using dolly-apps plugin and integrating vault library for improved consistency and security management.

apps/oppdrag-service/build.gradle

@@ -10,28 +10,16 @@ buildscript {
 }
 
 plugins {
- id 'java'
- id "org.sonarqube" version "4.4.1.3373"
- id 'org.springframework.boot' version "3.2.1"
- id 'io.spring.dependency-management' version "1.1.4"
- id "jacoco"
+ id 'dolly-apps'
  id "uk.co.boothen.gradle.wsimport" version "0.21"
 }
 
 apply plugin: "uk.co.boothen.gradle.wsimport"
 
 sonarqube {
  properties {
- property "sonar.dynamicAnalysis", "reuseReports"
- property "sonar.host.url", "https://sonarcloud.io"
- property "sonar.java.coveragePlugin", "jacoco"
- property "sonar.language", "java"
- property "sonar.token", System.getenv("SONAR_TOKEN")
- property "sonar.organization", "navikt"
- property "sonar.project.monorepo.enabled", true
  property "sonar.projectKey", "testnav-oppdrag-service"
  property "sonar.projectName", "testnav-oppdrag-service"
- property "sonar.sourceEncoding", "UTF-8"
  }
 }
 
@@ -54,19 +42,6 @@ wsimport {
  target = "3.0"
 }
 
-dependencyManagement {
- applyMavenExclusions = false
- imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
- }
-}
-
-java {
- toolchain {
- languageVersion = JavaLanguageVersion.of(21)
- }
-}
-
 repositories {
  mavenCentral()
  maven {
@@ -97,6 +72,7 @@ dependencies {
  implementation 'no.nav.testnav.libs:servlet-core'
  implementation 'no.nav.testnav.libs:servlet-security'
  implementation 'no.nav.testnav.libs:data-transfer-objects'
+ implementation "no.nav.testnav.libs:vault"
 
  implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
 

apps/oppdrag-service/settings.gradle

@@ -8,6 +8,7 @@ includeBuild '../../libs/security-core'
 includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/servlet-security'
 includeBuild '../../libs/data-transfer-objects'
+includeBuild '../../libs/vault'
 
 gradleEnterprise {
  buildScan {

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/OppdragServiceApplicationStarter.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/OppdragServiceApplicationStarter.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service;
+package no.nav.testnav.oppdragservice;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/config/ApplicationConfig.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service.config;
+package no.nav.testnav.oppdragservice.config;
 
 import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
 import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/DevConfig.java

@@ -0,0 +1,13 @@
+package no.nav.testnav.oppdragservice.config;
+
+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 {
+
+}

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/config/OpenApiConfig.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/OpenApiConfig.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service.config;
+package no.nav.testnav.oppdragservice.config;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/config/OppdragWsConfiguration.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/OppdragWsConfiguration.java

@@ -1,6 +1,6 @@
-package no.nav.testnav.oppdrag.service.config;
+package no.nav.testnav.oppdragservice.config;
 
-import no.nav.testnav.oppdrag.service.consumer.OppdragClient;
+import no.nav.testnav.oppdragservice.consumer.OppdragClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/config/SecurityConfig.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service.config;
+package no.nav.testnav.oppdragservice.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/consumer/OppdragClient.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/consumer/OppdragClient.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service.consumer;
+package no.nav.testnav.oppdragservice.consumer;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.ws.client.core.support.WebServiceGatewaySupport;

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/consumer/OppdragConsumer.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/consumer/OppdragConsumer.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service.consumer;
+package no.nav.testnav.oppdragservice.consumer;
 
 import org.springframework.stereotype.Service;
 

apps/oppdrag-service/src/main/java/no/nav/testnav/oppdrag/service/provider/OppdragController.java → apps/oppdrag-service/src/main/java/no/nav/testnav/oppdragservice/provider/OppdragController.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service.provider;
+package no.nav.testnav.oppdragservice.provider;
 
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

apps/oppdrag-service/src/test/java/no/nav/testnav.oppdrag.service/ApplicationContextTest.java → apps/oppdrag-service/src/test/java/no/nav/testnav/oppdragservice/ApplicationContextTest.java

@@ -1,4 +1,4 @@
-package no.nav.testnav.oppdrag.service;
+package no.nav.testnav.oppdragservice;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/oppdragservice/v1/OppdragRequest.java

@@ -8,6 +8,5 @@
 @Data
 @Builder
 @NoArgsConstructor
-@AllArgsConstructor
 public class OppdragRequest {
 }