3 files changed, 21 insertions, 21 deletions
diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java
index cb934c32bee..2486bc444c8 100644
--- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilterTest.java
+++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilterTest.java
@@ -1,5 +1,5 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.filters.cors;
+package com.yahoo.jdisc.http.filter.security.cors;
 
 import com.yahoo.jdisc.HeaderFields;
 import com.yahoo.jdisc.Response;
@@ -7,14 +7,14 @@ import com.yahoo.jdisc.handler.ContentChannel;
 import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.filter.DiscFilterRequest;
 import com.yahoo.jdisc.http.filter.SecurityRequestFilter;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig.Builder;
+import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder;
 import org.junit.Test;
 
 import java.util.Arrays;
 
 import static com.yahoo.jdisc.http.HttpRequest.Method.OPTIONS;
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ACCESS_CONTROL_HEADERS;
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ALLOW_ORIGIN_HEADER;
+import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS;
+import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.when;
  * @author gjoranv
  * @author bjorncs
  */
-public class CorsPreflightSecurityRequestFilterTest {
+public class CorsPreflightRequestFilterTest {
 
     @Test
     public void any_options_request_yields_access_control_headers_in_response() {
@@ -59,10 +59,10 @@ public class CorsPreflightSecurityRequestFilterTest {
         return request;
     }
 
-    private static CorsPreflightSecurityRequestFilter newRequestFilter(String... allowedOriginUrls) {
+    private static CorsPreflightRequestFilter newRequestFilter(String... allowedOriginUrls) {
         Builder builder = new Builder();
         Arrays.asList(allowedOriginUrls).forEach(builder::allowedUrls);
-        return new CorsPreflightSecurityRequestFilter(new CorsSecurityFilterConfig(builder));
+        return new CorsPreflightRequestFilter(new CorsFilterConfig(builder));
     }
 
     private static class AccessControlResponseHandler implements ResponseHandler {
diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBaseTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java
index 65fb78cdbd6..29d28499a28 100644
--- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBaseTest.java
+++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBaseTest.java
@@ -1,5 +1,5 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.filters.cors;
+package com.yahoo.jdisc.http.filter.security.cors;
 
 import com.yahoo.container.jdisc.RequestHandlerTestDriver.MockResponseHandler;
 import com.yahoo.jdisc.Response;
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ALLOW_ORIGIN_HEADER;
+import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
@@ -21,15 +21,15 @@ import static org.mockito.Mockito.when;
 /**
  * @author bjorncs
  */
-public class CorsSecurityRequestFilterBaseTest {
+public class CorsRequestFilterBaseTest {
 
     @Test
     public void adds_cors_headers_when_filter_reject_request() {
         String origin = "http://allowed.origin";
         Set<String> allowedOrigins = Collections.singleton(origin);
         int statusCode = 403;
-        SimpleCorsSecurityRequestFilter filter =
-                new SimpleCorsSecurityRequestFilter(allowedOrigins, statusCode, "Forbidden");
+        SimpleCorsRequestFilter filter =
+                new SimpleCorsRequestFilter(allowedOrigins, statusCode, "Forbidden");
         DiscFilterRequest request = mock(DiscFilterRequest.class);
         when(request.getHeader("Origin")).thenReturn(origin);
         MockResponseHandler responseHandler = new MockResponseHandler();
@@ -43,10 +43,10 @@ public class CorsSecurityRequestFilterBaseTest {
         assertThat(allowOriginHeader.get(0), equalTo(origin));
     }
 
-    private static class SimpleCorsSecurityRequestFilter extends CorsSecurityRequestFilterBase {
+    private static class SimpleCorsRequestFilter extends CorsRequestFilterBase {
         private final ErrorResponse errorResponse;
 
-        SimpleCorsSecurityRequestFilter(Set<String> allowedUrls, int statusCode, String message) {
+        SimpleCorsRequestFilter(Set<String> allowedUrls, int statusCode, String message) {
             super(allowedUrls);
             this.errorResponse = new ErrorResponse(statusCode, message);
         }
diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java
index cadc4b217b3..2967a7659f5 100644
--- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilterTest.java
+++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java
@@ -1,11 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.filters.cors;
+package com.yahoo.jdisc.http.filter.security.cors;
 
 import com.yahoo.jdisc.http.Cookie;
 import com.yahoo.jdisc.http.filter.DiscFilterResponse;
 import com.yahoo.jdisc.http.filter.RequestView;
 import com.yahoo.jdisc.http.filter.SecurityResponseFilter;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig.Builder;
+import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig.Builder;
 import com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpResponse;
 import org.junit.Test;
 
@@ -16,8 +16,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ACCESS_CONTROL_HEADERS;
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.ALLOW_ORIGIN_HEADER;
+import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ACCESS_CONTROL_HEADERS;
+import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.ALLOW_ORIGIN_HEADER;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.when;
  * @author gjoranv
  * @author bjorncs
  */
-public class CorsSecurityResponseFilterTest {
+public class CorsResponseFilterTest {
 
     @Test
     public void any_request_yields_access_control_headers_in_response() {
@@ -62,10 +62,10 @@ public class CorsSecurityResponseFilterTest {
         return Collections.unmodifiableMap(response.headers);
     }
 
-    private static CorsSecurityResponseFilter newResponseFilter(String... allowedOriginUrls) {
+    private static CorsResponseFilter newResponseFilter(String... allowedOriginUrls) {
         Builder builder = new Builder();
         Arrays.asList(allowedOriginUrls).forEach(builder::allowedUrls);
-        return new CorsSecurityResponseFilter(new CorsSecurityFilterConfig(builder));
+        return new CorsResponseFilter(new CorsFilterConfig(builder));
     }
 
     private static RequestView newRequestView(String originUrl) {