Rename DOMDataTreeChangeService

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingDOMDataTreeChangeServiceAdapter.java

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 b63f3c45b935ccb55d1a593e64946c8eb94612dd..9ec4e275ecdfa8694782e87c3273b5c31543af58 100644 (file)
--- 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
@@ -7,55 +7,73 @@
  */
 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.common.api.LogicalDatastoreType;
-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.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**
- * 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 DataTreeChangeExtension dataTreeChangeExtension) {
+        super(adapterContext, dataTreeChangeExtension);
+    }
+
+    @Override
+    public <T extends DataObject> Registration registerDataTreeChangeListener(final DataTreeIdentifier<T> treeId,
+            final DataTreeChangeListener<T> listener) {
+        final var domIdentifier = toDomTreeIdentifier(treeId);
+        final var storeType = treeId.datastore();
+        final var target = treeId.path().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);
 
-    private BindingDOMDataTreeChangeServiceAdapter(final BindingToNormalizedNodeCodec codec,
-            final DOMDataTreeChangeService dataTreeChangeService) {
-        super(codec, dataTreeChangeService);
+        return getDelegate().registerDataTreeChangeListener(domIdentifier, domListener);
     }
 
-    static DataTreeChangeService create(final BindingToNormalizedNodeCodec codec,
-            final DOMDataTreeChangeService dataTreeChangeService) {
-        return new BindingDOMDataTreeChangeServiceAdapter(codec, dataTreeChangeService);
+    @Override
+    public <T extends DataObject> Registration registerDataListener(final DataTreeIdentifier<T> treeId,
+            final DataListener<T> listener) {
+        return getDelegate().registerDataTreeChangeListener(toDomTreeInstance(treeId),
+            new BindingDOMDataListenerAdapter<>(adapterContext(), listener));
     }
 
     @Override
-    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L>
-            registerDataTreeChangeListener(final DataTreeIdentifier<T> treeId, final L listener) {
-        final DOMDataTreeIdentifier domIdentifier = toDomTreeIdentifier(treeId);
-        final LogicalDatastoreType storeType = treeId.getDatastoreType();
-        final BindingDOMDataTreeChangeListenerAdapter<T> domListener =
-                listener instanceof ClusteredDataTreeChangeListener
-                        ? new BindingClusteredDOMDataTreeChangeListenerAdapter<>(
-                                getCodec(), (ClusteredDataTreeChangeListener<T>) listener, storeType)
-                        : new BindingDOMDataTreeChangeListenerAdapter<>(getCodec(), listener, storeType);
-
-        final ListenerRegistration<BindingDOMDataTreeChangeListenerAdapter<T>> domReg =
-                getDelegate().registerDataTreeChangeListener(domIdentifier, domListener);
-        return new BindingDataTreeChangeListenerRegistration<>(listener, domReg);
+    public <T extends DataObject> Registration registerDataChangeListener(final DataTreeIdentifier<T> treeId,
+            final DataChangeListener<T> listener) {
+        return getDelegate().registerDataTreeChangeListener(toDomTreeInstance(treeId),
+            new BindingDOMDataChangeListenerAdapter<>(adapterContext(), listener));
+    }
+
+    private @NonNull DOMDataTreeIdentifier toDomTreeIdentifier(final DataTreeIdentifier<?> treeId) {
+        return DOMDataTreeIdentifier.of(treeId.datastore(),
+            currentSerializer().toYangInstanceIdentifier(treeId.path()));
     }
 
-    private DOMDataTreeIdentifier toDomTreeIdentifier(final DataTreeIdentifier<?> treeId) {
-        final YangInstanceIdentifier domPath = getCodec().toYangInstanceIdentifierBlocking(treeId.getRootIdentifier());
-        return new DOMDataTreeIdentifier(treeId.getDatastoreType(), domPath);
+    private @NonNull DOMDataTreeIdentifier toDomTreeInstance(final DataTreeIdentifier<?> treeId) {
+        final var instanceIdentifier = treeId.path();
+        if (instanceIdentifier.isWildcarded()) {
+            throw new IllegalArgumentException("Cannot register listener for wildcard " + instanceIdentifier);
+        }
+        return toDomTreeIdentifier(treeId);
     }
 }