Merge pull request #7027 from vespa-engine/hmusum/minor-schema-validator-cleanup

Minor schema validator cleanup

3 files changed, 6 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java b/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java
index b538468d0bc..e0047aba2db 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/TestDriver.java
@@ -9,6 +9,7 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.application.provider.SchemaValidators;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
+import com.yahoo.vespa.config.VespaVersion;
 import com.yahoo.vespa.model.VespaModel;
 import org.xml.sax.SAXException;
 
@@ -103,7 +104,7 @@ public class TestDriver {
         if (!validate) {
             return;
         }
-        SchemaValidators schemaValidators = new SchemaValidators(new Version(6), new BaseDeployLogger());
+        SchemaValidators schemaValidators = new SchemaValidators(new Version(VespaVersion.major));
         if (appPkg.getHosts() != null) {
             schemaValidators.hostsXmlValidator().validate(appPkg.getHosts());
         }
diff --git a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
index fda230e22ab..5c4b51ca3fa 100644
--- a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.config.model.application.provider;
 
 import com.yahoo.component.Version;
+import com.yahoo.vespa.config.VespaVersion;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -65,6 +66,6 @@ public class SchemaValidatorTest {
     }
 
     private SchemaValidator createValidator() throws IOException {
-        return new SchemaValidators(new Version(6)).servicesXmlValidator();
+        return new SchemaValidators(new Version(VespaVersion.major)).servicesXmlValidator();
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
index 3c9618ceccd..8147d2e00ca 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/VespaModelCreatorWithFilePkg.java
@@ -10,6 +10,7 @@ import com.yahoo.config.model.api.ValidationParameters.FailOnIncompatibleChange;
 import com.yahoo.config.model.api.ValidationParameters.IgnoreValidationErrors;
 import com.yahoo.config.model.application.provider.*;
 import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.vespa.config.VespaVersion;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.Validation;
 
@@ -50,7 +51,7 @@ public class VespaModelCreatorWithFilePkg {
 
     public void validate() throws IOException {
         ApplicationPackageXmlFilesValidator validator =
-                ApplicationPackageXmlFilesValidator.create(applicationPkg.getAppDir(), new Version(6));
+                ApplicationPackageXmlFilesValidator.create(applicationPkg.getAppDir(), new Version(VespaVersion.major));
         validator.checkApplication();
         validator.checkIncludedDirs(applicationPkg);
     }