Bug-6468: Duplicate cleanup and connected-peer-counter decrement during BGP session...

[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / RIBSupportContextRegistryImpl.java

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
index 340a1b21d6aed5aed042dc2068f9370d2ed71fef..e0abb2991c069aefc0bb1764fbcc88fe727d3ce0 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
@@ -11,68 +11,55 @@ import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import org.opendaylight.protocol.bgp.rib.impl.spi.CodecsRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext;
 import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
 import org.opendaylight.protocol.bgp.rib.spi.RIBSupport;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
-import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTree;
-import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeFactory;
-import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy;
-import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 
-class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
+final class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
 
     private final LoadingCache<RIBSupport, RIBSupportContextImpl> contexts = CacheBuilder.newBuilder()
             .build(new CacheLoader<RIBSupport, RIBSupportContextImpl>(){
-
                 @Override
-                public RIBSupportContextImpl load(RIBSupport key) {
-                    return createContext(key);
-                };
+                public RIBSupportContextImpl load(final RIBSupport key) {
+                    return createRIBSupportContext(key);
+                }
             });
 
     private final RIBExtensionConsumerContext extensionContext;
-    private final BindingCodecTreeFactory codecFactory;
-    private final GeneratedClassLoadingStrategy classContext;
-    private volatile BindingCodecTree latestCodecTree;
+    private final CodecsRegistry codecs;
 
-    private RIBSupportContextRegistryImpl(RIBExtensionConsumerContext extensions, BindingCodecTreeFactory codecFactory,
-            GeneratedClassLoadingStrategy strategy) {
+    private RIBSupportContextRegistryImpl(final RIBExtensionConsumerContext extensions, final CodecsRegistry codecs) {
         this.extensionContext = Preconditions.checkNotNull(extensions);
-        this.codecFactory = Preconditions.checkNotNull(codecFactory);
-        this.classContext = Preconditions.checkNotNull(strategy);
+        this.codecs = Preconditions.checkNotNull(codecs);
+    }
+
+    static RIBSupportContextRegistryImpl create(final RIBExtensionConsumerContext extensions, final CodecsRegistry codecs) {
+        return new RIBSupportContextRegistryImpl(extensions, codecs);
     }
 
-    static RIBSupportContextRegistryImpl create(RIBExtensionConsumerContext extensions,
-            BindingCodecTreeFactory codecFactory, GeneratedClassLoadingStrategy classStrategy) {
-        return new RIBSupportContextRegistryImpl(extensions, codecFactory, classStrategy);
+    private RIBSupportContextImpl createRIBSupportContext(final RIBSupport support) {
+        return new RIBSupportContextImpl(support, this.codecs);
     }
 
     @Override
-    public RIBSupportContext getRIBSupportContext(TablesKey key) {
-        RIBSupport ribSupport = extensionContext.getRIBSupport(key);
+    public RIBSupportContext getRIBSupportContext(final TablesKey key) {
+        final RIBSupport ribSupport = this.extensionContext.getRIBSupport(key);
         if(ribSupport != null) {
-            return contexts.getUnchecked(ribSupport);
+            return this.contexts.getUnchecked(ribSupport);
         }
         return null;
     }
 
-    private RIBSupportContextImpl createContext(RIBSupport ribSupport) {
-        RIBSupportContextImpl ribContext = new RIBSupportContextImpl(ribSupport);
-        if(latestCodecTree != null) {
-            ribContext.onCodecTreeUpdated(latestCodecTree);
-        }
-        return ribContext;
-    }
-
-    void onSchemaContextUpdated(SchemaContext context) {
-        BindingRuntimeContext runtimeContext = BindingRuntimeContext.create(classContext, context);
-        latestCodecTree  = codecFactory.create(runtimeContext);
-        for(RIBSupportContextImpl rib : contexts.asMap().values()) {
-            rib.onCodecTreeUpdated(latestCodecTree);
+    @Override
+    public RIBSupportContext getRIBSupportContext(final NodeIdentifierWithPredicates key) {
+        final RIBSupport ribSupport = this.extensionContext.getRIBSupport(key);
+        if(ribSupport != null) {
+            return this.contexts.getUnchecked(ribSupport);
         }
+        return null;
     }
-
 }