Rename DOMDataTreeChangeService

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / AbstractDOMDataBroker.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMDataBroker.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMDataBroker.java
index a06d63febeddfe408c39892e7aec3cacbcb11c60..d1be9449ea21f527024923c2be5d6a6a78f5768b 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMDataBroker.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMDataBroker.java
@@ -14,8 +14,6 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain;
@@ -36,7 +34,7 @@ public abstract class AbstractDOMDataBroker extends AbstractDOMForwardedTransact
 
         final var builder = ImmutableList.<Extension>builder();
         if (isSupported(datastores, DOMStoreTreeChangePublisher.class)) {
-            builder.add((DOMDataTreeChangeService) (treeId, listener) -> {
+            builder.add((DataTreeChangeExtension) (treeId, listener) -> {
                 final var dsType = treeId.datastore();
                 if (getTxFactories().get(dsType) instanceof DOMStoreTreeChangePublisher publisher) {
                     return publisher.registerTreeChangeListener(treeId.path(), listener);
@@ -44,11 +42,11 @@ public abstract class AbstractDOMDataBroker extends AbstractDOMForwardedTransact
                 throw new IllegalStateException("Publisher for " + dsType + " data store is not available");
             });
         }
-        if (isSupported(datastores, DOMDataTreeCommitCohortRegistry.class)) {
-            builder.add((DOMDataTreeCommitCohortRegistry) (path, cohort) -> {
+        if (isSupported(datastores, CommitCohortExtension.class)) {
+            builder.add((CommitCohortExtension) (path, cohort) -> {
                 final var dsType = path.datastore();
-                if (getTxFactories().get(dsType) instanceof DOMDataTreeCommitCohortRegistry registry) {
-                    return registry.registerCommitCohort(path, cohort);
+                if (getTxFactories().get(dsType) instanceof CommitCohortExtension extension) {
+                    return extension.registerCommitCohort(path, cohort);
                 }
                 throw new IllegalStateException("Cohort registry for " + dsType + " data store is not available");
             });