Distributed group store using eventual consistent map abstraction

Change-Id: I618a0f6fa80e0e25285d7a2026032f09ba90aa70
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/NextHop.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/NextHop.java
index cc045bc..88ce1a3 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/NextHop.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/NextHop.java
@@ -15,12 +15,12 @@
  */
 package org.onosproject.bgprouter;
 
-import com.google.common.base.MoreObjects;
+import java.util.Objects;
+
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
-import org.onosproject.net.group.GroupKey;
 
-import java.util.Objects;
+import com.google.common.base.MoreObjects;
 
 /**
  * Represents a next hop for routing, whose MAC address has already been resolved.
@@ -29,7 +29,7 @@
 
     private final IpAddress ip;
     private final MacAddress mac;
-    private final GroupKey group;
+    private final NextHopGroupKey group;
 
     /**
      * Creates a new next hop.
@@ -38,7 +38,7 @@
      * @param mac next hop's MAC address
      * @param group next hop's group
      */
-    public NextHop(IpAddress ip, MacAddress mac, GroupKey group) {
+    public NextHop(IpAddress ip, MacAddress mac, NextHopGroupKey group) {
         this.ip = ip;
         this.mac = mac;
         this.group = group;
@@ -67,7 +67,7 @@
      *
      * @return group
      */
-    public GroupKey group() {
+    public NextHopGroupKey group() {
         return group;
     }