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

4 files changed, 12 insertions, 12 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java
index 767a1da3eb0..e3df55a9c85 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/AthenzPrincipalFilter.java
@@ -4,8 +4,8 @@ package com.yahoo.vespa.hosted.controller.athenz.filter;
 import com.google.inject.Inject;
 import com.yahoo.jdisc.Response;
 import com.yahoo.jdisc.http.filter.DiscFilterRequest;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityRequestFilterBase;
+import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig;
+import com.yahoo.jdisc.http.filter.security.cors.CorsRequestFilterBase;
 import com.yahoo.vespa.athenz.api.AthenzPrincipal;
 import com.yahoo.vespa.athenz.api.NToken;
 import com.yahoo.vespa.athenz.utils.AthenzIdentities;
@@ -31,7 +31,7 @@ import java.util.concurrent.Executor;
  * @author bjorncs
  */
 // TODO bjorncs: Move this class to vespa-athenz bundle
-public class AthenzPrincipalFilter extends CorsSecurityRequestFilterBase {
+public class AthenzPrincipalFilter extends CorsRequestFilterBase {
 
     private final NTokenValidator validator;
     private final String principalTokenHeader;
@@ -43,7 +43,7 @@ public class AthenzPrincipalFilter extends CorsSecurityRequestFilterBase {
     public AthenzPrincipalFilter(ZmsKeystore zmsKeystore,
                                  Executor executor,
                                  AthenzConfig athenzConfig,
-                                 CorsSecurityFilterConfig corsConfig) {
+                                 CorsFilterConfig corsConfig) {
         this(new NTokenValidator(zmsKeystore), executor, athenzConfig.principalHeaderName(), new HashSet<>(corsConfig.allowedUrls()));
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java
index 27e3b339b38..909051dcefc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/filter/UserAuthWithAthenzPrincipalFilter.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.athenz.filter;
 import com.google.inject.Inject;
 import com.yahoo.jdisc.Response;
 import com.yahoo.jdisc.http.filter.DiscFilterRequest;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig;
+import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.athenz.api.AthenzPrincipal;
 import com.yahoo.vespa.athenz.api.AthenzUser;
@@ -29,7 +29,7 @@ import java.util.stream.Stream;
  * @author bjorncs
  */
 // TODO Remove this filter once migrated to Okta
-@After({"CorsPreflightSecurityRequestFilter", "BouncerFilter"})
+@After({"CorsPreflightRequestFilter", "BouncerFilter"})
 public class UserAuthWithAthenzPrincipalFilter extends AthenzPrincipalFilter {
 
     private static final Logger log = Logger.getLogger(UserAuthWithAthenzPrincipalFilter.class.getName());
@@ -41,7 +41,7 @@ public class UserAuthWithAthenzPrincipalFilter extends AthenzPrincipalFilter {
     public UserAuthWithAthenzPrincipalFilter(ZmsKeystore zmsKeystore,
                                              Executor executor,
                                              AthenzConfig athenzConfig,
-                                             CorsSecurityFilterConfig corsConfig) {
+                                             CorsFilterConfig corsConfig) {
         super(zmsKeystore, executor, athenzConfig, corsConfig);
         this.userAuthenticationPassThruAttribute = athenzConfig.userAuthenticationPassThruAttribute();
         this.principalHeaderName = athenzConfig.principalHeaderName();
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
index b7f4d8e490a..36728759e3f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
@@ -6,8 +6,8 @@ import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.jdisc.http.HttpRequest.Method;
 import com.yahoo.jdisc.http.filter.DiscFilterRequest;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityFilterConfig;
-import com.yahoo.jdisc.http.filters.cors.CorsSecurityRequestFilterBase;
+import com.yahoo.jdisc.http.filter.security.cors.CorsFilterConfig;
+import com.yahoo.jdisc.http.filter.security.cors.CorsRequestFilterBase;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
@@ -49,7 +49,7 @@ import static com.yahoo.vespa.hosted.controller.api.integration.athenz.HostedAth
  */
 @After("com.yahoo.vespa.hosted.controller.athenz.filter.UserAuthWithAthenzPrincipalFilter")
 @Provides("ControllerAuthorizationFilter")
-public class ControllerAuthorizationFilter extends CorsSecurityRequestFilterBase {
+public class ControllerAuthorizationFilter extends CorsRequestFilterBase {
 
     private static final List<Method> WHITELISTED_METHODS = Arrays.asList(GET, OPTIONS, HEAD);
 
@@ -61,7 +61,7 @@ public class ControllerAuthorizationFilter extends CorsSecurityRequestFilterBase
     @Inject
     public ControllerAuthorizationFilter(AthenzClientFactory clientFactory,
                                          Controller controller,
-                                         CorsSecurityFilterConfig corsConfig) {
+                                         CorsFilterConfig corsConfig) {
         super(corsConfig);
         this.clientFactory = clientFactory;
         this.tenantController = controller.tenants();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
index d4754d03997..5ccdcdbf4e8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
@@ -54,7 +54,7 @@ public class ControllerContainerTest {
             "      <item key=\"rotation-id-5\">rotation-fqdn-5</item>\n" +
             "    </rotations>\n" +
             "  </config>\n" +
-            "  <config name=\"jdisc.http.filters.cors.cors-security-filter\">\n" +
+            "  <config name=\"jdisc.http.filter.security.cors.cors-filter\">\n" +
             "    <allowedUrls>\n" +
             "      <item>http://localhost</item>\n" +
             "    </allowedUrls>\n" +