diff options
author | 2018-10-01 20:42:36 -0400 | |
---|---|---|
committer | 2018-10-01 20:42:42 -0400 | |
commit | 98bf012459c846d1c3906a5d1ead73cf26b8e195 (patch) | |
tree | 5f309d4ff08067b90195afbcfd986d1c67305930 /controlloop/common/guard/src/main/java/org | |
parent | 320ff21040c901d4886fdfabdbc2708e3877a37c (diff) |
Fix remaining sonar
Mostly moving variables to their right spot.
Issue-ID: POLICY-1129
Change-Id: Iccc084bbb404ffd51bdd0b26b5f8c373c6142fb1
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'controlloop/common/guard/src/main/java/org')
-rw-r--r-- | controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuard.java | 15 | ||||
-rw-r--r-- | controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java | 12 |
2 files changed, 14 insertions, 13 deletions
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuard.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuard.java index 865a442b9..e4849cea5 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuard.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuard.java @@ -30,9 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PolicyGuard { - private PolicyGuard() { - // Cannot instantiate this static class - } private static final Logger logger = LoggerFactory.getLogger(PolicyGuard.class); @@ -45,10 +42,6 @@ public class PolicyGuard { private A parameterA; private B parameterB; - public static <A, B> LockResult<A, B> createLockResult(A parameterA, B parameterB) { - return new LockResult<>(parameterA, parameterB); - } - public LockResult(A parameterA, B parameterB) { this.parameterA = parameterA; this.parameterB = parameterB; @@ -61,8 +54,16 @@ public class PolicyGuard { public B getB() { return parameterB; } + + public static <A, B> LockResult<A, B> createLockResult(A parameterA, B parameterB) { + return new LockResult<>(parameterA, parameterB); + } } + private PolicyGuard() { + // Cannot instantiate this static class + } + /** * Get the factory. * diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java index ec4ebf9cd..35b1d2561 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java @@ -54,6 +54,12 @@ public class PolicyGuardXacmlHelper { // Constant for the systme line separator private static final String SYSTEM_LS = System.lineSeparator(); + private UrlEntry[] restUrls = null; + private int restUrlIndex = 0; + + // REST timeout, initialized from 'pdpx.timeout' property + private int timeout = 20000; + public PolicyGuardXacmlHelper() { init(PolicyEngine.manager.getEnvironment()); } @@ -72,12 +78,6 @@ public class PolicyGuardXacmlHelper { String environment = null; } - private UrlEntry[] restUrls = null; - private int restUrlIndex = 0; - - // REST timeout, initialized from 'pdpx.timeout' property - private int timeout = 20000; - /** * Call PDP. * |