Merge "Fixed blocker issue in DMaaPResponseBuilder.java"

diff --git a/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java b/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java
index 6022b91..64b20e8 100644 (file)
--- a/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java
+++ b/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java
@@ -35,7 +35,7 @@ import com.att.eelf.configuration.EELFManager;
 public class CambriaServletContextListener implements ServletContextListener {
        
        DME2EndPointLoader loader = DME2EndPointLoader.getInstance();
-//     private static Logger log = Logger.getLogger(CambriaServletContextListener.class);
+
        private static final EELFLogger log = EELFManager.getInstance().getLogger(CambriaServletContextListener.class);
        
 

diff --git a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java
index e9671ce..22b60fe 100644 (file)
--- a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java
@@ -94,7 +94,7 @@ import com.att.nsa.util.rrConvertor;
 @Service
 public class EventsServiceImpl implements EventsService {
        // private static final Logger LOG =
-       // Logger.getLogger(EventsServiceImpl.class);
+       
        private static final EELFLogger LOG = EELFManager.getInstance().getLogger(EventsServiceImpl.class);
 
        private static final String BATCH_LENGTH = "event.batch.length";
@@ -103,10 +103,10 @@ public class EventsServiceImpl implements EventsService {
        private DMaaPErrorMessages errorMessages;
        
        //@Autowired
-       //KafkaLiveLockAvoider2 kafkaLiveLockAvoider;
+       
 
        // @Value("${metrics.send.cambria.topic}")
-       // private String metricsTopic;
+       
 
        public DMaaPErrorMessages getErrorMessages() {
                return errorMessages;
@@ -133,7 +133,7 @@ public class EventsServiceImpl implements EventsService {
                        CambriaApiException, IOException, DMaaPAccessDeniedException {
                final long startTime = System.currentTimeMillis();
                final HttpServletRequest req = ctx.getRequest();
-       //System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+kafkaLiveLockAvoider);
+       
                boolean isAAFTopic = false;
                // was this host blacklisted?
                final String remoteAddr = Utils.getRemoteAddress(ctx);
@@ -158,7 +158,7 @@ public class EventsServiceImpl implements EventsService {
                if (strtimeoutMS != null)
                        timeoutMs = Integer.parseInt(strtimeoutMS);
                // int timeoutMs = ctx.getConfigReader().getSettings().getInt("timeout",
-               // CambriaConstants.kNoTimeout);
+               
                if (req.getParameter("timeout") != null) {
                        timeoutMs = Integer.parseInt(req.getParameter("timeout"));
                }
@@ -214,7 +214,7 @@ public class EventsServiceImpl implements EventsService {
                // if headers are not provided then user will be null
                if (user == null && null != ctx.getRequest().getHeader("Authorization")) {
                        // the topic name will be sent by the client
-                       // String permission = "com.att.dmaap.mr.topic"+"|"+topic+"|"+"sub";
+                       
                        DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl();
                        String permission = aaf.aafPermissionString(topic, "sub");
                        if (!aaf.aafAuthentication(ctx.getRequest(), permission)) {
@@ -234,7 +234,7 @@ public class EventsServiceImpl implements EventsService {
                logger.info("Time taken in getEvents Authorization " + elapsedMs1 + " ms for " + topic + " " + consumerGroup
                                + " " + clientId);
                Consumer c = null;
-               // String localclientId = clientId;
+               
                String lhostId = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,
                                "clusterhostid");
                if (null == lhostId) {

diff --git a/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java b/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java
index 83b3770..d867ea8 100644 (file)
--- a/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java
@@ -49,7 +49,7 @@ import com.att.nsa.metrics.CdmMeasuredItem;
 @Component
 public class MetricsServiceImpl implements MetricsService {
 
-       //private static final Logger LOG = Logger.getLogger(MetricsService.class.toString());
+       
        private static final EELFLogger LOG = EELFManager.getInstance().getLogger(MetricsService.class);
        /**
         *