Report ExactDataObjectStep from DataObjectModification

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortAdapter.java
index 789e0d18ad9907ab6af0320fb0541b917a6a1f36..f2e6fb50938de0d063ea71a25e88ab6cfe11f91b 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortAdapter.java
@@ -5,33 +5,35 @@
  * 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.util.concurrent.FluentFuture;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import org.opendaylight.mdsal.binding.api.DataTreeCommitCohort;
-import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.PostCanCommitStep;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeCandidate;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
-class BindingDOMDataTreeCommitCohortAdapter<T extends DataObject>
+final class BindingDOMDataTreeCommitCohortAdapter<T extends DataObject>
         extends AbstractBindingAdapter<DataTreeCommitCohort<T>> implements DOMDataTreeCommitCohort {
+    private final Class<T> augment;
 
-    BindingDOMDataTreeCommitCohortAdapter(final BindingToNormalizedNodeCodec codec,
-            final DataTreeCommitCohort<T> cohort) {
+    BindingDOMDataTreeCommitCohortAdapter(final AdapterContext codec, final DataTreeCommitCohort<T> cohort,
+            final Class<T> augment) {
         super(codec, cohort);
+        this.augment = augment;
     }
 
     @Override
     public FluentFuture<PostCanCommitStep> canCommit(final Object txId,
-            final SchemaContext ctx, final Collection<DOMDataTreeCandidate> candidates) {
-        final Collection<DataTreeModification<T>> modifications = candidates.stream().map(
-            candidate -> LazyDataTreeModification.<T>create(getCodec(), candidate)).collect(Collectors.toList());
-        return getDelegate().canCommit(txId, modifications);
+            final EffectiveModelContext ctx, final Collection<DOMDataTreeCandidate> candidates) {
+        return getDelegate().canCommit(txId, candidates.stream()
+            .map(candidate -> LazyDataTreeModification.<T>from(currentSerializer(), candidate, augment))
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList()));
     }
 }