diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2018-01-17 13:51:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-17 13:51:14 +0100 |
commit | fd26b36e3607df463b35e856b37d24b5e3514fb7 (patch) | |
tree | 403836969d050736403f6512a455198a2c63edad /config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | |
parent | ceec6d572c06ff812715c97d2c35383c48402f24 (diff) | |
parent | c84b8f952ef5857aa44fad479551eda1f3a4e106 (diff) |
Merge pull request #4692 from vespa-engine/bratseth/store-converted-expressions-in-zk
Bratseth/store converted expressions in zk
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 20 |
1 files changed, 10 insertions, 10 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 5367bdcf13f..13d9283d151 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 @@ -55,7 +55,7 @@ import static com.yahoo.text.Lowercase.toLowerCase; * Construct using {@link com.yahoo.config.model.application.provider.FilesApplicationPackage#fromFile(java.io.File)} or * {@link com.yahoo.config.model.application.provider.FilesApplicationPackage#fromFileWithDeployData(java.io.File, DeployData)}. * - * @author vegardh + * @author Vegard Havdal */ public class FilesApplicationPackage implements ApplicationPackage { @@ -97,15 +97,15 @@ public class FilesApplicationPackage implements ApplicationPackage { } /** Creates package from a local directory, typically deploy app */ - public static FilesApplicationPackage fromFileWithDeployData(File appDir, DeployData deployData, + public static FilesApplicationPackage fromFileWithDeployData(File appDir, DeployData deployData, boolean includeSourceFiles) { return new Builder(appDir).includeSourceFiles(includeSourceFiles).deployData(deployData).build(); } private static ApplicationMetaData metaDataFromDeployData(File appDir, DeployData deployData) { - return new ApplicationMetaData(deployData.getDeployedByUser(), deployData.getDeployedFromDir(), - deployData.getDeployTimestamp(), deployData.getApplicationName(), - computeCheckSum(appDir), deployData.getGeneration(), + return new ApplicationMetaData(deployData.getDeployedByUser(), deployData.getDeployedFromDir(), + deployData.getDeployTimestamp(), deployData.getApplicationName(), + computeCheckSum(appDir), deployData.getGeneration(), deployData.getCurrentlyActiveGeneration()); } @@ -385,9 +385,9 @@ public class FilesApplicationPackage implements ApplicationPackage { } } - /** + /** * Creates a reader for a config definition - * + * * @param defPath the path to the application package * @return the reader of this config definition */ @@ -456,10 +456,10 @@ public class FilesApplicationPackage implements ApplicationPackage { if (defs.containsKey(key)) { if (nv[0].contains(".")) { - log.log(LogLevel.INFO, "Two config definitions found for the same name and namespace: " + key + + log.log(LogLevel.INFO, "Two config definitions found for the same name and namespace: " + key + ". The file '" + def + "' will take precedence"); } else { - log.log(LogLevel.INFO, "Two config definitions found for the same name and namespace: " + key + + log.log(LogLevel.INFO, "Two config definitions found for the same name and namespace: " + key + ". Skipping '" + def + "', as it does not contain namespace in filename"); continue; // skip } @@ -709,7 +709,7 @@ public class FilesApplicationPackage implements ApplicationPackage { } } - + /** * Adds the given path to the digest, or does nothing if path is neither file nor dir * @param path path to add to message digest |