From ef0641c47e0ffe212f2b850c90069ede7c16e1d7 Mon Sep 17 00:00:00 2001
From: "a.sreekumar" <ajith.sreekumar@est.tech>
Date: Tue, 30 Jul 2019 11:17:55 +0000
Subject: Passing the updated topic parameters to policy-endpoints

Changes to pass the updated parameters from BusTopicParams to
PolicyEndpoints.

Change-Id: I49d3b9d30a2a4c6b2337d0ab76a61583eb9ef04a
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
---
 .../endpoints/parameters/TopicParameterGroup.java  | 36 ++++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'policy-endpoints/src/main/java/org/onap/policy/common/endpoints/parameters')

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroup.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroup.java
index 70a06036..b89f47dc 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroup.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroup.java
@@ -54,22 +54,38 @@ public class TopicParameterGroup extends ParameterGroupImpl {
     @Override
     public GroupValidationResult validate() {
         GroupValidationResult result = super.validate();
-        if (result.isValid() && (checkMissingMandatoryParams(topicSources)
-            || checkMissingMandatoryParams(topicSinks))) {
-            result.setResult(ValidationStatus.INVALID, "Mandatory parameters are missing. topic, servers "
-                + "and topicCommInfrastructure must be specified.");
+        if (result.isValid()) {
+            StringBuilder errorMsg = new StringBuilder();
+            StringBuilder missingSourceParams = checkMissingMandatoryParams(topicSources);
+            if (missingSourceParams.length() > 0) {
+                errorMsg.append(missingSourceParams.append("missing in topicSources. "));
+            }
+            StringBuilder missingSinkParams = checkMissingMandatoryParams(topicSinks);
+            if (missingSinkParams.length() > 0) {
+                errorMsg.append(missingSinkParams.append("missing in topicSinks."));
+            }
+
+            if (errorMsg.length() > 0) {
+                errorMsg.insert(0, "Mandatory parameters are missing. ");
+                result.setResult(ValidationStatus.INVALID, errorMsg.toString());
+            }
         }
         return result;
     }
 
-    private boolean checkMissingMandatoryParams(List<TopicParameters> topicParametersList) {
+    private StringBuilder checkMissingMandatoryParams(List<TopicParameters> topicParametersList) {
+        StringBuilder missingParams = new StringBuilder();
         for (TopicParameters topicParameters : topicParametersList) {
-            if (StringUtils.isBlank(topicParameters.getTopic())
-                || StringUtils.isBlank(topicParameters.getTopicCommInfrastructure())
-                || topicParameters.getServers().isEmpty()) {
-                return true;
+            if (StringUtils.isBlank(topicParameters.getTopic())) {
+                missingParams.append("topic, ");
+            }
+            if (StringUtils.isBlank(topicParameters.getTopicCommInfrastructure())) {
+                missingParams.append("topicCommInfrastructure, ");
+            }
+            if (null == topicParameters.getServers() || topicParameters.getServers().isEmpty()) {
+                missingParams.append("servers, ");
             }
         }
-        return false;
+        return missingParams;
     }
 }
-- 
cgit 1.2.3-korg