From: Patrick Brady <patrick.brady@att.com>
Date: Thu, 14 Nov 2019 22:17:04 +0000 (-0800)
Subject: Add additional error messages to dmaap service
X-Git-Tag: 1.7.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F98433%2F2;p=appc.git

Add additional error messages to dmaap service

Add error checking and logging if required properties
are not present.

Change-Id: I270a7a088e36de603b89133e9ccb22f206e931e4
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1744
---

diff --git a/services/appc-dmaap-service/appc-dmaap-event-service/src/main/java/org/onap/appc/services/dmaapService/PublishService.java b/services/appc-dmaap-service/appc-dmaap-event-service/src/main/java/org/onap/appc/services/dmaapService/PublishService.java
index 1e1b9e7f8..cc20539f4 100644
--- a/services/appc-dmaap-service/appc-dmaap-event-service/src/main/java/org/onap/appc/services/dmaapService/PublishService.java
+++ b/services/appc-dmaap-service/appc-dmaap-event-service/src/main/java/org/onap/appc/services/dmaapService/PublishService.java
@@ -30,6 +30,10 @@ import org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryImpl;
 import org.onap.appc.configuration.Configuration;
 import org.onap.appc.configuration.ConfigurationFactory;
 import org.springframework.stereotype.Service;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
 import org.onap.appc.adapter.message.MessageAdapterFactory;
 import org.onap.appc.adapter.message.Producer;
 import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
@@ -37,6 +41,8 @@ import org.onap.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
 @Service
 public class PublishService {
     
+    private static final EELFLogger LOG = EELFManager.getInstance().getLogger(PublishService.class);
+    
     private Map<String,Producer> producers;
     private MessageAdapterFactory factory;
     Configuration configuration;
@@ -101,6 +107,14 @@ public class PublishService {
                     pool.add(name);
                 }
             }
+            if(pool.isEmpty()) {
+                LOG.error("There are no dmaap server pools. Check the property " + key + ".poolMembers");
+                return null;
+            }
+            if(writeTopic == null || writeTopic.isEmpty()) {
+                LOG.error("There is no write topic defined in the message request or in the properties file");
+                return null;
+            }
             return factory.createProducer(pool, writeTopic, apiKey, apiSecret);
         }
         return null;