Change package name and class name of Cors filters

* Change package name to 'com.yahoo.jdisc.filter.security.cors'
* Remove 'Security' from names of Cors class names

6 files changed, 18 insertions, 21 deletions

diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsLogic.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsLogic.java
index 3f1aeff9e95..54f1ee3042f 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsLogic.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsLogic.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.google.common.collect.ImmutableMap;
 import com.yahoo.jdisc.HeaderFields;
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilter.java
index d162fff53b1..6e14cbe8ac2 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsPreflightSecurityRequestFilter.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsPreflightRequestFilter.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.google.inject.Inject;
 import com.yahoo.jdisc.Response;
@@ -14,7 +14,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static com.yahoo.jdisc.http.HttpRequest.Method.OPTIONS;
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsPreflightResponseHeaders;
 
 /**
  * <p>
@@ -34,12 +33,12 @@ import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsPreflightRes
  * @author gv
  * @author bjorncs
  */
-@Provides("CorsPreflightSecurityRequestFilter")
-public class CorsPreflightSecurityRequestFilter implements SecurityRequestFilter {
+@Provides("CorsPreflightRequestFilter")
+public class CorsPreflightRequestFilter implements SecurityRequestFilter {
     private final Set<String> allowedUrls;
 
     @Inject
-    public CorsPreflightSecurityRequestFilter(CorsSecurityFilterConfig config) {
+    public CorsPreflightRequestFilter(CorsFilterConfig config) {
         this.allowedUrls = new HashSet<>(config.allowedUrls());
     }
 
@@ -52,7 +51,7 @@ public class CorsPreflightSecurityRequestFilter implements SecurityRequestFilter
 
         HttpResponse response = HttpResponse.newInstance(Response.Status.OK);
 
-        createCorsPreflightResponseHeaders(origin, allowedUrls)
+        CorsLogic.createCorsPreflightResponseHeaders(origin, allowedUrls)
                 .forEach(response.headers()::put);
 
         ContentChannel cc = responseHandler.handleResponse(response);
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBase.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.java
index fd64aa37875..7bdbd7eddf4 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityRequestFilterBase.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsRequestFilterBase.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.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -15,7 +15,7 @@ import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsResponseHeaders;
+import static com.yahoo.jdisc.http.filter.security.cors.CorsLogic.createCorsResponseHeaders;
 
 /**
  * Security request filters should extend this base class to ensure that CORS header are included in the response of a rejected request.
@@ -23,17 +23,17 @@ import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsResponseHead
  *
  * @author bjorncs
  */
-public abstract class CorsSecurityRequestFilterBase implements SecurityRequestFilter {
+public abstract class CorsRequestFilterBase implements SecurityRequestFilter {
 
     private static final ObjectMapper mapper = new ObjectMapper();
 
     private final Set<String> allowedUrls;
 
-    protected CorsSecurityRequestFilterBase(CorsSecurityFilterConfig config) {
+    protected CorsRequestFilterBase(CorsFilterConfig config) {
         this(new HashSet<>(config.allowedUrls()));
     }
 
-    protected CorsSecurityRequestFilterBase(Set<String> allowedUrls) {
+    protected CorsRequestFilterBase(Set<String> allowedUrls) {
         this.allowedUrls = allowedUrls;
     }
 
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilter.java
index bf288661bc4..d0b9e4ce7c9 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/CorsSecurityResponseFilter.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilter.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.google.inject.Inject;
 import com.yahoo.jdisc.AbstractResource;
@@ -11,27 +11,25 @@ import com.yahoo.yolean.chain.Provides;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.yahoo.jdisc.http.filters.cors.CorsLogic.createCorsResponseHeaders;
-
 
 /**
  * @author gv
  * @author Tony Vaagenes
  * @author bjorncs
  */
-@Provides("CorsSecurityResponseFilter")
-public class CorsSecurityResponseFilter extends AbstractResource implements SecurityResponseFilter {
+@Provides("CorsResponseFilter")
+public class CorsResponseFilter extends AbstractResource implements SecurityResponseFilter {
 
     private final Set<String> allowedUrls;
 
     @Inject
-    public CorsSecurityResponseFilter(CorsSecurityFilterConfig config) {
+    public CorsResponseFilter(CorsFilterConfig config) {
         this.allowedUrls = new HashSet<>(config.allowedUrls());
     }
 
     @Override
     public void filter(DiscFilterResponse response, RequestView request) {
-        createCorsResponseHeaders(request.getFirstHeader("Origin").orElse(null), allowedUrls)
+        CorsLogic.createCorsResponseHeaders(request.getFirstHeader("Origin").orElse(null), allowedUrls)
                 .forEach(response::setHeader);
     }
 
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/package-info.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/package-info.java
index 6357acc4e99..cada3d3fcd8 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filters/cors/package-info.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/cors/package-info.java
@@ -3,6 +3,6 @@
  * @author bjorncs
  */
 @ExportPackage
-package com.yahoo.jdisc.http.filters.cors;
+package com.yahoo.jdisc.http.filter.security.cors;
 
 import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/cors-security-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def
index 71d4b998b99..a5c69b2db62 100644
--- a/jdisc-security-filters/src/main/resources/configdefinitions/cors-security-filter.def
+++ b/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def
@@ -1,4 +1,4 @@
 # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=jdisc.http.filters.cors
+namespace=jdisc.http.filter.security.cors
 
 allowedUrls[] string