Cleanup

4 files changed, 9 insertions, 10 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java
index 30d22fa68bc..218fd682bf9 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java
@@ -28,10 +28,9 @@ class CuratorCreateOperation implements CuratorOperation {
         int lastSlash = path.lastIndexOf("/");
         if (lastSlash < 0) return; // root; ok
         String parent = path.substring(0, lastSlash);
-        if ( ! parent.isEmpty() && ! curator.exists(Path.fromString(parent)) && ! changes.creates(parent)) {
+        if ( ! parent.isEmpty() && ! curator.exists(Path.fromString(parent)) && ! changes.create(parent))
             throw new IllegalStateException("Cannot perform " + this + ": Parent '" + parent + "' does not exist");
-        }
-        changes.addCreates(path);
+        changes.addCreate(path);
     }
 
     @Override
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
index 74f62e12b00..e49a4cca9d2 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
@@ -19,11 +19,11 @@ class CuratorDeleteOperation implements CuratorOperation {
 
     @Override
     public void check(Curator curator, TransactionChanges changes) {
-        if (  ! curator.exists(Path.fromString(path)) && ! changes.creates(path))
+        if (  ! curator.exists(Path.fromString(path)) && ! changes.create(path))
             throw new IllegalStateException("Cannot perform " + this + ": Path does not exist");
         if (curator.getChildren(Path.fromString(path)).size() > 0 || changes.createsChildrenOf(path))
             throw new IllegalStateException("Cannot perform " + this + ": Path is not empty");
-        changes.addDeletes(path);
+        changes.addDelete(path);
     }
 
     @Override
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java
index daf284cbdc6..46b02d3b51a 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java
@@ -23,7 +23,7 @@ class CuratorSetDataOperation implements CuratorOperation {
 
     @Override
     public void check(Curator curator, TransactionChanges changes) {
-        if ( ! curator.exists(Path.fromString(path)) && ! changes.creates(path) )
+        if ( ! curator.exists(Path.fromString(path)) && ! changes.create(path) )
             throw new IllegalStateException("Cannot perform " + this + ": Path does not exist");
     }
 
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java
index f65e0de4733..dd26ab8adc2 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/TransactionChanges.java
@@ -17,7 +17,7 @@ public class TransactionChanges {
     private final Set<String> deletedPaths = new HashSet<>();
     
     /** Returns whether the changes include creating this absolute path */
-    public boolean creates(String path) {
+    public boolean create(String path) {
         return createdPaths.contains(path);
     }
 
@@ -32,18 +32,18 @@ public class TransactionChanges {
     }
 
     /** Adds creation of an absolute path to the set of changes made by this */
-    public void addCreates(String path) {
+    public void addCreate(String path) {
         deletedPaths.remove(path);
         createdPaths.add(path);
     }
 
     /** Returns whether the changes include deleting this absolute path */
-    public boolean deletes(String path) {
+    public boolean delete(String path) {
         return deletedPaths.contains(path);
     }
 
     /** Adds deletion of an absolute path to the set of changes made by this */
-    public void addDeletes(String path) {
+    public void addDelete(String path) {
         createdPaths.remove(path);
         deletedPaths.add(path);
     }