Fjernet noen null-relaterte warnings.

navikt · Apr 12, 2024 · 29ace95 · 29ace95
1 parent 2a4e427
commit 29ace95
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/...vice/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java b/...vice/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.lang.NonNull;
 import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.ClientAuthentication;
 import org.springframework.vault.authentication.TokenAuthentication;
@@ -15,14 +16,16 @@
 @VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false)
 public class DevConfig extends AbstractVaultConfiguration {
 
-       private static final String VAULT_TOKEN = "spring.cloud.vault.token";
+    private static final String VAULT_TOKEN = "spring.cloud.vault.token";
 
     @Override
+    @NonNull
     public VaultEndpoint vaultEndpoint() {
         return VaultEndpoint.create("vault.adeo.no", 443);
     }
 
     @Override
+    @NonNull
     public ClientAuthentication clientAuthentication() {
         if (System.getenv().containsKey("VAULT_TOKEN")) {
             System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));

diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalVaultConfig.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/LocalVaultConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.lang.NonNull;
 import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.ClientAuthentication;
 import org.springframework.vault.authentication.TokenAuthentication;
@@ -18,11 +19,13 @@ public class LocalVaultConfig extends AbstractVaultConfiguration {
     private static final String VAULT_TOKEN = "spring.cloud.vault.token";
 
     @Override
+    @NonNull
     public VaultEndpoint vaultEndpoint() {
         return VaultEndpoint.create("vault.adeo.no", 443);
     }
 
     @Override
+    @NonNull
     public ClientAuthentication clientAuthentication() {
         if (System.getenv().containsKey("VAULT_TOKEN")) {
             System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));

diff --git a/...joer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/DevConfig.java b/...joer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/DevConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.lang.NonNull;
 import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.ClientAuthentication;
 import org.springframework.vault.authentication.TokenAuthentication;
@@ -18,11 +19,13 @@ public class DevConfig extends AbstractVaultConfiguration {
        private static final String VAULT_TOKEN = "spring.cloud.vault.token";
 
     @Override
+    @NonNull
     public VaultEndpoint vaultEndpoint() {
         return VaultEndpoint.create("vault.adeo.no", 443);
     }
 
     @Override
+    @NonNull
     public ClientAuthentication clientAuthentication() {
         if (System.getenv().containsKey("VAULT_TOKEN")) {
             System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));

diff --git a/...versikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/DevConfig.java b/...versikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/DevConfig.java
@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.lang.NonNull;
 import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.ClientAuthentication;
 import org.springframework.vault.authentication.TokenAuthentication;
@@ -18,11 +19,13 @@ public class DevConfig  extends AbstractVaultConfiguration {
        private static final String VAULT_TOKEN = "spring.cloud.vault.token";
 
     @Override
+    @NonNull
     public VaultEndpoint vaultEndpoint() {
         return VaultEndpoint.create("vault.adeo.no", 443);
     }
 
     @Override
+    @NonNull
     public ClientAuthentication clientAuthentication() {
         if (System.getenv().containsKey("VAULT_TOKEN")) {
             System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));