Merge pull request #25389 from vespa-engine/mpolden/improve-naming

Rename database classes

2 files changed, 10 insertions, 10 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CachingCuratorTest.java
index 40fb741fde8..01d1ab5c8d0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CachingCuratorTest.java
@@ -26,12 +26,12 @@ import static org.junit.Assert.fail;
  *
  * @author bratseth
  */
-public class CuratorDatabaseTest {
+public class CachingCuratorTest {
 
     @Test
     public void testTransactionsIncreaseCounter() throws Exception {
         MockCurator curator = new MockCurator();
-        CuratorDatabase database = new CuratorDatabase(curator, Path.fromString("/"), true);
+        CachingCurator database = new CachingCurator(curator, Path.fromString("/"), true);
 
         assertEquals(0L, (long)curator.counter("/changeCounter").get().get().postValue());
 
@@ -56,7 +56,7 @@ public class CuratorDatabaseTest {
     @Test
     public void testCacheInvalidation() throws Exception {
         MockCurator curator = new MockCurator();
-        CuratorDatabase database = new CuratorDatabase(curator, Path.fromString("/"), true);
+        CachingCurator database = new CachingCurator(curator, Path.fromString("/"), true);
 
         assertEquals(0L, (long)curator.counter("/changeCounter").get().get().postValue());
         commitCreate("/1", database);
@@ -74,7 +74,7 @@ public class CuratorDatabaseTest {
     @Test
     public void testTransactionsWithDeactivatedCache() throws Exception {
         MockCurator curator = new MockCurator();
-        CuratorDatabase database = new CuratorDatabase(curator, Path.fromString("/"), false);
+        CachingCurator database = new CachingCurator(curator, Path.fromString("/"), false);
 
         assertEquals(0L, (long)curator.counter("/changeCounter").get().get().postValue());
 
@@ -93,7 +93,7 @@ public class CuratorDatabaseTest {
     @Test
     public void testThatCounterIncreasesExactlyOnCommitFailure() throws Exception {
         MockCurator curator = new MockCurator();
-        CuratorDatabase database = new CuratorDatabase(curator, Path.fromString("/"), true);
+        CachingCurator database = new CachingCurator(curator, Path.fromString("/"), true);
 
         assertEquals(0L, (long)curator.counter("/changeCounter").get().get().postValue());
 
@@ -116,14 +116,14 @@ public class CuratorDatabaseTest {
         assertEquals(3L, (long)curator.counter("/changeCounter").get().get().postValue());
     }
 
-    private void commitCreate(String path, CuratorDatabase database) {
+    private void commitCreate(String path, CachingCurator database) {
         NestedTransaction t = new NestedTransaction();
         CuratorTransaction c = database.newCuratorTransactionIn(t);
         c.add(CuratorOperations.create(path));
         t.commit();
     }
 
-    private void commitReadingWrite(String path, byte[] data, CuratorDatabase database) {
+    private void commitReadingWrite(String path, byte[] data, CachingCurator database) {
         NestedTransaction transaction = new NestedTransaction();
         byte[] oldData = database.getData(Path.fromString(path)).get();
         CuratorTransaction curatorTransaction = database.newCuratorTransactionIn(transaction);
@@ -134,7 +134,7 @@ public class CuratorDatabaseTest {
     }
 
     /** Commit an operation which fails during commit. */
-    private void commitFailing(CuratorDatabase database) {
+    private void commitFailing(CachingCurator database) {
         NestedTransaction t = new NestedTransaction();
         CuratorTransaction c = database.newCuratorTransactionIn(t);
         c.add(new DummyOperation(() -> { throw new RuntimeException(); }));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDbTest.java
index f11cfa9a15d..42a0dd982ad 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClientTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDbTest.java
@@ -20,10 +20,10 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author mpolden
  */
-public class CuratorDatabaseClientTest {
+public class CuratorDbTest {
 
     private final Curator curator = new MockCurator();
-    private final CuratorDatabaseClient zkClient = new CuratorDatabaseClient(
+    private final CuratorDb zkClient = new CuratorDb(
             FlavorConfigBuilder.createDummies("default"), curator, Clock.systemUTC(), true, 1000);
 
     @Test