Rename 'AccessControlValidator' to 'AccessControlOnFirstDeploymentValidator'

3 files changed, 12 insertions, 12 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
index 7d0d068f9d6..dde2f62ee8f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validation.java
@@ -19,7 +19,7 @@ import com.yahoo.vespa.model.application.validation.change.IndexedSearchClusterC
 import com.yahoo.vespa.model.application.validation.change.IndexingModeChangeValidator;
 import com.yahoo.vespa.model.application.validation.change.StartupCommandChangeValidator;
 import com.yahoo.vespa.model.application.validation.change.StreamingSearchClusterChangeValidator;
-import com.yahoo.vespa.model.application.validation.first.AccessControlValidator;
+import com.yahoo.vespa.model.application.validation.first.AccessControlOnFirstDeploymentValidator;
 
 import java.time.Instant;
 import java.util.Arrays;
@@ -91,7 +91,7 @@ public class Validation {
     }
 
     private static void validateFirstTimeDeployment(VespaModel model, DeployState deployState) {
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidator.java
index b7bbed7ffda..97153e42ee5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidator.java
@@ -23,7 +23,7 @@ import static com.yahoo.vespa.model.container.http.AccessControl.isBuiltinGetOnl
  *
  * @author gjoranv
  */
-public class AccessControlValidator extends Validator {
+public class AccessControlOnFirstDeploymentValidator extends Validator {
 
     @Override
     public void validate(VespaModel model, DeployState deployState) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidatorTest.java
index 17ca0e2dd07..c8f1224693b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlOnFirstDeploymentValidatorTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author gjoranv
  */
-public class AccessControlValidatorTest  {
+public class AccessControlOnFirstDeploymentValidatorTest {
 
     @Rule
     public final ExpectedException exceptionRule = ExpectedException.none();
@@ -57,7 +57,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml(true, true));
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -65,7 +65,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml(false, false));
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -76,7 +76,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -88,7 +88,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml(true, false));
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -105,7 +105,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -120,7 +120,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -133,7 +133,7 @@ public class AccessControlValidatorTest  {
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     @Test
@@ -143,7 +143,7 @@ public class AccessControlValidatorTest  {
                                               LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant());
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
-        new AccessControlValidator().validate(model, deployState);
+        new AccessControlOnFirstDeploymentValidator().validate(model, deployState);
     }
 
     private static DeployState deployState(String servicesXml) {