1 files changed, 28 insertions, 28 deletions

diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
index c975f7c17c3..ce49926c58b 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java
@@ -29,7 +29,7 @@ import com.yahoo.jdisc.http.filter.chain.RequestFilterChain;
 import com.yahoo.jdisc.http.filter.chain.ResponseFilterChain;
 import com.yahoo.jdisc.http.server.jetty.testutils.ConnectorFactoryRegistryModule;
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import java.io.IOException;
@@ -58,7 +58,7 @@ import static org.mockito.Mockito.when;
  */
 public class FilterTestCase {
     @Test
-    public void requireThatRequestFilterIsNotRunOnUnboundPath() throws Exception {
+    void requireThatRequestFilterIsNotRunOnUnboundPath() throws Exception {
         RequestFilterMockBase filter = mock(RequestFilterMockBase.class);
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", filter)
@@ -76,7 +76,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterIsRunOnBoundPath() throws Exception {
+    void requireThatRequestFilterIsRunOnBoundPath() throws Exception {
         final RequestFilter filter = mock(RequestFilterMockBase.class);
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", filter)
@@ -94,7 +94,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterChangesAreSeenByRequestHandler() throws Exception {
+    void requireThatRequestFilterChangesAreSeenByRequestHandler() throws Exception {
         final RequestFilter filter = new HeaderRequestFilter("foo", "bar");
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", filter)
@@ -112,7 +112,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterCanRespond() throws Exception {
+    void requireThatRequestFilterCanRespond() throws Exception {
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", new RespondForbiddenFilter())
                 .addRequestFilterBinding("my-request-filter", "http://*/*")
@@ -128,7 +128,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatFilterCanHaveNullCompletionHandler() throws Exception {
+    void requireThatFilterCanHaveNullCompletionHandler() throws Exception {
         final int responseStatus = Response.Status.OK;
         final String responseMessage = "Excellent";
         FilterBindings filterBindings = new FilterBindings.Builder()
@@ -148,7 +148,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterExecutionIsExceptionSafe() throws Exception {
+    void requireThatRequestFilterExecutionIsExceptionSafe() throws Exception {
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", new ThrowingRequestFilter())
                 .addRequestFilterBinding("my-request-filter", "http://*/*")
@@ -164,7 +164,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterIsNotRunOnUnboundPath() throws Exception {
+    void requireThatResponseFilterIsNotRunOnUnboundPath() throws Exception {
         final ResponseFilter filter = mock(ResponseFilterMockBase.class);
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addResponseFilter("my-response-filter", filter)
@@ -182,7 +182,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterIsRunOnBoundPath() throws Exception {
+    void requireThatResponseFilterIsRunOnBoundPath() throws Exception {
         final ResponseFilter filter = mock(ResponseFilterMockBase.class);
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addResponseFilter("my-response-filter", filter)
@@ -200,7 +200,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterChangesAreWrittenToResponse() throws Exception {
+    void requireThatResponseFilterChangesAreWrittenToResponse() throws Exception {
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addResponseFilter("my-response-filter", new HeaderResponseFilter("foo", "bar"))
                 .addResponseFilterBinding("my-response-filter", "http://*/*")
@@ -217,7 +217,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterExecutionIsExceptionSafe() throws Exception {
+    void requireThatResponseFilterExecutionIsExceptionSafe() throws Exception {
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addResponseFilter("my-response-filter", new ThrowingResponseFilter())
                 .addResponseFilterBinding("my-response-filter", "http://*/*")
@@ -233,7 +233,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterAndResponseFilterCanBindToSamePath() throws Exception {
+    void requireThatRequestFilterAndResponseFilterCanBindToSamePath() throws Exception {
         final RequestFilter requestFilter = mock(RequestFilterMockBase.class);
         final ResponseFilter responseFilter = mock(ResponseFilterMockBase.class);
         final String uriPattern = "http://*/*";
@@ -256,7 +256,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFromRequestFilterGoesThroughResponseFilter() throws Exception {
+    void requireThatResponseFromRequestFilterGoesThroughResponseFilter() throws Exception {
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", new RespondForbiddenFilter())
                 .addRequestFilterBinding("my-request-filter", "http://*/*")
@@ -276,7 +276,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterChainRetainsFilters() {
+    void requireThatRequestFilterChainRetainsFilters() {
         final RequestFilter requestFilter1 = mock(RequestFilter.class);
         final RequestFilter requestFilter2 = mock(RequestFilter.class);
 
@@ -296,7 +296,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterChainIsRun() throws Exception {
+    void requireThatRequestFilterChainIsRun() throws Exception {
         final RequestFilter requestFilter1 = mock(RequestFilter.class);
         final RequestFilter requestFilter2 = mock(RequestFilter.class);
         final RequestFilter requestFilterChain = RequestFilterChain.newInstance(requestFilter1, requestFilter2);
@@ -308,7 +308,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterChainCallsFilterWithOriginalRequest() throws Exception {
+    void requireThatRequestFilterChainCallsFilterWithOriginalRequest() throws Exception {
         final RequestFilter requestFilter = mock(RequestFilter.class);
         final RequestFilter requestFilterChain = RequestFilterChain.newInstance(requestFilter);
         final HttpRequest request = mock(HttpRequest.class);
@@ -325,7 +325,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterChainCallsFilterWithOriginalResponseHandler() throws Exception {
+    void requireThatRequestFilterChainCallsFilterWithOriginalResponseHandler() throws Exception {
         final RequestFilter requestFilter = mock(RequestFilter.class);
         final RequestFilter requestFilterChain = RequestFilterChain.newInstance(requestFilter);
         final HttpRequest request = null;
@@ -342,7 +342,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterCanTerminateChain() throws Exception {
+    void requireThatRequestFilterCanTerminateChain() throws Exception {
         final RequestFilter requestFilter1 = new RespondForbiddenFilter();
         final RequestFilter requestFilter2 = mock(RequestFilter.class);
         final RequestFilter requestFilterChain = RequestFilterChain.newInstance(requestFilter1, requestFilter2);
@@ -360,7 +360,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterChainRetainsFilters() {
+    void requireThatResponseFilterChainRetainsFilters() {
         final ResponseFilter responseFilter1 = mock(ResponseFilter.class);
         final ResponseFilter responseFilter2 = mock(ResponseFilter.class);
 
@@ -380,7 +380,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterChainIsRun() {
+    void requireThatResponseFilterChainIsRun() {
         final ResponseFilter responseFilter1 = new ResponseHeaderFilter("foo", "bar");
         final ResponseFilter responseFilter2 = mock(ResponseFilter.class);
         final int statusCode = Response.Status.BAD_GATEWAY;
@@ -399,7 +399,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatDefaultRequestFilterChainIsRunIfNoOtherFilterChainMatches() throws IOException, InterruptedException {
+    void requireThatDefaultRequestFilterChainIsRunIfNoOtherFilterChainMatches() throws IOException, InterruptedException {
         RequestFilter filterWithBinding = mock(RequestFilter.class);
         RequestFilter defaultFilter = mock(RequestFilter.class);
         String defaultFilterId = "default-request-filter";
@@ -422,7 +422,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatDefaultResponseFilterChainIsRunIfNoOtherFilterChainMatches() throws IOException, InterruptedException {
+    void requireThatDefaultResponseFilterChainIsRunIfNoOtherFilterChainMatches() throws IOException, InterruptedException {
         ResponseFilter filterWithBinding = mock(ResponseFilter.class);
         ResponseFilter defaultFilter = mock(ResponseFilter.class);
         String defaultFilterId = "default-response-filter";
@@ -445,7 +445,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestFilterWithBindingMatchHasPrecedenceOverDefaultFilter() throws IOException, InterruptedException {
+    void requireThatRequestFilterWithBindingMatchHasPrecedenceOverDefaultFilter() throws IOException, InterruptedException {
         RequestFilterMockBase filterWithBinding = mock(RequestFilterMockBase.class);
         RequestFilterMockBase defaultFilter = mock(RequestFilterMockBase.class);
         String defaultFilterId = "default-request-filter";
@@ -468,7 +468,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatResponseFilterWithBindingMatchHasPrecedenceOverDefaultFilter() throws IOException, InterruptedException {
+    void requireThatResponseFilterWithBindingMatchHasPrecedenceOverDefaultFilter() throws IOException, InterruptedException {
         ResponseFilter filterWithBinding = mock(ResponseFilter.class);
         ResponseFilter defaultFilter = mock(ResponseFilter.class);
         String defaultFilterId = "default-response-filter";
@@ -491,7 +491,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatMetricAreReported() throws IOException, InterruptedException {
+    void requireThatMetricAreReported() throws IOException, InterruptedException {
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", mock(RequestFilter.class))
                 .addRequestFilterBinding("my-request-filter", "http://*/*")
@@ -514,7 +514,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatStrictFilteringRejectsRequestsNotMatchingFilterChains() throws IOException {
+    void requireThatStrictFilteringRejectsRequestsNotMatchingFilterChains() throws IOException {
         RequestFilter filter = mock(RequestFilter.class);
         FilterBindings filterBindings = new FilterBindings.Builder()
                 .addRequestFilter("my-request-filter", filter)
@@ -531,7 +531,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestHandlerSpecIsAvailableThroughDelegate() throws IOException, InterruptedException {
+    void requireThatRequestHandlerSpecIsAvailableThroughDelegate() throws IOException, InterruptedException {
         MyRequestHandler requestHandler = new MyHttpRequestHandler();
         MyDelegatedHandler delegateHandler1 = new MyDelegatedHandler(requestHandler);
         MyDelegatedHandler delegateHandler2 = new MyDelegatedHandler(delegateHandler1);
@@ -539,7 +539,7 @@ public class FilterTestCase {
     }
 
     @Test
-    public void requireThatRequestHandlerSpecIsAvailable() throws IOException, InterruptedException {
+    void requireThatRequestHandlerSpecIsAvailable() throws IOException, InterruptedException {
         MyRequestHandler requestHandler = new MyHttpRequestHandler();
         requestHandlerSpecTest(requestHandler);
     }