Remove GroupValidationResult

Removed GroupValidationResult, replacing it with BeanValidationResult.
Modified the ParameterGroup subclasses to use BeanValidator, adding
annotations where needed to trigger the validations that had been
automatically performed by GroupValidationResult.

Issue-ID: POLICY-2059
Change-Id: Ib5c0dc0ac3762e68307e63f5ce29efb49208e55d
Signed-off-by: Jim Hahn <jrh3@att.com>

3 files changed, 33 insertions, 27 deletions

diff --git a/main/src/test/resources/expectedValidationResults/InvalidDecoderAndForwarderParameters.txt b/main/src/test/resources/expectedValidationResults/InvalidDecoderAndForwarderParameters.txt
index a5e84f5c..ebad6984 100644
--- a/main/src/test/resources/expectedValidationResults/InvalidDecoderAndForwarderParameters.txt
+++ b/main/src/test/resources/expectedValidationResults/InvalidDecoderAndForwarderParameters.txt
@@ -1,17 +1,22 @@
 validation error(s) on parameters from "parameters/DistributionConfigParameters_InvalidDecoderAndForwarderParameters.json"
-parameter group "SDCDistributionGroup" type "org.onap.policy.distribution.main.parameters.DistributionParameterGroup" INVALID, parameter group has status INVALID
-  parameter group map "receptionHandlerParameters" INVALID, parameter group map has status INVALID
-    parameter group "null_DummyReceptionHandler" type "org.onap.policy.distribution.reception.parameters.ReceptionHandlerParameters" INVALID, parameter group has status INVALID
-      parameter group "null_PluginHandler" type "org.onap.policy.distribution.reception.parameters.PluginHandlerParameters" INVALID, parameter group has status INVALID
-        parameter group map "policyDecoders" INVALID, parameter group map has status INVALID
-          parameter group "" type "org.onap.policy.distribution.reception.parameters.PolicyDecoderParameters" INVALID, parameter group has status INVALID
-            field "decoderType" type "java.lang.String" value "" INVALID, must be a non-blank string
-            field "decoderClassName" type "java.lang.String" value "org.onap.policy.distribution.main.testclasses.PolicyDecoderApexPdpa" INVALID, policy decoder class not found in classpath
-          parameter group "DROOLS" type "org.onap.policy.distribution.reception.parameters.PolicyDecoderParameters" INVALID, parameter group has status INVALID
-            field "decoderClassName" type "java.lang.String" value "" INVALID, must be a non-blank string containing full class name of the decoder
-        parameter group map "policyForwarders" INVALID, parameter group map has status INVALID
-          parameter group "" type "org.onap.policy.distribution.forwarding.parameters.PolicyForwarderParameters" INVALID, parameter group has status INVALID
-            field "forwarderType" type "java.lang.String" value "" INVALID, must be a non-blank string
-            field "forwarderClassName" type "java.lang.String" value "org.onap.policy.distribution.main.testclasses.PapStandalonePolicyForwarder" INVALID, policy forwarder class not found in classpath
-          parameter group "PAPEngineForwarder" type "org.onap.policy.distribution.forwarding.parameters.PolicyForwarderParameters" INVALID, parameter group has status INVALID
-            field "forwarderClassName" type "java.lang.String" value "" INVALID, must be a non-blank string containing full class name of the forwarder
\ No newline at end of file
+"DistributionParameterGroup" INVALID, item has status INVALID
+  "receptionHandlerParameters" INVALID, item has status INVALID
+    "DummyReceptionHandler" INVALID, item has status INVALID
+      "ReceptionHandlerParameters" INVALID, item has status INVALID
+        "PluginHandlerParameters" INVALID, item has status INVALID
+          "policyDecoders" INVALID, item has status INVALID
+            "APEXDecoder" INVALID, item has status INVALID
+              "PolicyDecoderParameters" INVALID, item has status INVALID
+                item "decoderType" value "" INVALID, is blank
+                item "decoderClassName" value "org.onap.policy.distribution.main.testclasses.PolicyDecoderApexPdpa" INVALID, class is not in the classpath
+            "DROOLSDecoder" INVALID, item has status INVALID
+              "PolicyDecoderParameters" INVALID, item has status INVALID
+                item "decoderClassName" value "" INVALID, is blank
+          "policyForwarders" INVALID, item has status INVALID
+            "PAPStandaloneForwarder" INVALID, item has status INVALID
+              "PolicyForwarderParameters" INVALID, item has status INVALID
+                item "forwarderType" value "" INVALID, is blank
+                item "forwarderClassName" value "org.onap.policy.distribution.main.testclasses.PapStandalonePolicyForwarder" INVALID, class is not in the classpath
+            "PAPEngineForwarder" INVALID, item has status INVALID
+              "PolicyForwarderParameters" INVALID, item has status INVALID
+                item "forwarderClassName" value "" INVALID, is blank
diff --git a/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt b/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt
index 37c3457d..9879892a 100644
--- a/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt
+++ b/main/src/test/resources/expectedValidationResults/InvalidReceptionHandlerParameters.txt
@@ -1,6 +1,7 @@
 validation error(s) on parameters from "parameters/DistributionConfigParameters_InvalidReceptionHandlerParameters.json"
-parameter group "SDCDistributionGroup" type "org.onap.policy.distribution.main.parameters.DistributionParameterGroup" INVALID, parameter group has status INVALID
-  parameter group map "receptionHandlerParameters" INVALID, parameter group map has status INVALID
-    parameter group "null_" type "org.onap.policy.distribution.reception.parameters.ReceptionHandlerParameters" INVALID, parameter group has status INVALID
-      field "receptionHandlerType" type "java.lang.String" value "" INVALID, must be a non-blank string
-      field "receptionHandlerClassName" type "java.lang.String" value "org.onap.policy.distribution.main.testclasses.InvalidSdcReceptionHandler" INVALID, reception handler class not found in classpath
+"DistributionParameterGroup" INVALID, item has status INVALID
+  "receptionHandlerParameters" INVALID, item has status INVALID
+    "DummyReceptionHandler" INVALID, item has status INVALID
+      "ReceptionHandlerParameters" INVALID, item has status INVALID
+        item "receptionHandlerType" value "" INVALID, is blank
+        item "receptionHandlerClassName" value "org.onap.policy.distribution.main.testclasses.InvalidSdcReceptionHandler" INVALID, class is not in the classpath
diff --git a/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt b/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt
index f3152e41..5ae0c819 100644
--- a/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt
+++ b/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt
@@ -1,7 +1,7 @@
 validation error(s) on parameters from "parameters/DistributionConfigParameters_InvalidRestServerParameters.json"
-parameter group "SDCDistributionGroup" type "org.onap.policy.distribution.main.parameters.DistributionParameterGroup" INVALID, parameter group has status INVALID
-  parameter group "RestServerParameters" type "org.onap.policy.common.endpoints.parameters.RestServerParameters" INVALID, parameter group has status INVALID
-    field "host" type "java.lang.String" value "" INVALID, must be a non-blank string
-    field "port" type "int" value "-1" INVALID, must be >= 1
-    field "userName" type "java.lang.String" value "" INVALID, must be a non-blank string
-    field "password" type "java.lang.String" value "" INVALID, must be a non-blank string
\ No newline at end of file
+"DistributionParameterGroup" INVALID, item has status INVALID
+  "RestServerParameters" INVALID, item has status INVALID
+    item "host" value "" INVALID, is blank
+    item "port" value "-1" INVALID, is below the minimum value: 1
+    item "userName" value "" INVALID, is blank
+    item "password" value "" INVALID, is blank