Merge changes I3027d53f,I1233ebcc

* changes:
  Sonar majior issues
  Sonar majior issues

diff --git a/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java b/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java
index 49eddd9..71a0f63 100644 (file)
--- a/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java
+++ b/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java
@@ -68,7 +68,7 @@ public class ApiKeysRestService {
        /**
         * Logger obj
         */
-       //private Logger log = Logger.getLogger(ApiKeysRestService.class.toString());
+
        private static final EELFLogger log = EELFManager.getInstance().getLogger(ApiKeysRestService.class);
        /**
         * HttpServletRequest obj

diff --git a/src/main/java/org/onap/dmaap/service/MetricsRestService.java b/src/main/java/org/onap/dmaap/service/MetricsRestService.java
index 0a9193b..fdc67d5 100644 (file)
--- a/src/main/java/org/onap/dmaap/service/MetricsRestService.java
+++ b/src/main/java/org/onap/dmaap/service/MetricsRestService.java
@@ -58,7 +58,7 @@ public class MetricsRestService {
        /**
         * Logger obj
         */
-       //private Logger log = Logger.getLogger(MetricsRestService.class.toString());
+       
        private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigurationReader.class);
        /**
         * HttpServletRequest obj