Fix for ONOS-5175. GroupId refactoring.
Science DefaultGroupId was deprecated, remove it from ONOS
Change-Id: I82394e58ec1ba10c37492ed77546e233de9f934f
diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index 5fea69a..61c70ba 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -31,7 +31,6 @@
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.NodeId;
-import org.onosproject.core.DefaultGroupId;
import org.onosproject.core.GroupId;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.DeviceId;
@@ -113,7 +112,7 @@
private static final int GC_THRESH = 6;
private final int dummyId = 0xffffffff;
- private final GroupId dummyGroupId = new DefaultGroupId(dummyId);
+ private final GroupId dummyGroupId = new GroupId(dummyId);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ClusterCommunicationService clusterCommunicator;
@@ -387,12 +386,12 @@
int freeId = groupIdGen.incrementAndGet();
while (true) {
- Group existing = getGroup(deviceId, new DefaultGroupId(freeId));
+ Group existing = getGroup(deviceId, new GroupId(freeId));
if (existing == null) {
existing = (
extraneousGroupEntriesById.get(deviceId) != null) ?
extraneousGroupEntriesById.get(deviceId).
- get(new DefaultGroupId(freeId)) :
+ get(new GroupId(freeId)) :
null;
}
if (existing != null) {
@@ -468,7 +467,7 @@
if (extraneousMap == null) {
return null;
}
- return extraneousMap.get(new DefaultGroupId(groupId));
+ return extraneousMap.get(new GroupId(groupId));
}
private Group getMatchingExtraneousGroupbyBuckets(DeviceId deviceId,
@@ -599,12 +598,12 @@
GroupId id = null;
if (groupDesc.givenGroupId() == null) {
// Get a new group identifier
- id = new DefaultGroupId(getFreeGroupIdValue(groupDesc.deviceId()));
+ id = new GroupId(getFreeGroupIdValue(groupDesc.deviceId()));
} else {
// we need to use the identifier passed in by caller, but check if
// already used
Group existing = getGroup(groupDesc.deviceId(),
- new DefaultGroupId(groupDesc.givenGroupId()));
+ new GroupId(groupDesc.givenGroupId()));
if (existing != null) {
log.warn("Group already exists with the same id: 0x{} in dev:{} "
+ "but with different key: {} (request gkey: {})",
@@ -614,7 +613,7 @@
groupDesc.appCookie());
return;
}
- id = new DefaultGroupId(groupDesc.givenGroupId());
+ id = new GroupId(groupDesc.givenGroupId());
}
// Create a group entry object
StoredGroupEntry group = new DefaultGroup(id, groupDesc);
diff --git a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
index e9cebef..1e53cfb0 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
@@ -25,7 +25,6 @@
import org.onlab.junit.TestUtils;
import org.onosproject.cfg.ComponentConfigAdapter;
import org.onosproject.cluster.NodeId;
-import org.onosproject.core.DefaultGroupId;
import org.onosproject.core.GroupId;
import org.onosproject.mastership.MastershipServiceAdapter;
import org.onosproject.net.DeviceId;
@@ -72,9 +71,9 @@
DeviceId deviceId1 = did("dev1");
DeviceId deviceId2 = did("dev2");
- GroupId groupId1 = new DefaultGroupId(1);
- GroupId groupId2 = new DefaultGroupId(2);
- GroupId groupId3 = new DefaultGroupId(3);
+ GroupId groupId1 = new GroupId(1);
+ GroupId groupId2 = new GroupId(2);
+ GroupId groupId3 = new GroupId(3);
GroupKey groupKey1 = new DefaultGroupKey("abc".getBytes());
GroupKey groupKey2 = new DefaultGroupKey("def".getBytes());
GroupKey groupKey3 = new DefaultGroupKey("ghi".getBytes());
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index ec53007..dd3ef19 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -49,7 +49,7 @@
import org.onosproject.core.ApplicationRole;
import org.onosproject.core.DefaultApplication;
import org.onosproject.core.DefaultApplicationId;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.core.Version;
import org.onosproject.event.Change;
import org.onosproject.incubator.net.domain.IntentDomainId;
@@ -536,7 +536,7 @@
.register(MapEvent.Type.class)
.register(SetEvent.class)
.register(SetEvent.Type.class)
- .register(DefaultGroupId.class)
+ .register(GroupId.class)
.register(Annotations.class)
.register(OmsPort.class)
.register(OchPort.class)
diff --git a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index cd2b765..f68d0e0 100644
--- a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -30,7 +30,7 @@
import org.onosproject.cluster.NodeId;
import org.onosproject.cluster.RoleInfo;
import org.onosproject.core.DefaultApplicationId;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.mastership.MastershipTerm;
import org.onosproject.net.Annotations;
import org.onosproject.net.ChannelSpacing;
@@ -407,8 +407,8 @@
}
@Test
- public void testDefaultGroupId() {
- testSerializedEquals(new DefaultGroupId(99));
+ public void testGroupId() {
+ testSerializedEquals(new GroupId(99));
}
@Test