commit 3ff504c8e8ceae4ae52828e23d3542847e4d668c
author Prince Pereira <prpereir@partner.ciena.com> Tue Aug 30 14:23:43 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Sep 29 16:22:13 2016 +0000
tree 5cc8f1991e9100c256bc8b712089f968f775c21a
parent 46c82d4d794c3b66c1b0e27db19b5da10284d36f

Fix for ONOS-5175. GroupId refactoring.

Change-Id: I951392bdc69fe1ef694d321164b0b49032617d6b

core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java
index 1fa9618..0292008 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java
@@ -23,7 +23,6 @@
 import org.onosproject.codec.JsonCodec;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.group.DefaultGroup;
@@ -72,7 +71,7 @@
     public ObjectNode encode(Group group, CodecContext context) {
         checkNotNull(group, "Group cannot be null");
         ObjectNode result = context.mapper().createObjectNode()
-                .put(ID, group.id().toString())
+                .put(ID, group.id().id().toString())
                 .put(STATE, group.state().toString())
                 .put(LIFE, group.life())
                 .put(PACKETS, group.packets())
@@ -90,7 +89,7 @@
         }
 
         if (group.givenGroupId() != null) {
-            result.put(GIVEN_GROUP_ID, group.givenGroupId());
+            result.put(GIVEN_GROUP_ID, group.givenGroupId().toString());
         }
 
         ArrayNode buckets = context.mapper().createArrayNode();
@@ -114,7 +113,7 @@
         // parse group id
         int groupIdInt = nullIsIllegal(json.get(GROUP_ID),
                 GROUP_ID + MISSING_MEMBER_MESSAGE).asInt();
-        GroupId groupId = new DefaultGroupId(groupIdInt);
+        GroupId groupId = new GroupId(groupIdInt);
 
         // parse group key (appCookie)
         String groupKeyStr = nullIsIllegal(json.get(APP_COOKIE),

core/common/src/test/java/org/onosproject/codec/impl/GroupJsonMatcher.java

diff --git a/core/common/src/test/java/org/onosproject/codec/impl/GroupJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/GroupJsonMatcher.java
index 445d0c2..f1c9068 100644
--- a/core/common/src/test/java/org/onosproject/codec/impl/GroupJsonMatcher.java
+++ b/core/common/src/test/java/org/onosproject/codec/impl/GroupJsonMatcher.java
@@ -38,7 +38,7 @@
     public boolean matchesSafely(JsonNode jsonGroup, Description description) {
         // check id
         String jsonGroupId = jsonGroup.get("id").asText();
-        String groupId = group.id().toString();
+        String groupId = group.id().id().toString();
         if (!jsonGroupId.equals(groupId)) {
             description.appendText("group id was " + jsonGroupId);
             return false;