diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-01 07:35:14 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-12-01 07:35:14 -0800 |
commit | 051c699dee05fc0a2f5e9a83ddd49016114d8bfb (patch) | |
tree | a94c05da756ff987d198a8bea2b9bf5149771546 /config-application-package/src | |
parent | c0513ac34d2c438e9f97e699659855029e1f06e8 (diff) |
Deprecate com.yahoo.config.provision.Version
We have com.yahoo.component.Version, and one is enough.
Diffstat (limited to 'config-application-package/src')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 12 |
1 files changed, 5 insertions, 7 deletions
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 1724bad765f..5ec30f71e7b 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 @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.application.provider; +import com.yahoo.component.Version; import com.yahoo.component.Vtag; import com.yahoo.config.application.ConfigDefinitionDir; import com.yahoo.config.application.Xml; @@ -12,7 +13,6 @@ import com.yahoo.config.application.api.UnparsedConfigDefinition; import com.yahoo.config.codegen.DefParser; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationPackage; -import com.yahoo.config.provision.Version; import com.yahoo.config.provision.Zone; import com.yahoo.path.Path; import com.yahoo.io.HexDump; @@ -45,7 +45,6 @@ import java.security.MessageDigest; import java.util.*; import java.util.jar.JarFile; import java.util.logging.Logger; -import java.util.stream.Collectors; import static com.yahoo.text.Lowercase.toLowerCase; @@ -571,7 +570,7 @@ public class FilesApplicationPackage implements ApplicationPackage { return appDir.getCanonicalFile(); } - public static ApplicationMetaData readMetaData(File appDir) { + private static ApplicationMetaData readMetaData(File appDir) { ApplicationMetaData defaultMetaData = new ApplicationMetaData(appDir, "n/a", "n/a", 0l, false, "", 0l, 0l); File metaFile = new File(appDir, META_FILE_NAME); if (!metaFile.exists()) { @@ -642,13 +641,12 @@ public class FilesApplicationPackage implements ApplicationPackage { @Override public void validateXML() throws IOException { - validateXML(Optional.empty()); + validateXMLFor(Optional.empty()); } @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); + public void validateXMLFor(Optional<Version> vespaVersion) throws IOException { + Version modelVersion = vespaVersion.orElse(Vtag.currentVersion); ApplicationPackageXmlFilesValidator validator = ApplicationPackageXmlFilesValidator.create(appDir, modelVersion); validator.checkApplication(); validator.checkIncludedDirs(this); |