summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-19 13:45:15 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-03-19 13:45:26 -0400
commit041240baab6082916e5da69ed190051b7aa60f12 (patch)
treed890fb0b6a1882ee23933da27286baabd1f39ab9
parent59c38b6b3dfbd43c876f85ffb1e4b484951ced44 (diff)
Fix sonar issues xacml pdp
Fixed some small sonar issues. Some of the others will be taken care of when we implement things. Issue-ID: POLICY-1602 Change-Id: I745962feaf00904c39b2e80e00bcc565f51dc8fd Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java2
-rw-r--r--applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java10
-rw-r--r--applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java2
-rw-r--r--applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java4
4 files changed, 10 insertions, 8 deletions
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java
index 785ed9a8..352e51d8 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java
@@ -58,7 +58,7 @@ public final class ToscaDictionary {
public static final Identifier ID_OBLIGATION_POLICY_MONITORING_DATATYPE =
XACML3.ID_DATATYPE_STRING;
- public static final Identifier ID_OBLIGATION_ISSUER =
+ public static final Identifier ID_OBLIGATION_MONITORING_ISSUER =
new IdentifierImpl(URN_ONAP, "issuer:monitoring");
private ToscaDictionary() {
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java
index 19adaf6c..ca327b90 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/XacmlPolicyUtils.java
@@ -51,6 +51,8 @@ import org.slf4j.LoggerFactory;
public class XacmlPolicyUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPolicyUtils.class);
+ private static final String DOT_FILE_SUFFIX = ".file";
+ private static final String NOT_FOUND_MESSAGE = "NOT FOUND";
private XacmlPolicyUtils() {
super();
@@ -165,7 +167,7 @@ public class XacmlPolicyUtils {
id++;
} else {
referencedPolicies.add(refId);
- properties.put(refId + ".file", refPolicyPath.toAbsolutePath().toString());
+ properties.put(refId + DOT_FILE_SUFFIX, refPolicyPath.toAbsolutePath().toString());
break;
}
}
@@ -193,7 +195,7 @@ public class XacmlPolicyUtils {
boolean found = false;
Set<String> referencedPolicies = XACMLProperties.getReferencedPolicyIDs(properties);
for (String refPolicy : referencedPolicies) {
- String refPolicyFile = refPolicy + ".file";
+ String refPolicyFile = refPolicy + DOT_FILE_SUFFIX;
//
// If the key and value match, then it will return true
//
@@ -240,7 +242,7 @@ public class XacmlPolicyUtils {
Set<String> rootPolicies = XACMLProperties.getRootPolicyIDs(properties);
logger.debug("Root Policies: {}", properties.getProperty(XACMLProperties.PROP_ROOTPOLICIES));
for (String root : rootPolicies) {
- logger.debug("{}", properties.getProperty(root + ".file", "NOT FOUND"));
+ logger.debug("{}", properties.getProperty(root + DOT_FILE_SUFFIX, NOT_FOUND_MESSAGE));
}
//
// Get the current set of referenced policy ids
@@ -248,7 +250,7 @@ public class XacmlPolicyUtils {
Set<String> referencedPolicies = XACMLProperties.getReferencedPolicyIDs(properties);
logger.debug("Referenced Policies: {}", properties.getProperty(XACMLProperties.PROP_REFERENCEDPOLICIES));
for (String ref : referencedPolicies) {
- logger.debug("{}", properties.getProperty(ref + ".file", "NOT FOUND"));
+ logger.debug("{}", properties.getProperty(ref + DOT_FILE_SUFFIX, NOT_FOUND_MESSAGE));
}
}
}
diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java
index d427982f..b86617c5 100644
--- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java
+++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionaryTest.java
@@ -50,7 +50,7 @@ public class ToscaDictionaryTest {
//
// Probably don't need these as these ID's are used by other components
//
- assertNotNull(ToscaDictionary.ID_OBLIGATION_ISSUER);
+ assertNotNull(ToscaDictionary.ID_OBLIGATION_MONITORING_ISSUER);
}
}
diff --git a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java
index b2e5ff9a..f3bee71b 100644
--- a/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java
+++ b/applications/monitoring/src/main/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringRequest.java
@@ -56,14 +56,14 @@ public class MonitoringRequest {
Map<String, Object> resources = decisionRequest.getResource();
for (Entry<String, Object> entry : resources.entrySet()) {
- if (entry.getKey().equals("policy-id")) {
+ if ("policy-id".contentEquals(entry.getKey())) {
//
// TODO handle lists of policies
//
request.resource = entry.getValue().toString();
continue;
}
- if (entry.getKey().equals("policy-type")) {
+ if ("policy-type".contentEquals(entry.getKey())) {
//
// TODO handle lists of policies
//