From 2b98869db4f2c97a36094553d012068654958e5b Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Fri, 17 Aug 2018 12:34:47 +0200
Subject: Avoid ApplicationPackage.getFiles

---
 .../vespa/config/server/zookeeper/ZKApplicationPackage.java | 13 ++++++++-----
 .../com/yahoo/vespa/config/server/zookeeper/ZKLiveApp.java  | 12 ++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'configserver')

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);
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKLiveApp.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKLiveApp.java
index d7d43dea022..956af02e36f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKLiveApp.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKLiveApp.java
@@ -69,7 +69,8 @@ public class ZKLiveApp {
                         log.finer("ZKApplicationPackage: Skipped '" + child + "' (did not match suffix " + fileNameSuffix + ")");
                 }
                 if (recursive)
-                    result.addAll(getAllDataFromDirectory(path + "/" + child, namePrefix + child + "/", fileNameSuffix, recursive));
+                    result.addAll(getAllDataFromDirectory(path + "/" + child,
+                                                          namePrefix + child + "/", fileNameSuffix, recursive));
             }
             if (log.isLoggable(Level.FINE))
                 log.fine("ZKApplicationPackage: Found '" + result.size() + "' files in " + fullPath);
@@ -80,14 +81,15 @@ public class ZKLiveApp {
     }
 
     /**
-     * Retrieves a node relative to the node of the live application, e.g. /vespa/config/apps/$lt;app_id&gt;/&lt;path&gt;/&lt;node&gt;
+     * Retrieves a node relative to the node of the live application,
+     * e.g. /vespa/config/apps/$lt;app_id&gt;/&lt;path&gt;/&lt;node&gt;
      *
      * @param path a path relative to the currently active application
      * @param node a path relative to the path above
      * @return a Reader that can be used to get the data
      */
     public Reader getDataReader(String path, String node) {
-        final String data = getData(path, node);
+        String data = getData(path, node);
         if (data == null) {
             throw new IllegalArgumentException("No node for " + getFullPath(path) + "/" + node + " exists");
         }
@@ -98,7 +100,8 @@ public class ZKLiveApp {
         try {
             return zk.getData(getFullPath(path), node);
         } catch (Exception e) {
-            throw new IllegalArgumentException("Could not retrieve node '" + getFullPath(path) + "/" + node + "' in zookeeper", e);
+            throw new IllegalArgumentException("Could not retrieve node '" +
+                                               getFullPath(path) + "/" + node + "' in zookeeper", e);
         }
     }
 
@@ -205,5 +208,6 @@ public class ZKLiveApp {
         }
         return reader(data);
     }
+
 }
 
-- 
cgit v1.2.3