Changed Xacml-pdp to report pdp group defined in XacmlPdpParameters config file

[policy/xacml-pdp.git] / main / src / main / java / org / onap / policy / pdpx / main / parameters / XacmlPdpParameterGroup.java

diff --git a/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterGroup.java b/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterGroup.java
index 5731a7b..cd8d22b 100644 (file)
--- a/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterGroup.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterGroup.java
@@ -44,6 +44,7 @@ public class XacmlPdpParameterGroup implements ParameterGroup {
     @Setter
     private String name;
 
+    private String pdpGroup;
     private RestServerParameters restServerParameters;
     private RestServerParameters policyApiParameters;
     private TopicParameterGroup topicParameterGroup;
@@ -53,11 +54,13 @@ public class XacmlPdpParameterGroup implements ParameterGroup {
      * Create the xacml pdp parameter group.
      *
      * @param name the parameter group name
+     * @param pdpGroup the pdp group name
      */
-    public XacmlPdpParameterGroup(final String name, final RestServerParameters restServerParameters,
-                    final RestServerParameters policyApiParameters, final TopicParameterGroup topicParameterGroup,
-                    final String applicationPath) {
+    public XacmlPdpParameterGroup(final String name, final String pdpGroup,
+            final RestServerParameters restServerParameters, final RestServerParameters policyApiParameters,
+            final TopicParameterGroup topicParameterGroup, final String applicationPath) {
         this.name = name;
+        this.pdpGroup = pdpGroup;
         this.restServerParameters = restServerParameters;
         this.policyApiParameters = policyApiParameters;
         this.topicParameterGroup = topicParameterGroup;
@@ -75,6 +78,9 @@ public class XacmlPdpParameterGroup implements ParameterGroup {
         if (!ParameterValidationUtils.validateStringParameter(name)) {
             validationResult.setResult("name", ValidationStatus.INVALID, "must be a non-blank string");
         }
+        if (!ParameterValidationUtils.validateStringParameter(pdpGroup)) {
+            validationResult.setResult("pdpGroup", ValidationStatus.INVALID, "must be a non-blank string");
+        }
         if (restServerParameters == null) {
             validationResult.setResult(PARAM_REST_SERVER, ValidationStatus.INVALID,
                     "must have restServerParameters to configure xacml pdp rest server");