Reduce ObjectRegistration use

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java
index 750a31cdb142dbe10c0b43e42b3217e76802231d..c31e30463fadee3ec271da875593afeb4ff505c7 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java
@@ -5,53 +5,30 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.api.DataTreeCommitCohort;
 import org.opendaylight.mdsal.binding.api.DataTreeCommitCohortRegistry;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.binding.Augmentation;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
-public class BindingDOMDataTreeCommitCohortRegistryAdapter implements DataTreeCommitCohortRegistry {
-
-    private final BindingToNormalizedNodeCodec codec;
-    private final DOMDataTreeCommitCohortRegistry registry;
-
-    BindingDOMDataTreeCommitCohortRegistryAdapter(final BindingToNormalizedNodeCodec codec,
-            final DOMDataTreeCommitCohortRegistry registry) {
-        this.codec = Preconditions.checkNotNull(codec);
-        this.registry = Preconditions.checkNotNull(registry);
-    }
-
-    static DataTreeCommitCohortRegistry from(final BindingToNormalizedNodeCodec codec,
+final class BindingDOMDataTreeCommitCohortRegistryAdapter
+        extends AbstractBindingAdapter<DOMDataTreeCommitCohortRegistry> implements DataTreeCommitCohortRegistry {
+    BindingDOMDataTreeCommitCohortRegistryAdapter(final AdapterContext codec,
             final DOMDataTreeCommitCohortRegistry registry) {
-        return new BindingDOMDataTreeCommitCohortRegistryAdapter(codec, registry);
+        super(codec, registry);
     }
 
     @Override
-    public <D extends DataObject, T extends DataTreeCommitCohort<D>> ObjectRegistration<T> registerCommitCohort(
-            final DataTreeIdentifier<D> subtree, final T cohort) {
-        final BindingDOMDataTreeCommitCohortAdapter<D> adapter =
-                new BindingDOMDataTreeCommitCohortAdapter<>(codec, cohort);
-        final DOMDataTreeIdentifier domPath = codec.toDOMDataTreeIdentifier(subtree);
-        final DOMDataTreeCommitCohortRegistration<?> domReg = registry.registerCommitCohort(domPath, adapter);
-        return new ObjectRegistration<T>() {
-
-            @Override
-            public T getInstance() {
-                return cohort;
-            }
-
-            @Override
-            public void close() throws Exception {
-                domReg.close();
-            }
-        };
+    public <D extends DataObject> Registration registerCommitCohort(final DataTreeIdentifier<D> subtree,
+            final DataTreeCommitCohort<D> cohort) {
+        final var target = subtree.path().getTargetType();
+        final var adapter = new BindingDOMDataTreeCommitCohortAdapter<>(adapterContext(), cohort,
+            Augmentation.class.isAssignableFrom(target) ? target : null);
+        final var domPath = currentSerializer().toDOMDataTreeIdentifier(subtree);
+        return getDelegate().registerCommitCohort(domPath, adapter);
     }
 }