Do not expose Binding access through rib.impl.spi.RIB

We should not be touching binding layer at all, eliminate one avenue
of access.

JIRA: MDSAL-583
Change-Id: I4a3c7d6f864e4b69fc5d0fdc41e0aa1acd5ae341
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java
index a4479332cd48a6d9085e1973bb13dd25b037c4ae..1f79af94cfa1205a92b31a2cf7fe29ef5618ee6e 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java
@@ -310,11 +310,6 @@ public final class RIBImpl extends BGPRibStateImpl implements RIB, TransactionCh
         return this.yangRibId;
     }
 
-    @Override
-    public TransactionChain createPeerChain(final TransactionChainListener listener) {
-        return this.dataBroker.createMergingTransactionChain(listener);
-    }
-
     @Override
     public DOMTransactionChain createPeerDOMChain(final DOMTransactionChainListener listener) {
         return this.domDataBroker.createMergingTransactionChain(listener);

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
index 934271c525fa3f01c77570df591f312d39651a4f..2f3a261f0fde7864a3a0bbeea0f19eac69a563d6 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
@@ -18,8 +18,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.TransactionChain;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
@@ -141,11 +139,6 @@ public final class RibImpl implements RIB, BGPRibStateConsumer, AutoCloseable {
         return this.ribImpl.createPeerDOMChain(listener);
     }
 
-    @Override
-    public TransactionChain createPeerChain(final TransactionChainListener listener) {
-        return this.ribImpl.createPeerChain(listener);
-    }
-
     @Override
     public RIBExtensionConsumerContext getRibExtensions() {
         return this.ribImpl.getRibExtensions();

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIB.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIB.java
index 64901b75d6ac38940116a1e41758b9a2b06b402f..252bd5ccea3b755120840dabb2225c358900bcb5 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIB.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIB.java
@@ -10,8 +10,6 @@ package org.opendaylight.protocol.bgp.rib.impl.spi;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.TransactionChain;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
@@ -56,14 +54,6 @@ public interface RIB extends RibReference, RibOutRefresh {
      */
     DOMTransactionChain createPeerDOMChain(DOMTransactionChainListener listener);
 
-    /**
-     * Allocate a new transaction chain for use with a peer.
-     *
-     * @param listener {@link TransactionChainListener} handling recovery
-     * @return A new transaction chain.
-     */
-    TransactionChain createPeerChain(TransactionChainListener listener);
-
     /**
      * Return the RIB extensions available to the RIB instance.
      *

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
index d3c9abf37696e5d7d14804202e79648f5d54c1f5..fb97d99af12311949ff776747aa081dc2ff6509c 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.bgp.rib.impl.config;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -20,7 +19,6 @@ import java.net.InetSocketAddress;
 import java.util.Collections;
 import org.junit.Before;
 import org.mockito.Mock;
-import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
@@ -94,10 +92,6 @@ class AbstractConfig extends DefaultRibPoliciesMockTest {
                 .params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib.class, new RibKey(RIB_ID))).when(this.rib)
                 .getInstanceIdentifier();
         doReturn(this.domTx).when(this.rib).createPeerDOMChain(any(DOMTransactionChainListener.class));
-        doAnswer(invocation -> {
-            final Object[] args = invocation.getArguments();
-            return getDataBroker().createTransactionChain((TransactionChainListener) args[0]);
-        }).when(this.rib).createPeerChain(any(TransactionChainListener.class));
 
         doReturn(getDataBroker()).when(this.rib).getDataBroker();
         doReturn(AS).when(this.rib).getLocalAs();