Reduce the number of raw-type related warnings in aai-common

[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 2803f69..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
@@ -19,22 +19,26 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.dmaap;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+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.apache.log4j.MDC;
+
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.aai.logging.LogFormatTools;
-import org.onap.aai.logging.LoggingContext;
-import org.onap.aai.logging.LoggingContext.LoggingField;
-import org.onap.aai.logging.LoggingContext.StatusCode;
+import org.onap.aai.aailog.logs.AaiDmaapMetricLog;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.logging.AaiElsErrorCode;
+import org.onap.aai.logging.ErrorLogHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -45,15 +49,18 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
 
     private static final String EVENT_TOPIC = "event-topic";
 
-    private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIDmaapEventJMSConsumer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AAIDmaapEventJMSConsumer.class);
 
     private RestTemplate restTemplate;
 
     private HttpHeaders httpHeaders;
 
     private Environment environment;
+    private Map<String, String> mdcCopy;
 
     public AAIDmaapEventJMSConsumer(Environment environment, RestTemplate restTemplate, HttpHeaders httpHeaders) {
+        super();
+        mdcCopy = MDC.getCopyOfContextMap();
         Objects.nonNull(environment);
         Objects.nonNull(restTemplate);
         Objects.nonNull(httpHeaders);
@@ -65,65 +72,75 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
     @Override
     public void onMessage(Message message) {
 
-        if(restTemplate == null){
+        if (restTemplate == null) {
             return;
         }
 
         String jsmMessageTxt = "";
         String aaiEvent = "";
+        JSONObject aaiEventHeader;
+        JSONObject joPayload;
+        String transactionId = "";
+        String serviceName = "";
         String eventName = "";
+        String aaiElsErrorCode = AaiElsErrorCode.SUCCESS;
+        String errorDescription = "";
+
+        if (mdcCopy != null) {
+            MDC.setContextMap(mdcCopy);
+        }
 
         if (message instanceof TextMessage) {
+            AaiDmaapMetricLog metricLog = new AaiDmaapMetricLog();
             try {
                 jsmMessageTxt = ((TextMessage) message).getText();
                 JSONObject jo = new JSONObject(jsmMessageTxt);
-
                 if (jo.has("aaiEventPayload")) {
-                    aaiEvent = jo.getJSONObject("aaiEventPayload").toString();
+                    joPayload = jo.getJSONObject("aaiEventPayload");
+                    aaiEvent = joPayload.toString();
                 } else {
                     return;
                 }
-                if (jo.getString("transId") != null) {
-                    MDC.put("requestId", jo.getString("transId"));
-                }
-                if (jo.getString("fromAppId") != null) {
-                    MDC.put("partnerName", jo.getString("fromAppId"));
-                }
                 if (jo.getString(EVENT_TOPIC) != null) {
                     eventName = jo.getString(EVENT_TOPIC);
                 }
-
-                MDC.put ("targetEntity", "DMAAP");
-                if (jo.getString(EVENT_TOPIC) != null) {
-                    eventName = jo.getString(EVENT_TOPIC);
-                    MDC.put ("targetServiceName", eventName);
+                if (joPayload.has("event-header")) {
+                    try {
+                        aaiEventHeader = joPayload.getJSONObject("event-header");
+                        if (aaiEventHeader.has("id")) {
+                            transactionId = aaiEventHeader.get("id").toString();
+                        }
+                        if (aaiEventHeader.has("entity-link")) {
+                            serviceName = aaiEventHeader.get("entity-link").toString();
+                        }
+                    } catch (JSONException jexc) {
+                        // ignore, this is just used for logging
+                    }
                 }
-                MDC.put ("serviceName", "AAI");
-                MDC.put(LoggingField.STATUS_CODE.toString(), StatusCode.COMPLETE.toString());
-                MDC.put(LoggingField.RESPONSE_CODE.toString(), "0");
-                LOGGER.info(eventName + "|" + aaiEvent);
-                HttpEntity httpEntity = new HttpEntity(aaiEvent, httpHeaders);
+                metricLog.pre(eventName, aaiEvent, transactionId, serviceName);
+
+                HttpEntity<String> httpEntity = new HttpEntity<String>(aaiEvent, httpHeaders);
 
                 String transportType = environment.getProperty("dmaap.ribbon.transportType", "http");
-                String baseUrl  = transportType + "://" + environment.getProperty("dmaap.ribbon.listOfServers");
+                String baseUrl = transportType + "://" + environment.getProperty("dmaap.ribbon.listOfServers");
                 String endpoint = "/events/" + eventName;
 
                 if ("AAI-EVENT".equals(eventName)) {
                     restTemplate.exchange(baseUrl + endpoint, HttpMethod.POST, httpEntity, String.class);
                 } else {
-                    LoggingContext.statusCode(StatusCode.ERROR);
-                    LOGGER.error(eventName + "|Event Topic invalid.");
+                    LOGGER.error(String.format("%s|Event Topic invalid.", eventName));
                 }
             } catch (JMSException | JSONException e) {
-                MDC.put(LoggingField.STATUS_CODE.toString(), StatusCode.ERROR.toString());
-                MDC.put(LoggingField.RESPONSE_CODE.toString(), "200");
-                LOGGER.error("AAI_7350 Error parsing aaievent jsm message for sending to dmaap. {} {}", jsmMessageTxt, LogFormatTools.getStackTop(e));
+                aaiElsErrorCode = AaiElsErrorCode.DATA_ERROR;
+                errorDescription = e.getMessage();
+                ErrorLogHelper.logException(new AAIException("AAI_7350"));
             } catch (Exception e) {
-                MDC.put(LoggingField.STATUS_CODE.toString(), StatusCode.ERROR.toString());
-                MDC.put(LoggingField.RESPONSE_CODE.toString(), "200");
-                LOGGER.error("AAI_7350 Error sending message to dmaap. {} {}" , jsmMessageTxt, LogFormatTools.getStackTop(e));
+                aaiElsErrorCode = AaiElsErrorCode.AVAILABILITY_TIMEOUT_ERROR;
+                errorDescription = e.getMessage();
+                ErrorLogHelper.logException(new AAIException("AAI_7304", jsmMessageTxt));
+            } finally {
+                metricLog.post(aaiElsErrorCode, errorDescription);
             }
         }
-
     }
 }