Release 1.13.5 docker artifact

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / dmaap / AAIDmaapEventJMSConsumer.java

diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
index b3a8773..d3addeb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
@@ -22,6 +22,14 @@
 
 package org.onap.aai.dmaap;
 
+import java.util.Map;
+import java.util.Objects;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.onap.aai.aailog.logs.AaiDmaapMetricLog;
@@ -37,13 +45,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.client.RestTemplate;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-import java.util.Map;
-import java.util.Objects;
-
 public class AAIDmaapEventJMSConsumer implements MessageListener {
 
     private static final String EVENT_TOPIC = "event-topic";
@@ -57,7 +58,6 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
     private Environment environment;
     private Map<String, String> mdcCopy;
 
-
     public AAIDmaapEventJMSConsumer(Environment environment, RestTemplate restTemplate, HttpHeaders httpHeaders) {
         super();
         mdcCopy = MDC.getCopyOfContextMap();
@@ -86,7 +86,7 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
         String aaiElsErrorCode = AaiElsErrorCode.SUCCESS;
         String errorDescription = "";
 
-        if ( mdcCopy != null ) {
+        if (mdcCopy != null) {
             MDC.setContextMap(mdcCopy);
         }
 
@@ -101,8 +101,8 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
                 } else {
                     return;
                 }
-                if (jo.getString("event-topic") != null) {
-                    eventName = jo.getString("event-topic");
+                if (jo.getString(EVENT_TOPIC) != null) {
+                    eventName = jo.getString(EVENT_TOPIC);
                 }
                 if (joPayload.has("event-header")) {
                     try {
@@ -113,14 +113,13 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
                         if (aaiEventHeader.has("entity-link")) {
                             serviceName = aaiEventHeader.get("entity-link").toString();
                         }
-                    }
-                    catch (JSONException jexc) {
+                    } catch (JSONException jexc) {
                         // ignore, this is just used for logging
                     }
                 }
                 metricLog.pre(eventName, aaiEvent, transactionId, serviceName);
 
-                HttpEntity httpEntity = new HttpEntity(aaiEvent, httpHeaders);
+                HttpEntity<String> httpEntity = new HttpEntity<String>(aaiEvent, httpHeaders);
 
                 String transportType = environment.getProperty("dmaap.ribbon.transportType", "http");
                 String baseUrl = transportType + "://" + environment.getProperty("dmaap.ribbon.listOfServers");
@@ -129,7 +128,7 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
                 if ("AAI-EVENT".equals(eventName)) {
                     restTemplate.exchange(baseUrl + endpoint, HttpMethod.POST, httpEntity, String.class);
                 } else {
-                    LOGGER.error(eventName + "|Event Topic invalid.");
+                    LOGGER.error(String.format("%s|Event Topic invalid.", eventName));
                 }
             } catch (JMSException | JSONException e) {
                 aaiElsErrorCode = AaiElsErrorCode.DATA_ERROR;
@@ -139,8 +138,7 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
                 aaiElsErrorCode = AaiElsErrorCode.AVAILABILITY_TIMEOUT_ERROR;
                 errorDescription = e.getMessage();
                 ErrorLogHelper.logException(new AAIException("AAI_7304", jsmMessageTxt));
-            }
-            finally {
+            } finally {
                 metricLog.post(aaiElsErrorCode, errorDescription);
             }
         }