renaming/constant instead of literal/unused items

[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 49cc0e9..2803f69 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
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ *  Modifications Copyright © 2018 IBM.
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -41,85 +43,87 @@ import org.springframework.web.client.RestTemplate;
 
 public class AAIDmaapEventJMSConsumer implements MessageListener {
 
-       private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIDmaapEventJMSConsumer.class);
-
-       private RestTemplate restTemplate;
-
-       private HttpHeaders httpHeaders;
-
-       private Environment environment;
-
-       public AAIDmaapEventJMSConsumer(Environment environment, RestTemplate restTemplate, HttpHeaders httpHeaders) {
-               Objects.nonNull(environment);
-               Objects.nonNull(restTemplate);
-               Objects.nonNull(httpHeaders);
-               this.environment = environment;
-               this.restTemplate = restTemplate;
-               this.httpHeaders = httpHeaders;
-       }
-
-       @Override
-       public void onMessage(Message message) {
-
-           if(restTemplate == null){
-               return;
-               }
-
-               String jsmMessageTxt = "";
-               String aaiEvent = "";
-               String eventName = "";
-
-               if (message instanceof TextMessage) {
-                       try {
-                               jsmMessageTxt = ((TextMessage) message).getText();
-                               JSONObject jo = new JSONObject(jsmMessageTxt);
-
-                               if (jo.has("aaiEventPayload")) {
-                                       aaiEvent = jo.getJSONObject("aaiEventPayload").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);
-                               }
-                               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);
-
-                               String transportType = environment.getProperty("dmaap.ribbon.transportType", "http");
-                               String baseUrl  = transportType + "://" + environment.getProperty("dmaap.ribbon.listOfServers");
-                               String endpoint = "/events/" + eventName;
-
-                               if ("AAI-EVENT".equals(eventName)) {
+    private static final String EVENT_TOPIC = "event-topic";
+
+    private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIDmaapEventJMSConsumer.class);
+
+    private RestTemplate restTemplate;
+
+    private HttpHeaders httpHeaders;
+
+    private Environment environment;
+
+    public AAIDmaapEventJMSConsumer(Environment environment, RestTemplate restTemplate, HttpHeaders httpHeaders) {
+        Objects.nonNull(environment);
+        Objects.nonNull(restTemplate);
+        Objects.nonNull(httpHeaders);
+        this.environment = environment;
+        this.restTemplate = restTemplate;
+        this.httpHeaders = httpHeaders;
+    }
+
+    @Override
+    public void onMessage(Message message) {
+
+        if(restTemplate == null){
+            return;
+        }
+
+        String jsmMessageTxt = "";
+        String aaiEvent = "";
+        String eventName = "";
+
+        if (message instanceof TextMessage) {
+            try {
+                jsmMessageTxt = ((TextMessage) message).getText();
+                JSONObject jo = new JSONObject(jsmMessageTxt);
+
+                if (jo.has("aaiEventPayload")) {
+                    aaiEvent = jo.getJSONObject("aaiEventPayload").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);
+                }
+                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);
+
+                String transportType = environment.getProperty("dmaap.ribbon.transportType", "http");
+                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.");
-                               }
-                       } 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));
-                       } 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));
-                       }
-               }
-
-       }
+                } else {
+                    LoggingContext.statusCode(StatusCode.ERROR);
+                    LOGGER.error(eventName + "|Event Topic invalid.");
+                }
+            } 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));
+            } 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));
+            }
+        }
+
+    }
 }