diff options
| author | Harald Musum <musum@oath.com> | 2017-08-29 14:54:10 +0200 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2017-08-29 14:54:10 +0200 |
| commit | 7f4991a2666f94d0a51a441413911fa04d3abdff (patch) | |
| tree | f65a9db53b92faae8440dc9c2a1ff77197c7ceb5 /config-application-package | |
| parent | 915b617dd57402b16e70d22b4187d987d64293c0 (diff) | |
Merge two identical methods
Diffstat (limited to 'config-application-package')
2 files changed, 6 insertions, 9 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 |