aboutsummaryrefslogtreecommitdiffstats
path: root/applications/guard/src
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2021-06-23 11:05:05 -0400
committerPamela Dragosh <pdragosh@research.att.com>2021-06-24 10:33:45 -0400
commit9d3f4f0bef642836731213dc05e9127bca34200c (patch)
treeeb3ff8543af5b3eb07fd9856b5e82292b000ac5d /applications/guard/src
parent402eae5ca3e064a9a3de70c2df9d85135d34ae7c (diff)
Use protected methods vs private
Application and common code in xacml-pdp is meant to be available for developers to re-use and/or extend as desired. Private methods are unnecessary at this time, but could be re-visited in a later release. For Honolulu, simply moving to protected to keep functionality the same. Possibly for Istanbul we can make more changes to support mixing of ONAP application with custom applications during runtime. Issue-ID: POLICY-3305 Change-Id: I6db23bda3c81fdbbf86e39cc2cd2e706d8bee63d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com> (cherry picked from commit 8e0aa0ffa5cef537de1c841acf38300832c52a56) Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'applications/guard/src')
-rw-r--r--applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java4
-rw-r--r--applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java10
2 files changed, 7 insertions, 7 deletions
diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java
index 96b2878a..8a77449c 100644
--- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java
+++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardPolicyRequest.java
@@ -167,7 +167,7 @@ public class GuardPolicyRequest {
return request;
}
- private static GuardPolicyRequest findFields(GuardPolicyRequest request, Map<String, Object> guard)
+ protected static GuardPolicyRequest findFields(GuardPolicyRequest request, Map<String, Object> guard)
throws ToscaPolicyConversionException {
if (guard.containsKey("actor")) {
request.actorId = guard.get("actor").toString();
@@ -192,7 +192,7 @@ public class GuardPolicyRequest {
return request;
}
- private static GuardPolicyRequest findFilterFields(GuardPolicyRequest request, Map<String, Object> guard) {
+ protected static GuardPolicyRequest findFilterFields(GuardPolicyRequest request, Map<String, Object> guard) {
if (guard.containsKey("generic-vnf.vnf-name")) {
request.vnfName = guard.get("generic-vnf.vnf-name").toString();
}
diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java
index d606cc2e..df5fe43e 100644
--- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java
+++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/GuardTranslator.java
@@ -194,7 +194,7 @@ public class GuardTranslator implements ToscaPolicyTranslator {
* @param variable VariableDefinitionType to add
* @param newPolicyType PolicyType that will be updated
*/
- private void addVariableToConditionTypes(VariableReferenceType variable,
+ protected void addVariableToConditionTypes(VariableReferenceType variable,
PolicyType newPolicyType) {
//
// Iterate through the rules
@@ -432,7 +432,7 @@ public class GuardTranslator implements ToscaPolicyTranslator {
return reference;
}
- private Object parseTimestamp(String string) throws ToscaPolicyConversionException {
+ protected Object parseTimestamp(String string) throws ToscaPolicyConversionException {
//
// First see if it is a full datetime object
//
@@ -675,7 +675,7 @@ public class GuardTranslator implements ToscaPolicyTranslator {
}
}
- private String validateFilterPropertyField(String field)
+ protected String validateFilterPropertyField(String field)
throws ToscaPolicyConversionException {
String fieldLowerCase = field.toLowerCase();
switch (fieldLowerCase) {
@@ -691,7 +691,7 @@ public class GuardTranslator implements ToscaPolicyTranslator {
}
}
- private Identifier validateFilterPropertyFunction(String function)
+ protected Identifier validateFilterPropertyFunction(String function)
throws ToscaPolicyConversionException {
switch (function.toLowerCase()) {
case "string-equal":
@@ -719,7 +719,7 @@ public class GuardTranslator implements ToscaPolicyTranslator {
}
}
- private RuleType createFilterRule(String ruleId, String field, String filter, Identifier function,
+ protected RuleType createFilterRule(String ruleId, String field, String filter, Identifier function,
boolean isBlacklisted) {
var rule = new RuleType();
rule.setRuleId(ruleId);