diff options
5 files changed, 11 insertions, 16 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java index b4d65ce6d0e..8e9c5c0b509 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java @@ -31,11 +31,7 @@ public class ApplicationPackageXmlFilesValidator { this.validators = new SchemaValidators(vespaVersion, new BaseDeployLogger()); } - public static ApplicationPackageXmlFilesValidator createDefaultXMLValidator(File appDir, Version vespaVersion) { - return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), vespaVersion); - } - - public static ApplicationPackageXmlFilesValidator createTestXmlValidator(File appDir, Version vespaVersion) { + public static ApplicationPackageXmlFilesValidator create(File appDir, Version vespaVersion) { return new ApplicationPackageXmlFilesValidator(new AppSubDirs(appDir), vespaVersion); } diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index 22b8e841430..f1565d1fa4b 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -631,10 +631,11 @@ public class FilesApplicationPackage implements ApplicationPackage { @Override public void validateXML(Optional<Version> vespaVersion) throws IOException { - com.yahoo.component.Version modelVersion = vespaVersion.map(v -> new com.yahoo.component.Version(vespaVersion.toString())).orElse(Vtag.currentVersion); - ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, modelVersion); - xmlFilesValidator.checkApplication(); - xmlFilesValidator.checkIncludedDirs(this); + com.yahoo.component.Version modelVersion = + vespaVersion.map(v -> new com.yahoo.component.Version(vespaVersion.toString())).orElse(Vtag.currentVersion); + ApplicationPackageXmlFilesValidator validator = ApplicationPackageXmlFilesValidator.create(appDir, modelVersion); + validator.checkApplication(); + validator.checkIncludedDirs(this); } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index c3014b077c0..a99b064a992 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -82,8 +82,7 @@ public class VespaModelFactory implements ModelFactory { } @Override - public ModelCreateResult createAndValidateModel(ModelContext modelContext, - boolean ignoreValidationErrors) { + public ModelCreateResult createAndValidateModel(ModelContext modelContext, boolean ignoreValidationErrors) { validateXml(modelContext, ignoreValidationErrors); DeployState deployState = createDeployState(modelContext); VespaModel model = buildModel(deployState); @@ -94,8 +93,8 @@ public class VespaModelFactory implements ModelFactory { private void validateXml(ModelContext modelContext, boolean ignoreValidationErrors) { if (modelContext.appDir().isPresent()) { ApplicationPackageXmlFilesValidator validator = - ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(modelContext.appDir().get(), - modelContext.modelVespaVersion()); + ApplicationPackageXmlFilesValidator.create(modelContext.appDir().get(), + modelContext.modelVespaVersion()); try { validator.checkApplication(); validator.checkIncludedDirs(modelContext.applicationPackage()); @@ -104,7 +103,6 @@ public class VespaModelFactory implements ModelFactory { } catch (Exception e) { throw new RuntimeException(e); } - } else { validateXML(modelContext.applicationPackage(), ignoreValidationErrors); } diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index 92083545027..1e1b8cd2ac8 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -243,7 +243,7 @@ public class ApplicationDeployTest { final FilesApplicationPackage filesApplicationPackage = FilesApplicationPackage.fromFile(new File(appPkg)); if (validateXml) { ApplicationPackageXmlFilesValidator validator = - ApplicationPackageXmlFilesValidator.createTestXmlValidator(new File(appPkg), new Version(6)); + ApplicationPackageXmlFilesValidator.create(new File(appPkg), new Version(6)); validator.checkApplication(); validator.checkIncludedDirs(filesApplicationPackage); } 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 cb95d3e5424..c89d3098c4d 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 @@ -46,7 +46,7 @@ public class VespaModelCreatorWithFilePkg { public void validate() throws IOException { ApplicationPackageXmlFilesValidator validator = - ApplicationPackageXmlFilesValidator.createTestXmlValidator(applicationPkg.getAppDir(), new Version(6)); + ApplicationPackageXmlFilesValidator.create(applicationPkg.getAppDir(), new Version(6)); validator.checkApplication(); validator.checkIncludedDirs(applicationPkg); } |