commit fa394defdccee043ab00ffe146cc967d4569344f
author Yi Tseng <a86487817@gmail.com> Wed Feb 01 11:26:40 2017 -0800
committer Ray Milkey <ray@onlab.us> Fri Mar 24 21:13:57 2017 +0000
tree 7af939ca5103ed1431206ae82a5badf99eaadd1d
parent eeb3dc10d357f43e81342822d4bfc7a0d50ab875

Fix for ONOS-5175. GroupId refactoring.

Science DefaultGroupId was deprecated, remove it from ONOS

Change-Id: I82394e58ec1ba10c37492ed77546e233de9f934f

web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
index 9c7318c..6b9a8ee 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/FlowsResourceTest.java
@@ -43,7 +43,6 @@
 import org.onosproject.codec.impl.CodecManager;
 import org.onosproject.codec.impl.FlowRuleCodec;
 import org.onosproject.core.CoreService;
-import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.net.DefaultDevice;
 import org.onosproject.net.Device;
@@ -184,7 +183,7 @@
 
         @Override
         public GroupId groupId() {
-            return new DefaultGroupId(3);
+            return new GroupId(3);
         }
 
         @Override

web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
index 0e494ef..731af65 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
@@ -35,7 +35,6 @@
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.DefaultApplicationId;
-import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.net.DefaultDevice;
 import org.onosproject.net.Device;
@@ -127,7 +126,7 @@
 
         @Override
         public GroupId id() {
-            return new DefaultGroupId((int) baseValue + 55);
+            return new GroupId((int) baseValue + 55);
         }
 
         @Override

web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
index da603cd..623db9c 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/IntentsResourceTest.java
@@ -34,7 +34,6 @@
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.DefaultApplicationId;
-import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.net.DeviceId;
@@ -211,7 +210,7 @@
 
         @Override
         public GroupId groupId() {
-            return new DefaultGroupId(3);
+            return new GroupId(3);
         }
 
         @Override
@@ -317,7 +316,7 @@
 
         @Override
         public GroupId groupId() {
-            return new DefaultGroupId(3);
+            return new GroupId(3);
         }
 
         @Override