Merge "Harmonize logging to apache commons shim only"

2 files changed, 10 insertions, 11 deletions

diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java
index 143eb0fb..66effc0f 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java
@@ -51,9 +51,11 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.onap.aaf.cadi.filter.CadiFilter;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.util.AuthUtil;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
 
@@ -62,14 +64,14 @@ public class CadiAuthFilter extends CadiFilter {
 	private static String include_url_endpoints ="";
 	private static String exclude_url_endpoints = "";
 	public static final String AUTHORIZATION = "Authorization";
-	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CadiAuthFilter.class);
+	private static final Log logger = LogFactory.getLog(CipherUtil.class);
 	
 	public void init(FilterConfig filterConfig) throws ServletException {
 		super.init(filterConfig);
 		include_url_endpoints = filterConfig.getInitParameter("include_url_endpoints");
 		exclude_url_endpoints = filterConfig.getInitParameter("exclude_url_endpoints");
-		logger.debug(EELFLoggerDelegate.debugLogger, "inculde_url_endpoints values: "+ include_url_endpoints);
-		logger.debug(EELFLoggerDelegate.debugLogger, "exculde_url_endpoints values: "+ exclude_url_endpoints);
+		logger.debug("include_url_endpoints values: "+ include_url_endpoints);
+		logger.debug("exclude_url_endpoints values: "+ exclude_url_endpoints);
 	}
 
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
@@ -88,10 +90,10 @@ public class CadiAuthFilter extends CadiFilter {
 			ArrayList<String> includeUrlEndPointList = new ArrayList<String>(
 					Arrays.asList(includeUrlEndPointString.split(",")));
 			if (excludeFilter(request, excludeUrlEndPointList)){
-				logger.debug(EELFLoggerDelegate.debugLogger, "Request excluded from cadifilter");
+				logger.debug("Request excluded from cadifilter");
 				chain.doFilter(request, response);
 			}else if (includeFilter(request, includeUrlEndPointList)){
-				logger.debug(EELFLoggerDelegate.debugLogger, "Request is entering cadifilter");
+				logger.debug("Request is entering cadifilter");
 				super.doFilter(request, response, chain);
 			}else
 				chain.doFilter(request, response);
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java
index ab9c608a..27e90221 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPICentralServiceImpl.java
@@ -48,18 +48,15 @@ import java.util.stream.Collectors;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.onboarding.exception.CipherUtilException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient;
 import org.onap.portalsdk.core.onboarding.util.AuthUtil;
-import org.onap.portalsdk.core.onboarding.util.CipherUtil;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.onap.portalsdk.core.restful.domain.EcompRole;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;