Use constant tensor files WIP

4 files changed, 11 insertions, 10 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index 69266620e45..e32b410fbab 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -100,7 +100,7 @@ public class ZooKeeperClient {
     }
 
     /**
-     * Feeds def files and user config into ZK.
+     * Writes def files and user config into ZK.
      *
      * @param app the application package to feed to zookeeper
      */
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
index 0d1aae97690..82535143c89 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
@@ -5,6 +5,7 @@ import com.yahoo.config.FileReference;
 import java.io.File;
 
 public class ApplicationFileManager implements AddFileInterface {
+
     private final File applicationDir;
     private final FileDirectory master;
 
@@ -22,4 +23,5 @@ public class ApplicationFileManager implements AddFileInterface {
     public FileReference addFile(String relativePath) {
         return master.addFile(new File(applicationDir, relativePath));
     }
+
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java
index cd3f0f7f167..6c2da338ef0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionProvider.java
@@ -21,6 +21,7 @@ public class FileDistributionProvider {
     private final FileDistribution fileDistribution;
 
     static private class ManagerWrapper implements AddFileInterface {
+
         private final FileDistributionManager manager;
         ManagerWrapper(FileDistributionManager manager) {
             this.manager = manager;
@@ -45,7 +46,7 @@ public class FileDistributionProvider {
                 zooKeepersSpec, applicationId, fileDistributionLock);
         this.fileDistribution = new CombinedLegacyDistribution(supervisor, new FileDBHandler(manager), disableFileDistributor);
         this.fileRegistry = new CombinedLegacyRegistry(new FileDBRegistry(new ManagerWrapper(manager)),
-                new FileDBRegistry(new ApplicationFileManager(applicationDir, new FileDirectory())));
+                                                       new FileDBRegistry(new ApplicationFileManager(applicationDir, new FileDirectory())));
 
     }
 
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 e4933dc84c4..6643e9b3370 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
@@ -61,9 +61,9 @@ public class ZKApplicationPackage implements ApplicationPackage {
         return Optional.of(readAllocatedHosts(allocatedHostsPath, nodeFlavors));
     }
 
-    /** 
+    /**
      * Reads allocated hosts at the given node.
-     * 
+     *
      * @return the allocated hosts at this node or empty if there is no data at this path
      */
     private AllocatedHosts readAllocatedHosts(String allocatedHostsPath, Optional<NodeFlavors> nodeFlavors) {
@@ -79,11 +79,9 @@ public class ZKApplicationPackage implements ApplicationPackage {
         if (fileRegistryNodes.isEmpty()) {
             fileRegistryMap.put(legacyVersion, importFileRegistry(fileRegistryNode));
         } else {
-            fileRegistryNodes.stream()
-                    .forEach(version -> {
+            fileRegistryNodes.forEach(version ->
                         fileRegistryMap.put(com.yahoo.config.provision.Version.fromString(version),
-                                            importFileRegistry(Joiner.on("/").join(fileRegistryNode, version)));
-                    });
+                                            importFileRegistry(Joiner.on("/").join(fileRegistryNode, version))));
         }
     }
 
@@ -155,7 +153,7 @@ public class ZKApplicationPackage implements ApplicationPackage {
     private Optional<PreGeneratedFileRegistry> getPreGeneratedFileRegistry(com.yahoo.config.provision.Version vespaVersion) {
         // Assumes at least one file registry, which we always have.
         Optional<PreGeneratedFileRegistry> fileRegistry = Optional.ofNullable(fileRegistryMap.get(vespaVersion));
-        if (!fileRegistry.isPresent()) {
+        if ( ! fileRegistry.isPresent()) {
             fileRegistry = Optional.of(fileRegistryMap.values().iterator().next());
         }
         return fileRegistry;
@@ -243,7 +241,7 @@ public class ZKApplicationPackage implements ApplicationPackage {
         List<ComponentInfo> components = new ArrayList<>();
         PreGeneratedFileRegistry fileRegistry = getPreGeneratedFileRegistry(vespaVersion).get();
         for (String path : fileRegistry.getPaths()) {
-            if (path.startsWith(FilesApplicationPackage.COMPONENT_DIR + File.separator) && path.endsWith(".jar")) {
+            if (path.startsWith(ApplicationPackage.COMPONENT_DIR + File.separator) && path.endsWith(".jar")) {
                 ComponentInfo component = new ComponentInfo(path);
                 components.add(component);
             }