Rename 'ComponentValidator' => 'BundleValidator'

3 files changed, 10 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
index 66fe9308ae7..eb5e25e61cd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ComponentValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
@@ -24,9 +24,9 @@ import java.util.logging.Level;
  * @author hmusum
  * @author bjorncs
  */
-public class ComponentValidator extends Validator {
+public class BundleValidator extends Validator {
 
-    public ComponentValidator() {}
+    public BundleValidator() {}
 
     @Override
     public void validate(VespaModel model, DeployState deployState) {
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 5215fdcb301..08dc73a1bd0 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
@@ -63,7 +63,7 @@ public class Validation {
             new RoutingSelectorValidator().validate(model, deployState);
         }
         new SchemasDirValidator().validate(model, deployState);
-        new ComponentValidator().validate(model, deployState);
+        new BundleValidator().validate(model, deployState);
         new SearchDataTypeValidator().validate(model, deployState);
         new ComplexAttributeFieldsValidator().validate(model, deployState);
         new StreamingValidator().validate(model, deployState);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComponentValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
index 7045af60fc9..76ca8ad15dd 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComponentValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java
@@ -14,15 +14,15 @@ import java.util.logging.Level;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class ComponentValidatorTest {
+public class BundleValidatorTest {
     private static final String JARS_DIR = "src/test/cfg/application/validation/testjars/";
 
     @Test
-    public void basicComponentValidation() throws Exception {
+    public void basicBundleValidation() throws Exception {
         // Valid jar file
         JarFile ok = new JarFile(new File(JARS_DIR + "ok.jar"));
-        ComponentValidator componentValidator = new ComponentValidator();
-        componentValidator.validateJarFile(new BaseDeployLogger(), ok);
+        BundleValidator bundleValidator = new BundleValidator();
+        bundleValidator.validateJarFile(new BaseDeployLogger(), ok);
 
         // No manifest
         validateWithException("nomanifest.jar", "Non-existing or invalid manifest in " + JARS_DIR + "nomanifest.jar");
@@ -31,8 +31,8 @@ public class ComponentValidatorTest {
     private void validateWithException(String jarName, String exceptionMessage) throws IOException {
         try {
             JarFile jarFile = new JarFile(JARS_DIR + jarName);
-            ComponentValidator componentValidator = new ComponentValidator();
-            componentValidator.validateJarFile(new BaseDeployLogger(), jarFile);
+            BundleValidator bundleValidator = new BundleValidator();
+            bundleValidator.validateJarFile(new BaseDeployLogger(), jarFile);
             assert (false);
         } catch (IllegalArgumentException e) {
             assertEquals(e.getMessage(), exceptionMessage);
@@ -50,7 +50,7 @@ public class ComponentValidatorTest {
             }
         };
         
-        new ComponentValidator().validateJarFile(logger, new JarFile(JARS_DIR + "snapshot_bundle.jar"));
+        new BundleValidator().validateJarFile(logger, new JarFile(JARS_DIR + "snapshot_bundle.jar"));
         assertTrue(buffer.toString().contains("Deploying snapshot bundle"));
     }
 }