TCA:Updated eventName logging messages

Change-Id: Ic4d2f099d8d9f98777ece9aec8d53ae05b051bbc
Signed-off-by: Singla, Rajiv (rs153v) <rs153v@att.com>
Issue-Id: DCAEGEN2-123

diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java
index b3e303e..32e09fa 100644 (file)
--- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java
+++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java
@@ -69,8 +69,9 @@ public class DMaaPMRPublisherImpl extends BaseDMaaPMRComponent implements DMaaPM
                                 CloseableHttpClient closeableHttpClient) {\r
 \r
         this.publisherConfig = publisherConfig;\r
+        final int maxBatchSize = publisherConfig.getMaxBatchSize() > 0 ? publisherConfig.getMaxBatchSize() : 1;\r
         this.publisherQueue = dMaaPMRPublisherQueueFactory.create(\r
-                publisherConfig.getMaxBatchSize(), publisherConfig.getMaxRecoveryQueueSize());\r
+                maxBatchSize, publisherConfig.getMaxRecoveryQueueSize());\r
         this.closeableHttpClient = closeableHttpClient;\r
         this.publisherUri = createPublisherURI(publisherConfig);\r
         this.publisherCreationTime = new Date();\r

diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java
index 50bd92b..ddf3888 100644 (file)
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilter.java
@@ -67,22 +67,22 @@ public class TCACEFPolicyEventNameFilter extends AbstractTCAECEFPolicyProcessor
 \r
         // Determine Policy Functional Roles\r
         final TCAPolicy tcaPolicy = processorContext.getTCAPolicy();\r
-        final List<String> policyFunctionalRoles = getPolicyEventNamesSupplier(tcaPolicy).get();\r
-        final String policyFunctionalRolesString = Joiner.on(",").join(policyFunctionalRoles);\r
+        final List<String> policyEventNames = getPolicyEventNamesSupplier(tcaPolicy).get();\r
+        final String policyEventNamesString = Joiner.on(",").join(policyEventNames);\r
 \r
-        // If Policy functional Roles contains CEF message Functional Role then continue processing\r
-        if (policyFunctionalRoles.contains(cefMessageEventName)) {\r
+        // If Policy event names contains CEF message event names then continue processing\r
+        if (policyEventNames.contains(cefMessageEventName)) {\r
             final String finishMessage = String.format(\r
-                    "Policy Functional Roles and CEF Message Functional match successful." +\r
-                            "Message Functional Role: %s, Policy Functional Roles: %s",\r
-                    cefMessageEventName, policyFunctionalRolesString);\r
+                    "Policy Event Name and CEF Message Event Name match successful." +\r
+                            "Message EventName: %s, Policy Event Names: %s",\r
+                    cefMessageEventName, policyEventNamesString);\r
             setFinishedProcessingMessage(finishMessage, processorContext);\r
         } else {\r
-            // If Policy functional Roles does not contain CEF message Functiona Role then terminate processing\r
+            // If Policy event names does not contain CEF message event names then terminate processing\r
             final String terminatingMessage = String.format(\r
-                    "Policy Domain and CEF Message Domain match unsuccessful." +\r
-                            "Message Functional Role: %s, Policy Functional Roles: %s",\r
-                    cefMessageEventName, policyFunctionalRolesString);\r
+                    "Policy Event name and CEF Message Event name match unsuccessful." +\r
+                            "Message EventName: %s, Policy Event Names: %s",\r
+                    cefMessageEventName, policyEventNamesString);\r
             setTerminatingProcessingMessage(terminatingMessage, processorContext);\r
         }\r
 \r