summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2018-01-16 21:55:09 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2018-01-16 21:55:09 +0100
commitff593a0ce8745cbccf86eb538e705a63b94b55e1 (patch)
tree8582941ee9f19aee612094f235007d6ab447dc62 /config-application-package
parentd9e17187fe49f662520d282c38e5cf779cbb8195 (diff)
Access files through application package
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java20
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 97322fc1c55..1f5c39e90e0 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
}
@@ -704,7 +704,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