From c26f5cf088f398990950182c7362aabd1fc1c1e6 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Mon, 21 Oct 2024 16:27:32 +0200
Subject: [PATCH] Moved VaultUtil from servlet-core to vault.

---
 .../main/java/no/nav/brregstub/BrregApplicationLauncher.java    | 2 +-
 .../src/main/java/no/nav/udistub/UdiStubApplicationStarter.java | 2 +-
 libs/servlet-core/build.gradle                                  | 2 --
 .../main/java/no/nav/testnav/libs/vault}/VaultException.java    | 2 +-
 .../src/main/java/no/nav/testnav/libs/vault}/VaultUtil.java     | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename libs/{servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util => vault/src/main/java/no/nav/testnav/libs/vault}/VaultException.java (82%)
 rename libs/{servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util => vault/src/main/java/no/nav/testnav/libs/vault}/VaultUtil.java (97%)

diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
index 12faa239d78..75809753a81 100644
--- a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
+++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
@@ -1,6 +1,6 @@
 package no.nav.brregstub;
 
-import no.nav.testnav.libs.servletcore.util.VaultUtil;
+import no.nav.testnav.libs.vault.VaultUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
index b6eb3a1b723..014417090a3 100644
--- a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
+++ b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
@@ -1,6 +1,6 @@
 package no.nav.udistub;
 
-import no.nav.testnav.libs.servletcore.util.VaultUtil;
+import no.nav.testnav.libs.vault.VaultUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle
index 37aba9ca55a..0b12d2a71ed 100644
--- a/libs/servlet-core/build.gradle
+++ b/libs/servlet-core/build.gradle
@@ -10,11 +10,9 @@ sonarqube {
 }
 
 dependencies {
-
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
     implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback"
 
-
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 }
\ No newline at end of file
diff --git a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util/VaultException.java b/libs/vault/src/main/java/no/nav/testnav/libs/vault/VaultException.java
similarity index 82%
rename from libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util/VaultException.java
rename to libs/vault/src/main/java/no/nav/testnav/libs/vault/VaultException.java
index acf7a533722..29d5f2c7534 100644
--- a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util/VaultException.java
+++ b/libs/vault/src/main/java/no/nav/testnav/libs/vault/VaultException.java
@@ -1,4 +1,4 @@
-package no.nav.testnav.libs.servletcore.util;
+package no.nav.testnav.libs.vault;
 
 public class VaultException extends RuntimeException {
 
diff --git a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util/VaultUtil.java b/libs/vault/src/main/java/no/nav/testnav/libs/vault/VaultUtil.java
similarity index 97%
rename from libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util/VaultUtil.java
rename to libs/vault/src/main/java/no/nav/testnav/libs/vault/VaultUtil.java
index c29cc53cd3b..55fc24fc6dd 100644
--- a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/util/VaultUtil.java
+++ b/libs/vault/src/main/java/no/nav/testnav/libs/vault/VaultUtil.java
@@ -1,4 +1,4 @@
-package no.nav.testnav.libs.servletcore.util;
+package no.nav.testnav.libs.vault;
 
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;