Merge "Simplified inheritance within stateful module."

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

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBActivator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBActivator.java
index bba3138852b1d49c084defb78908d5d1cfbf8258..1ce965b71ccccef69db78cfaacfd915d148cc44f 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBActivator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBActivator.java
@@ -7,66 +7,40 @@
  */
 package org.opendaylight.protocol.bgp.rib.impl;
 
-import java.util.Comparator;
-
+import com.google.common.collect.Lists;
+import java.util.List;
+import org.opendaylight.protocol.bgp.rib.spi.AbstractRIBExtensionProviderActivator;
+import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsFactory;
 import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsIn;
-import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsInFactory;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130918.PathAttributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables;
 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.Ipv4AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv6AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.UnicastSubsequentAddressFamily;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-public final class RIBActivator implements RIBExtensionProviderActivator {
-       private static final Logger LOG = LoggerFactory.getLogger(RIBActivator.class);
-       private AutoCloseable v4reg, v6reg;
-
-       @Override
-       public void startRIBExtensionProvider(final RIBExtensionProviderContext context) {
-               Preconditions.checkState(v4reg == null);
-               Preconditions.checkState(v6reg == null);
-
-               v4reg = context.registerAdjRIBsInFactory(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, new AdjRIBsInFactory() {
-                       @Override
-                       public AdjRIBsIn createAdjRIBsIn(final Comparator<PathAttributes> comparator, final TablesKey key) {
-                               return new Ipv4AdjRIBsIn(comparator, key);
-                       }
-               });
-
-               v6reg = context.registerAdjRIBsInFactory(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, new AdjRIBsInFactory() {
-                       @Override
-                       public AdjRIBsIn createAdjRIBsIn(final Comparator<PathAttributes> comparator, final TablesKey key) {
-                               return new Ipv6AdjRIBsIn(comparator, key);
-                       }
-               });
-
-       }
-
-       @Override
-       public void stopRIBExtensionProvider() {
-               if (v4reg != null) {
-                       try {
-                               v4reg.close();
-                       } catch (Exception e) {
-                               LOG.warn("Failed to unregister IPv4 extension", e);
-                       } finally {
-                               v4reg = null;
-                       }
-               }
-               if (v6reg != null) {
-                       try {
-                               v6reg.close();
-                       } catch (Exception e) {
-                               LOG.warn("Failed to unregister IPv6 extension", e);
-                       } finally {
-                               v6reg = null;
-                       }
-               }
-       }
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+
+public final class RIBActivator extends AbstractRIBExtensionProviderActivator {
+
+    @Override
+    protected List<AutoCloseable> startRIBExtensionProviderImpl(final RIBExtensionProviderContext context) {
+        final AdjRIBsFactory adj1 = new AdjRIBsFactory() {
+            @Override
+            public AdjRIBsIn<?, ?> createAdjRIBs(final KeyedInstanceIdentifier<Tables, TablesKey> basePath) {
+                return new Ipv4AdjRIBsIn(basePath);
+            }
+        };
+
+        final AdjRIBsFactory adj2 = new AdjRIBsFactory() {
+            @Override
+            public AdjRIBsIn<?, ?> createAdjRIBs(final KeyedInstanceIdentifier<Tables, TablesKey> basePath) {
+                return new Ipv6AdjRIBsIn(basePath);
+            }
+        };
+        return Lists.newArrayList(
+                context.registerAdjRIBsInFactory(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, adj1),
+                context.registerAdjRIBsInFactory(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, adj2),
+                context.registerRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, IPv4RIBSupport.getInstance()),
+                context.registerRIBSupport(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, IPv6RIBSupport.getInstance()));
+    }
 }