Clean up unused SharedRefDatabase methods
Remove unused compareAndRemove and compareAndCreate interface methods
defined by SharedRefDatabase.
Change-Id: I9225fb924f3cde738c65b2fe880bee7192d441f8
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/SharedRefDatabaseWrapper.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/SharedRefDatabaseWrapper.java
index f59261e..f21f185 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/SharedRefDatabaseWrapper.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/SharedRefDatabaseWrapper.java
@@ -49,11 +49,6 @@
}
@Override
- public boolean compareAndRemove(String project, Ref oldRef) throws IOException {
- return sharedRefDb.compareAndRemove(project, oldRef);
- }
-
- @Override
public AutoCloseable lockRef(String project, String refName) throws SharedLockException {
return sharedRefDb.lockRef(project, refName);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/SharedRefDatabase.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/SharedRefDatabase.java
index cfbd783..a93efcf 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/SharedRefDatabase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/SharedRefDatabase.java
@@ -86,18 +86,6 @@
}
/**
- * Utility method for new refs.
- *
- * @param project project name of the ref
- * @param newRef new reference to store.
- * @return true if the operation was successful; false otherwise.
- * @throws IOException
- */
- default boolean compareAndCreate(String project, Ref newRef) throws IOException {
- return compareAndPut(project, nullRef(newRef.getName()), newRef.getObjectId());
- }
-
- /**
* Verify in shared db if Ref is the most recent
*
* @param project project name of the ref
@@ -129,16 +117,6 @@
boolean compareAndPut(String project, Ref currRef, ObjectId newRefValue) throws IOException;
/**
- * Compare a reference, and delete if it matches.
- *
- * @param project project name of the ref
- * @param oldRef the old reference information that was previously read.
- * @return true if the remove was successful; false otherwise.
- * @throws java.io.IOException the reference could not be removed due to a system error.
- */
- boolean compareAndRemove(String project, Ref oldRef) throws IOException;
-
- /**
* Lock a reference for writing.
*
* @param project project name
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
index efbf390..1179045 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
@@ -80,11 +80,6 @@
}
@Override
- public boolean compareAndRemove(String project, Ref oldRef) throws IOException {
- return compareAndPut(project, oldRef, ObjectId.zeroId());
- }
-
- @Override
public void removeProject(String project) throws IOException {
try {
client.delete().deletingChildrenIfNeeded().forPath("/" + project);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
index 8819b8b..e0415a6 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
@@ -67,16 +67,6 @@
}
@Test
- public void shouldCompareAndCreateSuccessfully() throws Exception {
- Ref ref = refOf(AN_OBJECT_ID_1);
-
- assertThat(zkSharedRefDatabase.compareAndCreate(A_TEST_PROJECT_NAME, ref)).isTrue();
-
- assertThat(zookeeperContainer.readRefValueFromZk(A_TEST_PROJECT_NAME, ref))
- .isEqualTo(ref.getObjectId());
- }
-
- @Test
public void shouldCompareAndPutSuccessfully() throws Exception {
Ref oldRef = refOf(AN_OBJECT_ID_1);
Ref newRef = refOf(AN_OBJECT_ID_2);
@@ -128,39 +118,6 @@
.isFalse();
}
- @Test
- public void shouldCompareAndRemoveSuccessfully() throws Exception {
- Ref oldRef = refOf(AN_OBJECT_ID_1);
- String projectName = A_TEST_PROJECT_NAME;
-
- zookeeperContainer.createRefInZk(projectName, oldRef);
-
- assertThat(zkSharedRefDatabase.compareAndRemove(projectName, oldRef)).isTrue();
- }
-
- @Test
- public void shouldReplaceTheRefWithATombstoneAfterCompareAndPutRemove() throws Exception {
- Ref oldRef = refOf(AN_OBJECT_ID_1);
-
- zookeeperContainer.createRefInZk(A_TEST_PROJECT_NAME, oldRef);
-
- assertThat(zkSharedRefDatabase.compareAndRemove(A_TEST_PROJECT_NAME, oldRef)).isTrue();
-
- assertThat(zookeeperContainer.readRefValueFromZk(A_TEST_PROJECT_NAME, oldRef))
- .isEqualTo(ObjectId.zeroId());
- }
-
- @Test
- public void shouldNotCompareAndPutSuccessfullyAfterACompareAndRemove() throws Exception {
- Ref oldRef = refOf(AN_OBJECT_ID_1);
- String projectName = A_TEST_PROJECT_NAME;
-
- zookeeperContainer.createRefInZk(projectName, oldRef);
-
- zkSharedRefDatabase.compareAndRemove(projectName, oldRef);
- assertThat(zkSharedRefDatabase.compareAndPut(projectName, oldRef, AN_OBJECT_ID_2)).isFalse();
- }
-
private Ref refOf(ObjectId objectId) {
return SharedRefDatabase.newRef(aBranchRef(), objectId);
}
