Merge "Fix more sonar issues"

3 files changed, 11 insertions, 11 deletions

diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java
index 59a1816b7..fefea39ab 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/CallGuardTask.java
@@ -151,7 +151,7 @@ public class CallGuardTask implements Runnable {
         //
         // Create an artificial Guard response in case we didn't get a clear Permit or Deny
         //
-        if (guardResponse.getResult().equals("Indeterminate")) {
+        if ("Indeterminate".equals(guardResponse.getResult())) {
             guardResponse.setOperation(recipe);
             guardResponse.setRequestID(UUID.fromString(requestId));
         }
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PipEngineGetHistory.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PipEngineGetHistory.java
index 2a1ef2fc6..37c4e4c68 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PipEngineGetHistory.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PipEngineGetHistory.java
@@ -122,7 +122,7 @@ public class PipEngineGetHistory extends StdConfigurableEngine {
             // Notice, we are checking here for the base issuer prefix.
             if (!string.contains(this.getIssuer())) {
                 logger.debug("Requested issuer '{}' does not match {}", string, getIssuer());
-                logger.debug("FeqLimiter PIP - Issuer {}  does not match with: ", string, this.getIssuer());
+                logger.debug("FeqLimiter PIP - Issuer {}  does not match with: {}", string, this.getIssuer());
                 return StdPIPResponse.PIP_RESPONSE_EMPTY;
             }
         }
@@ -184,14 +184,14 @@ public class PipEngineGetHistory extends StdConfigurableEngine {
         if (pipResponse.getStatus() != null && !pipResponse.getStatus().isOk()) {
             if (logger.isWarnEnabled()) {
                 logger.warn("PIP response error {}: {}", pipRequest.getAttributeId().stringValue(),
-                        pipResponse.getStatus().toString());
+                        pipResponse.getStatus());
             }
             return null;
         }
         if (pipResponse.getAttributes() != null && pipResponse.getAttributes().isEmpty()) {
             if (logger.isWarnEnabled()) {
                 logger.warn("No attributes in POP response {}: {}", pipRequest.getAttributeId().stringValue(),
-                        pipResponse.getStatus().toString());
+                        pipResponse.getStatus());
             }
             return null;
         }
@@ -309,7 +309,7 @@ public class PipEngineGetHistory extends StdConfigurableEngine {
 
         EntityManager em = null;
         String opsHistPu = System.getProperty("OperationsHistoryPU");
-        if (opsHistPu == null || !opsHistPu.equals("TestOperationsHistoryPU")) {
+        if (!"TestOperationsHistoryPU".equals(opsHistPu)) {
             opsHistPu = "OperationsHistoryPU";
         } else {
             props.clear();
@@ -328,7 +328,7 @@ public class PipEngineGetHistory extends StdConfigurableEngine {
         try {
             diff = now - getMsFromTimeWindow(timeWindow);
         } catch (Exception ex) {
-            logger.error("PIP thread got Exception " + ex);
+            logger.error("PIP thread got Exception ", ex);
             return -1;
         }
 
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java
index 46a815cdd..d159bd425 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/Util.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * guard
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,6 @@ import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
 public final class Util {
-    private Util() {
-        // This static class cannot be instantiated
-    }
-
     /*
      * Keys for guard properties
      */
@@ -87,6 +83,10 @@ public final class Util {
         }
     }
 
+    private Util() {
+        // This static class cannot be instantiated
+    }
+
     /**
      * Load a Yaml file.
      *