Feature/sonar (#207)

Sonar warnings
Deprecated FPDateUtils (bør fjernes overalt)

Author: frode-carlsen

felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/isso/config/ServerInfo.java

@@ -19,7 +19,7 @@ public final class ServerInfo {
     private String callbackUrl;
     private String cookieDomain = cookieDomain(schemeHostPort);
 
-    private static volatile ServerInfo instance = null;
+    private static ServerInfo instance;
 
     ServerInfo() {
 

felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/ContextPathHolder.java

@@ -2,18 +2,20 @@
 
 public class ContextPathHolder {
 
-    private static volatile ContextPathHolder instance = null;
+    private static ContextPathHolder instance = null;
     private final String contextPath;
 
     private ContextPathHolder(String contextPath) {
         this.contextPath = contextPath;
     }
 
     public static ContextPathHolder instance() {
-        if (instance == null) {
-            throw new IllegalStateException();
+        synchronized (ContextPathHolder.class) {
+            if (instance == null) {
+                throw new IllegalStateException();
+            }
+            return instance;
         }
-        return instance;
     }
 
     public static ContextPathHolder instance(String contextPath) {

felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/oidc/OidcTokenValidatorProvider.java

@@ -32,7 +32,7 @@ public class OidcTokenValidatorProvider {
     private static final Set<IdentType> interneIdentTyper = new HashSet<>(Arrays.asList(IdentType.InternBruker, IdentType.Systemressurs));
     private static final Set<IdentType> eksterneIdentTyper = new HashSet<>(Arrays.asList(IdentType.EksternBruker));
 
-    private static volatile OidcTokenValidatorProvider instance = null;
+    private static OidcTokenValidatorProvider instance;
     private final Map<String, OidcTokenValidator> validators;
 
     private OidcTokenValidatorProvider() {

felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpConsumerImpl.java

@@ -115,7 +115,7 @@ public XacmlResponseWrapper evaluate(XacmlRequestBuilder request) {
     JsonObject execute(JsonObject request) {
         HttpPost post = new HttpPost(pdpUrl);
         post.setHeader("Content-type", MEDIA_TYPE);
-        post.setEntity(new StringEntity(request.toString(), Charset.forName("UTF-8")));
+        post.setEntity(new StringEntity(request.toString(), java.nio.charset.StandardCharsets.UTF_8));
 
         LOG.trace("PDP-request: {}", request);
 
@@ -143,7 +143,7 @@ JsonObject execute(JsonObject request) {
                 return response.getElement2();
             }
             if (HttpStatus.SC_UNAUTHORIZED == statusCode) {
-                throw PdpFeil.FACTORY.autentiseringFeilerEtterReinstansiering(System.getenv("HOSTNAME")).toException();
+                throw PdpFeil.FACTORY.autentiseringFeilerEtterReinstansiering(System.getenv("HOSTNAME")).toException(); // NOSONAR
             }
         }
         throw PdpFeil.FACTORY.httpFeil(statusCode, response.getElement1().getReasonPhrase()).toException();

felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/UnitTestConfiguration.java

@@ -21,7 +21,7 @@ public class UnitTestConfiguration {
 
     public static void loadUnitTestProperties() {
         Properties properties = getUnitTestProperties();
-        if (properties == null) {
+        if (properties.isEmpty()) {
             // ingenting nytt
             return;
         }
@@ -36,7 +36,7 @@ public static void loadToSystemProperties(Properties properties, boolean overwri
         Properties systemProperties = System.getProperties();
         for (Entry<Object, Object> entry : properties.entrySet()) {
             if (overwriteSystemProperties || !systemProperties.containsKey(entry.getKey())) {
-                log.info(entry.getKey() + " = " + entry.getValue()); //$NON-NLS-1$
+                log.info(entry.getKey() + " = " + entry.getValue()); // NOSONAR ok for test konfig
                 systemProperties.setProperty((String) entry.getKey(), (String) entry.getValue());
             }
         }

felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/FlywayKonfig.java

@@ -101,8 +101,8 @@ public boolean migrerDb() {
     }
 
     private boolean skalBrukeCustomClean(DataSource dataSource) {
-        try {
-            String databaseProductName = dataSource.getConnection().getMetaData().getDatabaseProductName();
+        try (var conn = dataSource.getConnection()) {
+            String databaseProductName = conn.getMetaData().getDatabaseProductName();
             return "PostgreSQL".equalsIgnoreCase(databaseProductName);
         } catch (SQLException e) {
             throw FeilFactory.create(DbMigreringFeil.class).kanIkkeDetektereDatbaseType(e).toException();
@@ -125,7 +125,7 @@ private Properties lesFlywayPlaceholders() {
     private void clean(DataSource dataSource, String username) {
         try (Connection c = dataSource.getConnection();
              Statement stmt = c.createStatement()) {
-            stmt.execute("drop owned by " + username.replaceAll("[^a-zA-Z0-9_-]", "_"));
+            stmt.execute("drop owned by " + username.replaceAll("[^a-zA-Z0-9_-]", "_")); // NOSONAR ok her, test konfig
         } catch (SQLException e) {
             throw new IllegalStateException("Kunne ikke kjøre clean på db", e);
         }

felles/util/src/main/java/no/nav/vedtak/util/FPDateUtil.java

@@ -8,11 +8,11 @@
 import java.time.Period;
 import java.time.temporal.ChronoUnit;
 
-import no.nav.vedtak.konfig.PropertyUtil;
-
 /**
  * Returner funksjonelt tidsoffset, Brukes med LocalDate og LocalDateTime. eks. LocalDate.now(FPDateUtil.getOffset)
+ * @deprecated  Overstyring av clock er ikke et test behov lenger (gjøres bedre gjennom docker/kubernetes).
  */
+@Deprecated(forRemoval = true)
 public class FPDateUtil {
     private static volatile ClockProvider clockProvider;
 
@@ -39,7 +39,7 @@ public static ClockProvider getCurrentClockProvider() {
 
     /**
      * Ikke bruk denne metoden direkte, kall på iDag() eller nå()
-     * Metoden vil bli private i en fremtidig versjon
+     * @deprecated Metoden vil bli private i en fremtidig versjon
      */
     @Deprecated
     public static Clock getOffset() {
@@ -86,7 +86,7 @@ public static class SystemConfiguredClockProvider implements ClockProvider {
         private volatile Clock clock;
 
         public SystemConfiguredClockProvider() {
-            String offsetPeriode = PropertyUtil.getProperty(PROPERTY_KEY_OFFSET_PERIODE);
+            String offsetPeriode = getProperty(PROPERTY_KEY_OFFSET_PERIODE);
 
             if (offsetPeriode != null && !offsetPeriode.isEmpty()) {
                 this.offsetPeriod = Period.parse(offsetPeriode);
@@ -128,5 +128,16 @@ private LocalDate periodToLocalDate(Period period) {
                 .plusMonths(period.getMonths())
                 .plusDays(period.getDays());
         }
+        
+        /** Gjør eget oppslag her for å ikke koble denne koden til EnvironmentProperty eller annet rammeverk. */
+        private String getProperty(String key) {
+            // sjekk system props først.
+            String val = System.getProperty(key); // NOSONAR
+            if (val == null) {
+                // sjekk env hvis ikke fins som system prop
+                val = System.getenv(key.toUpperCase().replace('.', '_')); // NOSONAR 
+            }
+            return val;
+        }
     }
 }

integrasjon/oppgave-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/request/AktørId.java

@@ -17,14 +17,14 @@ public class AktørId implements Serializable, Comparable<AktørId> {
     private static final String VALID_REGEXP = "^\\d{13}$";
 
     private static final Pattern VALID = Pattern.compile(VALID_REGEXP, Pattern.CASE_INSENSITIVE);
-    private static AtomicLong DUMMY_AKTØRID = new AtomicLong(1000000000000L);
+    private static final AtomicLong DUMMY_AKTØRID = new AtomicLong(1000000000000L);
 
     @JsonValue
     @NotNull
     @javax.validation.constraints.Pattern(regexp = VALID_REGEXP, message = "aktørId ${validatedValue} har ikke gyldig verdi ( pattern '{regexp}')")
     private String aktørId;  // NOSONAR
 
-    protected AktørId() {
+    protected AktørId() { // NOSONAR
         // for hibernate
     }
 

integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestClientSupportProdusent.java

@@ -50,10 +50,10 @@ public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
                     String param = he.getName();
                     String value = he.getValue();
                     if (value != null && param.equalsIgnoreCase("timeout")) {
-                        return Long.parseLong(value) * 1000;
+                        return Long.parseLong(value) * 1000L;
                     }
                 }
-                return seconds * 1000;
+                return seconds * 1000L;
             }
         };
         return myStrategy;