Revert "Renamed *MastershipStore* to *DeviceMastershipStore*"
This reverts commit da147db72e9f6b8dff55ae50e298648a00033a76.
diff --git a/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStore.java b/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java
similarity index 99%
rename from core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStore.java
rename to core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java
index cdcf84b..97e6c1e 100644
--- a/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStore.java
+++ b/core/store/hz/cluster/src/main/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStore.java
@@ -32,7 +32,7 @@
*/
@Component(immediate = true)
@Service
-public class DistributedDeviceMastershipStore
+public class DistributedMastershipStore
extends AbstractHazelcastStore<DeviceMastershipEvent, DeviceMastershipStoreDelegate>
implements DeviceMastershipStore {
diff --git a/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStoreTest.java b/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java
similarity index 95%
rename from core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStoreTest.java
rename to core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java
index d993250..85ee01a 100644
--- a/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedDeviceMastershipStoreTest.java
+++ b/core/store/hz/cluster/src/test/java/org/onlab/onos/store/cluster/impl/DistributedMastershipStoreTest.java
@@ -40,7 +40,7 @@
/**
* Test of the Hazelcast-based distributed MastershipStore implementation.
*/
-public class DistributedDeviceMastershipStoreTest {
+public class DistributedMastershipStoreTest {
private static final DeviceId DID1 = DeviceId.deviceId("of:01");
private static final DeviceId DID2 = DeviceId.deviceId("of:02");
@@ -54,8 +54,8 @@
private static final ControllerNode CN1 = new DefaultControllerNode(N1, IP);
private static final ControllerNode CN2 = new DefaultControllerNode(N2, IP);
- private DistributedDeviceMastershipStore dms;
- private TestDistributedDeviceMastershipStore testStore;
+ private DistributedMastershipStore dms;
+ private TestDistributedMastershipStore testStore;
private KryoSerializer serializationMgr;
private StoreManager storeMgr;
@@ -77,11 +77,11 @@
serializationMgr = new KryoSerializer();
- dms = new TestDistributedDeviceMastershipStore(storeMgr, serializationMgr);
+ dms = new TestDistributedMastershipStore(storeMgr, serializationMgr);
dms.clusterService = new TestClusterService();
dms.activate();
- testStore = (TestDistributedDeviceMastershipStore) dms;
+ testStore = (TestDistributedMastershipStore) dms;
}
@After
@@ -227,9 +227,9 @@
assertTrue("Add event fired", addLatch.await(1, TimeUnit.SECONDS));
}
- private class TestDistributedDeviceMastershipStore extends
- DistributedDeviceMastershipStore {
- public TestDistributedDeviceMastershipStore(StoreService storeService,
+ private class TestDistributedMastershipStore extends
+ DistributedMastershipStore {
+ public TestDistributedMastershipStore(StoreService storeService,
KryoSerializer kryoSerialization) {
this.storeService = storeService;
this.serializer = kryoSerialization;