Fix BGP operational state

[bgpcep.git] / bgp / rib-spi / src / main / java / org / opendaylight / protocol / bgp / rib / spi / SimpleRIBExtensionProviderContext.java

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java
index bea86bce9433b307fb2a300a389745b79937c148..626325a2f9780374bf1d8a07104a70f734c13d3a 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java
@@ -7,42 +7,63 @@
  */
 package org.opendaylight.protocol.bgp.rib.spi;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
-import org.opendaylight.protocol.concepts.AbstractRegistration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.SubsequentAddressFamily;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
+import org.opendaylight.yangtools.yang.binding.ChoiceIn;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SimpleRIBExtensionProviderContext implements RIBExtensionProviderContext {
-    private final Map<TablesKey, AdjRIBsFactory> factories = new ConcurrentHashMap<>();
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleRIBExtensionProviderContext.class);
+
+    private final ConcurrentMap<TablesKey, RIBSupport<?, ?>> supports = new ConcurrentHashMap<>();
+    private final ConcurrentMap<NodeIdentifierWithPredicates, RIBSupport<?, ?>> domSupports = new ConcurrentHashMap<>();
 
     @Override
-    public final synchronized AbstractRegistration registerAdjRIBsInFactory(final Class<? extends AddressFamily> afi,
-            final Class<? extends SubsequentAddressFamily> safi, final AdjRIBsFactory factory) {
+    public <T extends RIBSupport<?, ?>> RIBSupportRegistration<T> registerRIBSupport(
+            final Class<? extends AddressFamily> afi, final Class<? extends SubsequentAddressFamily> safi,
+            final T support) {
         final TablesKey key = new TablesKey(afi, safi);
-
-        if (this.factories.containsKey(key)) {
-            throw new IllegalArgumentException("Specified AFI/SAFI combination is already registered");
-        }
-
-        this.factories.put(key, factory);
-
-        final Object lock = this;
-        return new AbstractRegistration() {
+        final RIBSupport<?, ?> prev = this.supports.putIfAbsent(key, support);
+        checkArgument(prev == null, "AFI %s SAFI %s is already registered with %s", afi, safi, prev);
+        this.domSupports.put(RibSupportUtils.toYangTablesKey(afi, safi), support);
+        return new AbstractRIBSupportRegistration<>(support) {
             @Override
             protected void removeRegistration() {
-                synchronized (lock) {
-                    SimpleRIBExtensionProviderContext.this.factories.remove(key);
-                }
+                // FIXME: clean up registrations, too
+                SimpleRIBExtensionProviderContext.this.supports.remove(key);
             }
         };
     }
 
     @Override
-    public final synchronized AdjRIBsFactory getAdjRIBsInFactory(final Class<? extends AddressFamily> afi,
-            final Class<? extends SubsequentAddressFamily> safi) {
-        return this.factories.get(new TablesKey(afi, safi));
+    public <C extends Routes & DataObject & ChoiceIn<Tables>, S extends ChildOf<C>> RIBSupport<C, S> getRIBSupport(
+            final Class<? extends AddressFamily> afi, final Class<? extends SubsequentAddressFamily> safi) {
+        return getRIBSupport(new TablesKey(afi, safi));
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <C extends Routes & DataObject & ChoiceIn<Tables>, S extends ChildOf<C>> RIBSupport<C, S> getRIBSupport(
+            final TablesKey key) {
+        return (RIBSupport<C, S>) this.supports.get(requireNonNull(key));
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <C extends Routes & DataObject & ChoiceIn<Tables>, S extends ChildOf<C>> RIBSupport<C, S> getRIBSupport(
+            final NodeIdentifierWithPredicates key) {
+        return (RIBSupport<C, S>) this.domSupports.get(key);
     }
 }