Bug 3866: Introduced Binding Adapters for DataTreeProducer

Change-Id: I55518ce6de7edaf8bd68d6d2fccd217684b48536
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapter.java
new file mode 100644 (file)
index 0000000..c866bd6
--- /dev/null
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapter.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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 com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeListeningException;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeListener;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeListeningException;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
+
+public class BindingDOMDataTreeListenerAdapter implements DOMDataTreeListener {
+
+    private final DataTreeListener delegate;
+    private final BindingToNormalizedNodeCodec codec;
+    private final LogicalDatastoreType store;
+
+
+    protected BindingDOMDataTreeListenerAdapter(final DataTreeListener delegate,
+            final BindingToNormalizedNodeCodec codec, final LogicalDatastoreType store) {
+        this.delegate = Preconditions.checkNotNull(delegate, "delegate");
+        this.codec = Preconditions.checkNotNull(codec, "codec");
+        this.store = Preconditions.checkNotNull(store, "store");
+    }
+
+    @Override
+    public void onDataTreeChanged(final Collection<DataTreeCandidate> domChanges,
+            final Map<DOMDataTreeIdentifier, NormalizedNode<?, ?>> domSubtrees) {
+
+        final Collection<DataTreeModification<?>> changes = toBinding(domChanges);
+        final Map<DataTreeIdentifier<?>, DataObject> subtrees = toBinding(domSubtrees);
+
+        delegate.onDataTreeChanged(changes, subtrees);
+    }
+
+    private Map<DataTreeIdentifier<?>, DataObject> toBinding(
+            final Map<DOMDataTreeIdentifier, NormalizedNode<?, ?>> domSubtrees) {
+        // FIXME: Introduce lazy translating map
+        final Map<DataTreeIdentifier<?>, DataObject> ret = Maps.newHashMapWithExpectedSize(domSubtrees.size());
+        for (final Entry<DOMDataTreeIdentifier, NormalizedNode<?, ?>> domEntry : domSubtrees.entrySet()) {
+            final Entry<InstanceIdentifier<?>, DataObject> bindingEntry =
+                    codec.fromNormalizedNode(domEntry.getKey().getRootIdentifier(), domEntry.getValue());
+            ret.put(new DataTreeIdentifier<>(store, bindingEntry.getKey()), bindingEntry.getValue());
+        }
+        return ret;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Collection<DataTreeModification<?>> toBinding(final Collection<DataTreeCandidate> domChanges) {
+        return Collection.class.cast(LazyDataTreeModification.from(codec, domChanges, store));
+    }
+
+    @Override
+    public void onDataTreeFailed(final Collection<DOMDataTreeListeningException> causes) {
+        List<DataTreeListeningException> bindingCauses = new ArrayList<>(causes.size());
+        for (DOMDataTreeListeningException cause : causes) {
+            bindingCauses.add(mapException(cause));
+        }
+
+        delegate.onDataTreeFailed(bindingCauses);
+    }
+
+    private DataTreeListeningException mapException(DOMDataTreeListeningException cause) {
+        // FIXME: Extend logic
+        return new DataTreeListeningException(cause.getMessage(), cause);
+    }
+}

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeProducerAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeProducerAdapter.java
new file mode 100644 (file)
index 0000000..8bdbc2c
--- /dev/null
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeProducerAdapter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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 java.util.Collection;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeProducer;
+import org.opendaylight.mdsal.binding.api.DataTreeProducerException;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeProducerBusyException;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeProducerException;
+import org.opendaylight.mdsal.dom.api.DOMDataWriteTransaction;
+
+class BindingDOMDataTreeProducerAdapter implements DataTreeProducer {
+
+    private final DOMDataTreeProducer delegate;
+    private final BindingToNormalizedNodeCodec codec;
+
+    protected BindingDOMDataTreeProducerAdapter(final DOMDataTreeProducer delegate,
+            final BindingToNormalizedNodeCodec codec) {
+        super();
+        this.delegate = Preconditions.checkNotNull(delegate);
+        this.codec = codec;
+    }
+
+    @Override
+    public WriteTransaction createTransaction(final boolean isolated) {
+        final DOMDataWriteTransaction domTx = delegate.createTransaction(isolated);
+        return new BindingDOMWriteTransactionAdapter<DOMDataWriteTransaction>(domTx, codec);
+    }
+
+    static DataTreeProducer create(final DOMDataTreeProducer domProducer,
+            final BindingToNormalizedNodeCodec codec) {
+        return new BindingDOMDataTreeProducerAdapter(domProducer, codec);
+    }
+
+    @Override
+    public DataTreeProducer createProducer(final Collection<DataTreeIdentifier<?>> subtrees) {
+        final Collection<DOMDataTreeIdentifier> domSubtrees = codec.toDOMDataTreeIdentifiers(subtrees);
+        final DOMDataTreeProducer domChildProducer = delegate.createProducer(domSubtrees);
+        return BindingDOMDataTreeProducerAdapter.create(domChildProducer, codec);
+    }
+
+    @Override
+    public void close() throws DataTreeProducerException {
+        try {
+            delegate.close();
+        } catch (final DOMDataTreeProducerBusyException e) {
+            throw new DataTreeProducerException(e.getMessage(), e);
+        } catch (final DOMDataTreeProducerException e) {
+            throw new DataTreeProducerException(e.getMessage(), e);
+        }
+    }
+
+}

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java
new file mode 100644 (file)
index 0000000..ece2fe8
--- /dev/null
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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 java.util.Collection;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeLoopException;
+import org.opendaylight.mdsal.binding.api.DataTreeProducer;
+import org.opendaylight.mdsal.binding.api.DataTreeService;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeService;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+
+class BindingDOMDataTreeServiceAdapter implements DataTreeService {
+
+    private final DOMDataTreeService delegate;
+    private final BindingToNormalizedNodeCodec codec;
+
+    private BindingDOMDataTreeServiceAdapter(final DOMDataTreeService delegate, final BindingToNormalizedNodeCodec codec) {
+        this.delegate = Preconditions.checkNotNull(delegate, "delegate");
+        this.codec = Preconditions.checkNotNull(codec, "codec");
+    }
+
+    static BindingDOMDataTreeServiceAdapter create(final DOMDataTreeService domService,
+            final BindingToNormalizedNodeCodec codec) {
+        return new BindingDOMDataTreeServiceAdapter(domService, codec);
+    }
+
+    @Override
+    public DataTreeProducer createProducer(final Collection<DataTreeIdentifier<?>> subtrees) {
+        final Collection<DOMDataTreeIdentifier> domSubtrees = codec.toDOMDataTreeIdentifiers(subtrees);
+        final DOMDataTreeProducer domChildProducer = delegate.createProducer(domSubtrees);
+        return BindingDOMDataTreeProducerAdapter.create(domChildProducer, codec);
+    }
+
+    @Override
+    public <T extends DataTreeListener> ListenerRegistration<T> registerListener(final T listener,
+            final Collection<DataTreeIdentifier<?>> subtrees, final boolean allowRxMerges,
+            final Collection<DataTreeProducer> producers) throws DataTreeLoopException {
+        throw new UnsupportedOperationException("Not implemented yet.");
+    }
+}

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
index 1cf2f37ebabf57c894eb1b9fa917d20e08dfabce..8b5b9ccf2b9265a7938dfdecc00c41e25185a234 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
@@ -25,6 +25,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTree;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeFactory;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeNode;
@@ -373,4 +375,19 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
         throw new IllegalArgumentException("Path does not point to list schema node");
     }
 
+    protected Collection<DOMDataTreeIdentifier> toDOMDataTreeIdentifiers(
+            final Collection<DataTreeIdentifier<?>> subtrees) {
+        final Set<DOMDataTreeIdentifier> ret = new HashSet<>(subtrees.size());
+
+        for (final DataTreeIdentifier<?> subtree : subtrees) {
+            ret.add(toDOMDataTreeIdentifier(subtree));
+        }
+        return ret;
+    }
+
+    protected DOMDataTreeIdentifier toDOMDataTreeIdentifier(final DataTreeIdentifier<?> path) {
+        final YangInstanceIdentifier domPath = toYangInstanceIdentifierBlocking(path.getRootIdentifier());
+        return new DOMDataTreeIdentifier(path.getDatastoreType(), domPath);
+    }
+
 }

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java
index c0c7e5a08eb7992f2386b4f3b796f358cc601a9b..cd8355235eb363bf85b55f3e4afaa048698de0e2 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-
-import org.opendaylight.mdsal.binding.api.DataObjectModification;
-import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeNode;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -54,7 +53,7 @@ class LazyDataTreeModification<T extends DataObject> implements DataTreeModifica
             final LogicalDatastoreType datastoreType) {
         final Entry<InstanceIdentifier<?>, BindingCodecTreeNode<?>> codecCtx =
                 codec.getSubtreeCodec(domChange.getRootPath());
-        return (DataTreeModification<T>) new LazyDataTreeModification(datastoreType, codecCtx.getKey(), codecCtx.getValue(), domChange);
+        return new LazyDataTreeModification(datastoreType, codecCtx.getKey(), codecCtx.getValue(), domChange);
     }
 
     static <T extends DataObject> Collection<DataTreeModification<T>> from(final BindingToNormalizedNodeCodec codec,