Policy 1707 commit to LF

Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

2 files changed, 14 insertions, 20 deletions

diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMBeanListener.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMBeanListener.java
index 309bd1502..e956cd363 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMBeanListener.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMBeanListener.java
@@ -28,10 +28,8 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.flexlogger.*;
-
+import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
+import org.openecomp.policy.common.logging.flexlogger.Logger;
 import org.openecomp.policy.xacml.api.XACMLErrorConstants;
 /**
  *  
@@ -41,44 +39,44 @@ import org.openecomp.policy.xacml.api.XACMLErrorConstants;
 @WebListener
 public class PdpRestMBeanListener implements ServletContextListener {
 	private static final String JMX_OBJECT_NAME = "PdpRest:type=PdpRestMonitor";
-	private static final Logger logger	= FlexLogger.getLogger(PdpRestMBeanListener.class);
+	private static final Logger LOGGER	= FlexLogger.getLogger(PdpRestMBeanListener.class);
 	
 	private ObjectName objectName;
 
 	@Override
 	public void contextInitialized(ServletContextEvent contextEvent) {
-        if (logger.isInfoEnabled())
-        	logger.info("Registering.");
+        if (LOGGER.isInfoEnabled())
+        	LOGGER.info("Registering.");
         
         final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
         try {
             objectName = new ObjectName(JMX_OBJECT_NAME);
             server.registerMBean(PdpRestMonitor.singleton, objectName);
-            logger.info("MBean registered: " + objectName);
+            LOGGER.info("MBean registered: " + objectName);
         } catch (Exception e) {
 
-            logger.warn(e.getMessage(), e);
+            LOGGER.warn(e.getMessage(), e);
 
-            logger.warn(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Unable to Register " +e.getMessage(), e);
+            LOGGER.warn(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Unable to Register " +e.getMessage(), e);
 
         }
 	}
 	// mark
 	@Override
 	public void contextDestroyed(ServletContextEvent contextEvent) {
-		if (logger.isInfoEnabled())
-			logger.info("Unregistering");
+		if (LOGGER.isInfoEnabled())
+			LOGGER.info("Unregistering");
         final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
         try {
             objectName = new ObjectName(JMX_OBJECT_NAME);
             server.unregisterMBean(objectName);
-            if (logger.isInfoEnabled())
-            	logger.info("MBean unregistered: " + objectName);
+            if (LOGGER.isInfoEnabled())
+            	LOGGER.info("MBean unregistered: " + objectName);
         } catch (Exception e) {
 
-            logger.warn(e.getMessage(), e);
+            LOGGER.warn(e.getMessage(), e);
 
-            logger.warn(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Unable to Destroy Context" +e.getMessage(), e);
+            LOGGER.warn(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Unable to Destroy Context" +e.getMessage(), e);
 
         }
 	}
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitor.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitor.java
index 93dfbe6a0..e814e7408 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitor.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/jmx/PdpRestMonitor.java
@@ -22,11 +22,7 @@ package org.openecomp.policy.pdp.rest.jmx;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BinaryOperator;
 
 import org.openecomp.policy.xacml.util.MetricsUtil.AvgLatency;
 import org.openecomp.policy.xacml.util.MetricsUtil.MaxLatency;