AsyncConsistentMap methods for supporting transactional updates
Change-Id: Iaeb0aa0abf9f52d514a2c040598599a5b8a55ee8
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
index 21d8edc..26aa9a8 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
@@ -27,10 +27,11 @@
import org.junit.Ignore;
import org.junit.Test;
import org.onlab.util.Tools;
+import org.onosproject.store.primitives.MapUpdate;
import org.onosproject.store.primitives.TransactionId;
-import org.onosproject.store.primitives.impl.Transaction;
import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener;
+import org.onosproject.store.service.MapTransaction;
import org.onosproject.store.service.Versioned;
import com.google.common.collect.Sets;
@@ -353,10 +354,10 @@
.withValue(value1)
.build();
- Transaction tx = new Transaction(TransactionId.from("tx1"), Arrays.asList(update1));
+ MapTransaction<String, byte[]> tx = new MapTransaction<>(TransactionId.from("tx1"), Arrays.asList(update1));
map.prepare(tx).thenAccept(result -> {
- assertEquals(PrepareResult.OK, result);
+ assertEquals(true, result);
}).join();
assertNull(listener.event());
@@ -377,7 +378,7 @@
assertNull(listener.event());
- map.commit(tx.id()).join();
+ map.commit(tx.transactionId()).join();
assertNotNull(listener.event());
assertEquals(MapEvent.Type.INSERT, listener.event().type());
assertTrue(Arrays.equals(value1, listener.event().newValue().value()));
@@ -407,13 +408,13 @@
.withKey("foo")
.withValue(value1)
.build();
- Transaction tx = new Transaction(TransactionId.from("tx1"), Arrays.asList(update1));
+ MapTransaction<String, byte[]> tx = new MapTransaction<>(TransactionId.from("tx1"), Arrays.asList(update1));
map.prepare(tx).thenAccept(result -> {
- assertEquals(PrepareResult.OK, result);
+ assertEquals(true, result);
}).join();
assertNull(listener.event());
- map.rollback(tx.id()).join();
+ map.rollback(tx.transactionId()).join();
assertNull(listener.event());
map.get("foo").thenAccept(result -> {
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/MapUpdateTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/MapUpdateTest.java
deleted file mode 100644
index 6a0db93..0000000
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/MapUpdateTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.store.primitives.resources.impl;
-
-import com.google.common.testing.EqualsTester;
-import org.junit.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Unit Tests for MapUpdate class.
- */
-
-public class MapUpdateTest {
-
- private final MapUpdate<String, byte[]> stats1 = MapUpdate.<String, byte[]>newBuilder()
- .withCurrentValue("1".getBytes())
- .withValue("2".getBytes())
- .withCurrentVersion(3)
- .withKey("4")
- .withMapName("5")
- .withType(MapUpdate.Type.PUT)
- .build();
-
- private final MapUpdate<String, byte[]> stats2 = MapUpdate.<String, byte[]>newBuilder()
- .withCurrentValue("1".getBytes())
- .withValue("2".getBytes())
- .withCurrentVersion(3)
- .withKey("4")
- .withMapName("5")
- .withType(MapUpdate.Type.REMOVE)
- .build();
-
- private final MapUpdate<String, byte[]> stats3 = MapUpdate.<String, byte[]>newBuilder()
- .withCurrentValue("1".getBytes())
- .withValue("2".getBytes())
- .withCurrentVersion(3)
- .withKey("4")
- .withMapName("5")
- .withType(MapUpdate.Type.REMOVE_IF_VALUE_MATCH)
- .build();
-
- private final MapUpdate<String, byte[]> stats4 = MapUpdate.<String, byte[]>newBuilder()
- .withCurrentValue("1".getBytes())
- .withValue("2".getBytes())
- .withCurrentVersion(3)
- .withKey("4")
- .withMapName("5")
- .withType(MapUpdate.Type.REMOVE_IF_VERSION_MATCH)
- .build();
-
- private final MapUpdate<String, byte[]> stats5 = MapUpdate.<String, byte[]>newBuilder()
- .withCurrentValue("1".getBytes())
- .withValue("2".getBytes())
- .withCurrentVersion(3)
- .withKey("4")
- .withMapName("5")
- .withType(MapUpdate.Type.PUT_IF_VALUE_MATCH)
- .build();
-
- private final MapUpdate<String, byte[]> stats6 = MapUpdate.<String, byte[]>newBuilder()
- .withCurrentValue("1".getBytes())
- .withValue("2".getBytes())
- .withCurrentVersion(3)
- .withKey("4")
- .withMapName("5")
- .withType(MapUpdate.Type.PUT_IF_VERSION_MATCH)
- .build();
-
- /**
- * Tests the constructor for the class.
- */
- @Test
- public void testConstruction() {
- assertThat(stats1.currentValue(), is("1".getBytes()));
- assertThat(stats1.value(), is("2".getBytes()));
- assertThat(stats1.currentVersion(), is(3L));
- assertThat(stats1.key(), is("4"));
- assertThat(stats1.mapName(), is("5"));
- assertThat(stats1.type(), is(MapUpdate.Type.PUT));
- }
-
- /**
- * Tests the equals, hashCode and toString methods using Guava EqualsTester.
- */
- @Test
- public void testEquals() {
- new EqualsTester()
- .addEqualityGroup(stats1, stats1)
- .addEqualityGroup(stats2)
- .testEquals();
-
- new EqualsTester()
- .addEqualityGroup(stats3, stats3)
- .addEqualityGroup(stats4)
- .testEquals();
-
- new EqualsTester()
- .addEqualityGroup(stats5, stats5)
- .addEqualityGroup(stats6)
- .testEquals();
- }
-
- /**
- * Tests if the toString method returns a consistent value for hashing.
- */
- @Test
- public void testToString() {
- assertThat(stats1.toString(), is(stats1.toString()));
- }
-
-}