aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-17 12:34:47 +0200
committerJon Bratseth <bratseth@oath.com>2018-08-17 12:34:47 +0200
commit2b98869db4f2c97a36094553d012068654958e5b (patch)
tree5ca968be7467f3cc667b1719ec9834c71b76ee7e /configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
parentb79f66322dd188deafa835ee86ba6313d8643b6f (diff)
Avoid ApplicationPackage.getFiles
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.java13
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);
}