diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-12-12 09:29:21 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-12-12 09:29:21 +0100 |
commit | 9c2ba9811c04220ccc879e1cf29f0eab07969f24 (patch) | |
tree | 467d53cdfcc4de3a6e575a255ce8bc51da26e2e9 | |
parent | 2a0588f520137e30acf91ab7e601bff638ac52a7 (diff) |
Miniscule cleanup
3 files changed, 7 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CountingCuratorTransaction.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CountingCuratorTransaction.java new file mode 100644 index 00000000000..3db2f9dc902 --- /dev/null +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CountingCuratorTransaction.java @@ -0,0 +1,5 @@ +package com.yahoo.vespa.hosted.provision.persistence; + +public class CoutingCuratorTransaction { + +} 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/CuratorDatabaseTest.java index bf82128dfb7..667dd2b0d73 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/CuratorDatabaseTest.java @@ -9,7 +9,6 @@ import com.yahoo.vespa.curator.transaction.CuratorTransaction; import org.junit.Test; import java.util.List; -import java.util.Optional; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -26,7 +25,7 @@ import static org.junit.Assert.fail; public class CuratorDatabaseTest { @Test - public void testTransactionsIncreaseTimer() throws Exception { + public void testTransactionsIncreaseCounter() throws Exception { MockCurator curator = new MockCurator(); CuratorDatabase database = new CuratorDatabase(curator, Path.fromString("/"), true); @@ -38,7 +37,6 @@ public class CuratorDatabaseTest { commitCreate("/2/1", database); assertEquals(4L, (long)curator.counter("/changeCounter").get().get().postValue()); - List<String> children1Call0 = database.getChildren(Path.fromString("/1")); // prime the db; this call returns a different instance List<String> children1Call1 = database.getChildren(Path.fromString("/1")); List<String> children1Call2 = database.getChildren(Path.fromString("/1")); assertTrue("We reuse cached data when there are no commits", children1Call1 == children1Call2); diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java index ab1d27ac325..92972c99194 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java @@ -68,7 +68,7 @@ public class CuratorTransaction extends AbstractTransaction { @Override public String toString() { - return String.join(",", operations().stream().map(operation -> operation.toString()).collect(Collectors.toList())); + return operations().stream().map(Object::toString).collect(Collectors.joining(",")); } } |