cleanup: no need for empty init/destroy in Filter anymore

bootique · May 25, 2024 · 38d8aad · 38d8aad
1 parent 64df570
commit 38d8aad
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 53 deletions.
diff --git a/bootique-jetty-docs/src/test/java/io/bootique/jetty/docs/AnnotatedFilter.java b/bootique-jetty-docs/src/test/java/io/bootique/jetty/docs/AnnotatedFilter.java
@@ -36,18 +36,8 @@
 public class AnnotatedFilter implements Filter { // ...
 // end::AnnotatedFilter[]
 
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
-
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 
     }
-
-    @Override
-    public void destroy() {
-
-    }
 }
diff --git a/bootique-jetty-jakarta/src/test/java/io/bootique/jetty/FilterInitParametersIT.java b/bootique-jetty-jakarta/src/test/java/io/bootique/jetty/FilterInitParametersIT.java
@@ -68,7 +68,7 @@ static class TestFilter implements Filter {
         private FilterConfig config;
 
         @Override
-        public void init(FilterConfig filterConfig) throws ServletException {
+        public void init(FilterConfig filterConfig) {
             this.config = filterConfig;
         }
 

diff --git a/...ique-jetty-jakarta/src/test/java/io/bootique/jetty/JettyModule_MappedContributionsIT.java b/...ique-jetty-jakarta/src/test/java/io/bootique/jetty/JettyModule_MappedContributionsIT.java
@@ -22,9 +22,6 @@
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
 import io.bootique.di.*;
-import io.bootique.jetty.JettyModule;
-import io.bootique.jetty.MappedFilter;
-import io.bootique.jetty.MappedServlet;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import jakarta.servlet.*;
@@ -158,52 +155,28 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 
     public static class Filter1 implements Filter {
 
-        @Override
-        public void init(FilterConfig filterConfig) throws ServletException {
-        }
-
         @Override
         public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
             response.getWriter().print("f1_");
             chain.doFilter(request, response);
         }
-
-        @Override
-        public void destroy() {
-        }
     }
 
     public static class Filter2 implements Filter {
 
-        @Override
-        public void init(FilterConfig filterConfig) throws ServletException {
-        }
-
         @Override
         public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
             response.getWriter().print("f2_");
             chain.doFilter(request, response);
         }
-
-        @Override
-        public void destroy() {
-        }
     }
 
     public static class Filter3 implements Filter {
 
-        @Override
-        public void init(FilterConfig filterConfig) throws ServletException {
-        }
-
         @Override
         public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
             response.getWriter().print("f3_");
             chain.doFilter(request, response);
         }
-
-        @Override
-        public void destroy() {
-        }
     }
 }
diff --git a/bootique-jetty-jakarta/src/test/java/io/bootique/jetty/servlet/AnnotatedFilterIT.java b/bootique-jetty-jakarta/src/test/java/io/bootique/jetty/servlet/AnnotatedFilterIT.java
@@ -107,16 +107,6 @@ private AnnotatedFilter provideFilter() {
         @WebFilter(filterName = "f1", urlPatterns = "/b/*")
         class AnnotatedFilter implements Filter {
 
-            @Override
-            public void init(FilterConfig filterConfig) throws ServletException {
-                // do nothing
-            }
-
-            @Override
-            public void destroy() {
-                // do nothing
-            }
-
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) {
                 assertion = () -> {

diff --git a/bootique-jetty-jakarta/src/test/java/io/bootique/jetty/servlet/AnnotatedFilter_ParamsIT.java b/bootique-jetty-jakarta/src/test/java/io/bootique/jetty/servlet/AnnotatedFilter_ParamsIT.java
@@ -92,11 +92,6 @@ public void init(FilterConfig filterConfig) throws ServletException {
                 this.config = filterConfig;
             }
 
-            @Override
-            public void destroy() {
-                // do nothing
-            }
-
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
                     throws IOException, ServletException {