X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FBindingDOMDataTreeChangeServiceAdapter.java;h=4a4e5e1ff9720ec10527fb5d238bca66c67fc41e;hb=b8a896e6dfc47374f99efee157683dc8a7ef8860;hp=42d5fd59b29a4983c35c1f374936b04519f22034;hpb=b0712bca8e467f463a91ae4a6e664cc51e66809a;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapter.java
index 42d5fd59b2..4a4e5e1ff9 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapter.java
@@ -8,69 +8,66 @@
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataChangeListener;
 import org.opendaylight.mdsal.binding.api.DataListener;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeService;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.yangtools.concepts.Registration;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
 /**
- * Adapter exposing Binding {@link DataTreeChangeService} and wrapping a {@link DOMDataTreeChangeService} and is
+ * Adapter exposing Binding {@link DataTreeChangeService} and wrapping a {@link DataTreeChangeExtension} and is
  * responsible for translation and instantiation of {@link BindingDOMDataTreeChangeListenerAdapter} adapters.
  *
  * <p>
  * Each registered {@link DataTreeChangeListener} is wrapped using adapter and registered directly to DOM service.
  */
-final class BindingDOMDataTreeChangeServiceAdapter extends AbstractBindingAdapter<DOMDataTreeChangeService>
+final class BindingDOMDataTreeChangeServiceAdapter extends AbstractBindingAdapter<DataTreeChangeExtension>
         implements DataTreeChangeService {
     BindingDOMDataTreeChangeServiceAdapter(final AdapterContext adapterContext,
-            final DOMDataTreeChangeService dataTreeChangeService) {
-        super(adapterContext, dataTreeChangeService);
+            final DataTreeChangeExtension dataTreeChangeExtension) {
+        super(adapterContext, dataTreeChangeExtension);
     }
 
     @Override
-    public <T extends DataObject> Registration registerDataTreeChangeListener(final DataTreeIdentifier<T> treeId,
+    public <T extends DataObject> Registration registerTreeChangeListener(final DataTreeIdentifier<T> treeId,
             final DataTreeChangeListener<T> listener) {
-        final var domIdentifier = toDomTreeIdentifier(treeId);
-        final var storeType = treeId.getDatastoreType();
-        final var target = treeId.getRootIdentifier().getTargetType();
-        final var augment = Augmentation.class.isAssignableFrom(target) ? target : null;
-
-        final var domListener = listener instanceof ClusteredDataTreeChangeListener
-            ? new BindingClusteredDOMDataTreeChangeListenerAdapter<>(adapterContext(),
-                (ClusteredDataTreeChangeListener<T>) listener, storeType, augment)
-                : new BindingDOMDataTreeChangeListenerAdapter<>(adapterContext(), listener, storeType, augment);
+        return getDelegate().registerTreeChangeListener(toDomTreeIdentifier(treeId),
+            new BindingDOMDataTreeChangeListenerAdapter<>(adapterContext(), treeId, listener));
+    }
 
-        return getDelegate().registerDataTreeChangeListener(domIdentifier, domListener);
+    @Override
+    @Deprecated(since = "13.0.0", forRemoval = true)
+    public <T extends DataObject> Registration registerLegacyTreeChangeListener(final DataTreeIdentifier<T> treeId,
+            final DataTreeChangeListener<T> listener) {
+        return getDelegate().registerLegacyTreeChangeListener(toDomTreeIdentifier(treeId),
+            new BindingDOMDataTreeChangeListenerAdapter<>(adapterContext(), treeId, listener));
     }
 
     @Override
     public <T extends DataObject> Registration registerDataListener(final DataTreeIdentifier<T> treeId,
             final DataListener<T> listener) {
-        return getDelegate().registerDataTreeChangeListener(toDomTreeInstance(treeId),
+        return getDelegate().registerTreeChangeListener(toDomTreeInstance(treeId),
             new BindingDOMDataListenerAdapter<>(adapterContext(), listener));
     }
 
     @Override
     public <T extends DataObject> Registration registerDataChangeListener(final DataTreeIdentifier<T> treeId,
             final DataChangeListener<T> listener) {
-        return getDelegate().registerDataTreeChangeListener(toDomTreeInstance(treeId),
+        return getDelegate().registerTreeChangeListener(toDomTreeInstance(treeId),
             new BindingDOMDataChangeListenerAdapter<>(adapterContext(), listener));
     }
 
     private @NonNull DOMDataTreeIdentifier toDomTreeIdentifier(final DataTreeIdentifier<?> treeId) {
-        return new DOMDataTreeIdentifier(treeId.getDatastoreType(),
-            currentSerializer().toYangInstanceIdentifier(treeId.getRootIdentifier()));
+        return DOMDataTreeIdentifier.of(treeId.datastore(),
+            currentSerializer().toYangInstanceIdentifier(treeId.path()));
     }
 
     private @NonNull DOMDataTreeIdentifier toDomTreeInstance(final DataTreeIdentifier<?> treeId) {
-        final var instanceIdentifier = treeId.getRootIdentifier();
+        final var instanceIdentifier = treeId.path();
         if (instanceIdentifier.isWildcarded()) {
             throw new IllegalArgumentException("Cannot register listener for wildcard " + instanceIdentifier);
         }