Remove GLOBAL strict bgp registry

Change-Id: Id11ef8a8bcb31949f90734d43fae0a19da81b4b2
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
index d8c42ae413d534e01cd2b20b55a34b5cc9052718..63c188665f778d781b57bab4dc07f106b3034b97 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
@@ -63,9 +63,6 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
 
     private static final Logger LOG = LoggerFactory.getLogger(StrictBGPPeerRegistry.class);
 
-    // TODO remove backwards compatibility
-    public static final StrictBGPPeerRegistry GLOBAL = new StrictBGPPeerRegistry();
-
     @GuardedBy("this")
     private final Map<IpAddress, BGPSessionListener> peers = Maps.newHashMap();
     @GuardedBy("this")
@@ -78,7 +75,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     private final Set<PeerRegistrySessionListener> sessionListeners = new HashSet<>();
 
     public static BGPPeerRegistry instance() {
-        return GLOBAL;
+        return new StrictBGPPeerRegistry();
     }
 
     @Override