diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-08-20 12:23:38 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-08-20 12:23:38 +0200 |
commit | c7cfd9f4742f398331839ed0f2ceeee55c68a791 (patch) | |
tree | affd290ab13c37f5ea1173c421c771c317700e3b /configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java | |
parent | c6d642b55558203a6eddd79efbc232bb34ec8e52 (diff) |
Revert "Merge pull request #6626 from vespa-engine/revert-6625-bratseth/generate-rank-profiles-for-all-models-part-2-3"
This reverts commit c6d642b55558203a6eddd79efbc232bb34ec8e52, reversing
changes made to 59ffc5091b8246674843deea81a11a917abf801e.
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java index 2c46f591037..e9b4d6ac1aa 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java @@ -24,12 +24,14 @@ import java.io.File; import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; /** * Represents an application residing in zookeeper. @@ -200,16 +202,17 @@ public class ZKApplicationPackage implements ApplicationPackage { return ret; } - //Returns readers for all the children of a node. - //The node is looked up relative to the location of the active application package - //in zookeeper. + /** + * Returns readers for all the children of a node. + * The node is looked up relative to the location of the active application package in zookeeper. + */ @Override - public List<NamedReader> getFiles(Path relativePath,String suffix,boolean recurse) { + public List<NamedReader> getFiles(Path relativePath, String suffix, boolean recurse) { return liveApp.getAllDataFromDirectory(ConfigCurator.USERAPP_ZK_SUBPATH + '/' + relativePath.getRelative(), suffix, recurse); } @Override - public ApplicationFile getFile(Path file) { // foo/bar/baz.json + public ApplicationFile getFile(Path file) { return new ZKApplicationFile(file, liveApp); } |