Merge branch 'master' into BAEL-3095

spring-5-mvc/README.md

@@ -1,4 +1,3 @@
 ### Relevant Articles:
 - [Spring Boot and Kotlin](http://www.baeldung.com/spring-boot-kotlin)
 - [Spring MVC Streaming and SSE Request Processing](https://www.baeldung.com/spring-mvc-sse-streams)
-- [Overview and Need for DelegatingFilterProxy in Spring](https://www.baeldung.com/spring-delegating-filter-proxy)

spring-5-mvc/pom.xml

@@ -21,10 +21,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>

spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java

@@ -1,12 +1,8 @@
 package com.baeldung;
 
-import javax.servlet.Filter;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.web.filter.DelegatingFilterProxy;
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 @SpringBootApplication( exclude = SecurityAutoConfiguration.class)
 public class Spring5Application {
@@ -14,32 +10,4 @@ public class Spring5Application {
     public static void main(String[] args) {
         SpringApplication.run(Spring5Application.class, args);
     }
-
-    public static class ApplicationInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
-        @Override
-        protected Class<?>[] getRootConfigClasses() {
-            return null;
-        }
-
-        @Override
-        protected Class<?>[] getServletConfigClasses() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        protected String[] getServletMappings() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        protected javax.servlet.Filter[] getServletFilters() {
-            DelegatingFilterProxy delegateFilterProxy = new DelegatingFilterProxy();
-            delegateFilterProxy.setTargetBeanName("loggingFilter");
-            return new Filter[] { delegateFilterProxy };
-        }
-    }
-
 }

spring-5-mvc/src/main/java/com/baeldung/spring/filter/CustomFilter.java

@@ -1,38 +0,0 @@
-package com.baeldung.spring.filter;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-@Component("loggingFilter")
-public class CustomFilter implements Filter {
-    
-    private static Logger LOGGER = LoggerFactory.getLogger(CustomFilter.class);
-
-    @Override
-    public void init(FilterConfig config) throws ServletException {
-    }
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, 
-            FilterChain chain) throws IOException, ServletException {
-        HttpServletRequest req = (HttpServletRequest) request;
-        LOGGER.info("Request Info : " + req);
-        chain.doFilter(request, response);
-    }
-
-    @Override
-    public void destroy() {
-        // cleanup code, if necessary
-    }
-}

spring-5-mvc/src/main/webapp/WEB-INF/web.xml

@@ -16,14 +16,5 @@
         <servlet-name>functional</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
-	<filter>
-		<filter-name>loggingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>loggingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
 
 </web-app>