X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2FPingPongDataBroker.java;h=994522fed3db4588b0cbf70f026bcaee7b46a032;hp=b5ec58d54add8151632b955b30fe76f42fde894e;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hpb=1e884647502a8d91f8a57bde8193c60b9bbcce0d

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java
index b5ec58d54a..994522fed3 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.controller.md.sal.dom.broker.impl;
 
-import com.google.common.base.Preconditions;
-import javax.annotation.Nonnull;
+import static java.util.Objects.requireNonNull;
+
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener;
@@ -20,11 +21,14 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration;
 /**
  * An implementation of a {@link DOMDataBroker}, which forwards most requests to a delegate.
  *
+ * <p>
  * Its interpretation of the API contract is somewhat looser, specifically it does not
  * guarantee transaction ordering between transactions allocated directly from the broker
  * and its transaction chains.
  */
-public final class PingPongDataBroker extends ForwardingDOMDataBroker implements AutoCloseable, DOMDataTreeChangeService {
+@Deprecated(forRemoval = true)
+public final class PingPongDataBroker extends ForwardingDOMDataBroker implements AutoCloseable,
+        DOMDataTreeChangeService {
     private final DOMDataBroker delegate;
 
     /**
@@ -33,8 +37,8 @@ public final class PingPongDataBroker extends ForwardingDOMDataBroker implements
      *
      * @param delegate Backend broker, may not be null.
      */
-    public PingPongDataBroker(final @Nonnull DOMDataBroker delegate) {
-        this.delegate = Preconditions.checkNotNull(delegate);
+    public PingPongDataBroker(final @NonNull DOMDataBroker delegate) {
+        this.delegate = requireNonNull(delegate);
     }
 
     @Override
@@ -49,15 +53,23 @@ public final class PingPongDataBroker extends ForwardingDOMDataBroker implements
 
     @Override
     public void close() {
-        // TODO Auto-generated method stub
+        // intentionally NOOP
     }
 
     @Override
-    public <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerDataTreeChangeListener(final DOMDataTreeIdentifier treeId, final L listener) {
-        if (delegate instanceof DOMDataTreeChangeService) {
-            return ((DOMDataTreeChangeService)delegate).registerDataTreeChangeListener(treeId, listener);
+    public <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerDataTreeChangeListener(
+            final DOMDataTreeIdentifier treeId, final L listener) {
+        final DOMDataTreeChangeService treeService = (DOMDataTreeChangeService) delegate.getSupportedExtensions()
+                .get(DOMDataTreeChangeService.class);
+        if (treeService != null) {
+            return treeService.registerDataTreeChangeListener(treeId, listener);
         }
 
         throw new UnsupportedOperationException("Delegate " + delegate + " does not support required functionality");
     }
+
+    @Override
+    public String toString() {
+        return "PingPongDataBroker backed by " + delegate;
+    }
 }