TCA:Updated eventName logging messages

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

2 files changed, 13 insertions, 12 deletions

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
--- 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) {

 

         this.publisherConfig = publisherConfig;

+        final int maxBatchSize = publisherConfig.getMaxBatchSize() > 0 ? publisherConfig.getMaxBatchSize() : 1;

         this.publisherQueue = dMaaPMRPublisherQueueFactory.create(

-                publisherConfig.getMaxBatchSize(), publisherConfig.getMaxRecoveryQueueSize());

+                maxBatchSize, publisherConfig.getMaxRecoveryQueueSize());

         this.closeableHttpClient = closeableHttpClient;

         this.publisherUri = createPublisherURI(publisherConfig);

         this.publisherCreationTime = new Date();

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
--- 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
 

         // Determine Policy Functional Roles

         final TCAPolicy tcaPolicy = processorContext.getTCAPolicy();

-        final List<String> policyFunctionalRoles = getPolicyEventNamesSupplier(tcaPolicy).get();

-        final String policyFunctionalRolesString = Joiner.on(",").join(policyFunctionalRoles);

+        final List<String> policyEventNames = getPolicyEventNamesSupplier(tcaPolicy).get();

+        final String policyEventNamesString = Joiner.on(",").join(policyEventNames);

 

-        // If Policy functional Roles contains CEF message Functional Role then continue processing

-        if (policyFunctionalRoles.contains(cefMessageEventName)) {

+        // If Policy event names contains CEF message event names then continue processing

+        if (policyEventNames.contains(cefMessageEventName)) {

             final String finishMessage = String.format(

-                    "Policy Functional Roles and CEF Message Functional match successful." +

-                            "Message Functional Role: %s, Policy Functional Roles: %s",

-                    cefMessageEventName, policyFunctionalRolesString);

+                    "Policy Event Name and CEF Message Event Name match successful." +

+                            "Message EventName: %s, Policy Event Names: %s",

+                    cefMessageEventName, policyEventNamesString);

             setFinishedProcessingMessage(finishMessage, processorContext);

         } else {

-            // If Policy functional Roles does not contain CEF message Functiona Role then terminate processing

+            // If Policy event names does not contain CEF message event names then terminate processing

             final String terminatingMessage = String.format(

-                    "Policy Domain and CEF Message Domain match unsuccessful." +

-                            "Message Functional Role: %s, Policy Functional Roles: %s",

-                    cefMessageEventName, policyFunctionalRolesString);

+                    "Policy Event name and CEF Message Event name match unsuccessful." +

+                            "Message EventName: %s, Policy Event Names: %s",

+                    cefMessageEventName, policyEventNamesString);

             setTerminatingProcessingMessage(terminatingMessage, processorContext);

         }