Distributed group store using eventual consistent map abstraction

Change-Id: I618a0f6fa80e0e25285d7a2026032f09ba90aa70
diff --git a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/GroupBucketIdentifier.java b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/GroupBucketIdentifier.java
index cf0ae5e..3a46ce6 100644
--- a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/GroupBucketIdentifier.java
+++ b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/GroupBucketIdentifier.java
@@ -18,7 +18,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.onosproject.net.PortNumber;
-import org.onosproject.net.group.GroupKey;
 
 /**
  * Representation of policy group bucket identifier. Not exposed to
@@ -28,7 +27,7 @@
     private int label;
     private BucketOutputType type;
     private PortNumber outPort;
-    private GroupKey outGroup;
+    private PolicyGroupIdentifier outGroup;
 
     protected enum BucketOutputType {
         PORT,
@@ -44,7 +43,7 @@
     }
 
     protected GroupBucketIdentifier(int label,
-                                    GroupKey outGroup) {
+                                    PolicyGroupIdentifier outGroup) {
         this.label = label;
         this.type = BucketOutputType.GROUP;
         this.outPort = null;
@@ -63,7 +62,7 @@
         return this.outPort;
     }
 
-    protected GroupKey outGroup() {
+    protected PolicyGroupIdentifier outGroup() {
         return this.outGroup;
     }
 }