X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fconfig%2FCamundaAuthFilterInitializer.java;h=af9e695e627487dc8b26c9415e58c48193597a05;hb=da64454193928db08dc5f419cfa7766adcf49a2c;hp=244b40aa18f86b8f2e276d6e557c461f2a0e95e1;hpb=5e9feb2a8e360b82dc2b6e4145e0fd847d2924ce;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/config/CamundaAuthFilterInitializer.java b/src/main/java/org/onap/clamp/clds/config/CamundaAuthFilterInitializer.java
index 244b40aa..af9e695e 100644
--- a/src/main/java/org/onap/clamp/clds/config/CamundaAuthFilterInitializer.java
+++ b/src/main/java/org/onap/clamp/clds/config/CamundaAuthFilterInitializer.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * 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
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
@@ -23,9 +23,11 @@
 
 package org.onap.clamp.clds.config;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
 import java.util.EnumSet;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
@@ -45,43 +47,35 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnWebApplication
 @AutoConfigureAfter(CamundaBpmAutoConfiguration.class)
 public class CamundaAuthFilterInitializer implements ServletContextInitializer {
-
-	private static final EnumSet<DispatcherType> DISPATCHER_TYPES = EnumSet.of(DispatcherType.REQUEST);
-
-	private static final String AJSC_CADI_PROPS_FILE = "cadi.properties";
-
-	private ServletContext servletContext;
-
-	@Value("${com.att.ajsc.camunda.contextPath:/camunda}")
-	private String CAMUNDA_SUFFIX;
-
-	private static final Logger log = Logger.getLogger(CamundaAuthFilterInitializer.class.getName());
-
-	@Override
-	public void onStartup(ServletContext servletContext) throws ServletException {
-		this.servletContext = servletContext;
-
-		registerFilter("Authentication Filter", AuthenticationFilter.class, CAMUNDA_SUFFIX + "/*");
-	}
-
-	private FilterRegistration registerFilter(final String filterName, final Class<? extends Filter> filterClass,
-			final String... urlPatterns) {
-		return registerFilter(filterName, filterClass, null, urlPatterns);
-	}
-
-	private FilterRegistration registerFilter(final String filterName, final Class<? extends Filter> filterClass,
-			final Map<String, String> initParameters, final String... urlPatterns) {
-		FilterRegistration filterRegistration = servletContext.getFilterRegistration(filterName);
-
-		if (filterRegistration == null) {
-			filterRegistration = servletContext.addFilter(filterName, filterClass);
-			filterRegistration.addMappingForUrlPatterns(DISPATCHER_TYPES, true, urlPatterns);
-
-			if (initParameters != null) {
-				filterRegistration.setInitParameters(initParameters);
-			}
-		}
-
-		return filterRegistration;
-	}
+    private static final EnumSet<DispatcherType> DISPATCHER_TYPES = EnumSet.of(DispatcherType.REQUEST);
+    private ServletContext                       servletContext;
+    @Value("${com.att.ajsc.camunda.contextPath:/camunda}")
+    private String                               camundaSuffix;
+    protected static final EELFLogger            logger           = EELFManager.getInstance()
+            .getLogger(CamundaAuthFilterInitializer.class);
+    protected static final EELFLogger            metricsLogger    = EELFManager.getInstance().getMetricsLogger();
+
+    @Override
+    public void onStartup(ServletContext servletContext) throws ServletException {
+        this.servletContext = servletContext;
+        registerFilter("Authentication Filter", AuthenticationFilter.class, camundaSuffix + "/*");
+    }
+
+    private FilterRegistration registerFilter(final String filterName, final Class<? extends Filter> filterClass,
+            final String... urlPatterns) {
+        return registerFilter(filterName, filterClass, null, urlPatterns);
+    }
+
+    private FilterRegistration registerFilter(final String filterName, final Class<? extends Filter> filterClass,
+            final Map<String, String> initParameters, final String... urlPatterns) {
+        FilterRegistration filterRegistration = servletContext.getFilterRegistration(filterName);
+        if (filterRegistration == null) {
+            filterRegistration = servletContext.addFilter(filterName, filterClass);
+            filterRegistration.addMappingForUrlPatterns(DISPATCHER_TYPES, true, urlPatterns);
+            if (initParameters != null) {
+                filterRegistration.setInitParameters(initParameters);
+            }
+        }
+        return filterRegistration;
+    }
 }