Merge pull request #18149 from vespa-engine/hmusum/cleanup-13

Hmusum/cleanup 13

4 files changed, 9 insertions, 13 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 42f4dbd5762..f0a63757477 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
@@ -35,7 +35,7 @@ import static com.yahoo.vespa.config.server.zookeeper.ConfigCurator.USERAPP_ZK_S
 import static com.yahoo.vespa.config.server.zookeeper.ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH;
 
 /**
- * A class used for reading and writing application data to zookeeper.
+ * Reads and writes application package to and from ZooKeeper.
  *
  * @author hmusum
  */
@@ -76,13 +76,13 @@ public class ZooKeeperClient {
      *
      * @param app the application package to feed to zookeeper
      */
-    void write(ApplicationPackage app) {
+    void writeApplicationPackage(ApplicationPackage app) {
         try {
             writeUserDefs(app);
             writeSomeOf(app);
             writeSchemas(app);
             writeUserIncludeDirs(app, app.getUserIncludeDirs());
-            write(app.getMetaData());
+            writeMetadata(app.getMetaData());
         } catch (Exception e) {
             throw new IllegalStateException("Unable to write vespa model to config server(s) " + System.getProperty("configsources") + "\n" +
                                             "Please ensure that config server is started " +
@@ -153,7 +153,6 @@ public class ZooKeeperClient {
         for (ApplicationFile file : listFiles(dir, filenameFilter)) {
             String name = file.getPath().getName();
             if (name.startsWith(".")) continue; //.svn , .git ...
-            if ("CVS".equals(name)) continue;
             if (file.isDirectory()) {
                 configCurator.createNode(path.append(name).getAbsolute());
                 if (recurse) {
@@ -198,7 +197,6 @@ public class ZooKeeperClient {
     }
 
     private void writeUserIncludeDirs(ApplicationPackage applicationPackage, List<String> userIncludeDirs) throws IOException {
-        // User defined include directories
         for (String userInclude : userIncludeDirs) {
             ApplicationFile dir = applicationPackage.getFile(Path.fromString(userInclude));
             final List<ApplicationFile> files = dir.listFiles();
@@ -238,12 +236,12 @@ public class ZooKeeperClient {
     }
 
     /**
-     * Feeds application metadata to zookeeper. Used by vespamodel to create config
-     * for application metadata (used by ApplicationStatusHandler)
+     * Feeds application metadata to zookeeper. Used by config model to create config
+     * for application metadata
      *
      * @param metaData The application metadata.
      */
-    private void write(ApplicationMetaData metaData) {
+    private void writeMetadata(ApplicationMetaData metaData) {
         configCurator.putData(getZooKeeperAppPath(META_ZK_PATH).getAbsolute(), metaData.asJsonBytes());
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java
index 12aa5b7cc35..8c7d6ea28dd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperDeployer.java
@@ -33,7 +33,7 @@ public class ZooKeeperDeployer {
     public void deploy(ApplicationPackage applicationPackage, Map<Version, FileRegistry> fileRegistryMap, 
                        AllocatedHosts allocatedHosts) throws IOException {
         zooKeeperClient.initialize();
-        zooKeeperClient.write(applicationPackage);
+        zooKeeperClient.writeApplicationPackage(applicationPackage);
         zooKeeperClient.write(fileRegistryMap);
         zooKeeperClient.write(allocatedHosts);
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 7d14b1996b0..e20363af4e9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -64,7 +64,7 @@ public class ZooKeeperClientTest {
         Map<Version, FileRegistry> fileRegistries = createFileRegistries();
         app.writeMetaData();
         zkc.initialize();
-        zkc.write(app);
+        zkc.writeApplicationPackage(app);
         zkc.write(fileRegistries);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
index a71f75f5035..458cdb82066 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
@@ -124,8 +124,7 @@ public class ZKApplicationPackageTest {
     }
 
     /**
-     * Takes for instance the dir /app  and puts the contents into the given ZK path. Ignores files starting with dot,
-     * and dirs called CVS.
+     * Takes for instance the dir /app  and puts the contents into the given ZK path. Ignores files starting with dot.
      *
      * @param dir            directory which holds the summary class part files
      * @param path           zookeeper path
@@ -142,7 +141,6 @@ public class ZKApplicationPackageTest {
             }
             for (File file : listFiles(dir, filenameFilter)) {
                 if (file.getName().startsWith(".")) continue; //.svn , .git ...
-                if ("CVS".equals(file.getName())) continue;
                 if (file.isFile()) {
                     String contents = IOUtils.readFile(file);
                     zk.putData(path, file.getName(), contents);