Bug 3875: Introduced transforming stream writer 74/26274/7
authorTony Tkacik <ttkacik@cisco.com>
Tue, 1 Sep 2015 14:06:54 +0000 (16:06 +0200)
committerTony Tkacik <ttkacik@cisco.com>
Mon, 21 Sep 2015 19:27:10 +0000 (19:27 +0000)
Introduced simple QName transforming stream writer
which could be used to re-stream and rebuild
YANG Data with replacement of QNames.

QNameTransformingStreamWriter currently supports
custom mapping, replacement of specified QNameModules
and replacement of specified QNames

Change-Id: I98b253a0f184e1996d78b99fa8cfb20a7d588b96
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
yang/pom.xml
yang/yang-data-transform/pom.xml [new file with mode: 0644]
yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java [new file with mode: 0644]
yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java [new file with mode: 0644]
yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameReplacementFunction.java [new file with mode: 0644]
yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameTransformingStreamWriter.java [new file with mode: 0644]

index 5c19ea3049c46b91060d527411cb87459b774b54..1c1afcf2e1977be80b0679f7837da8340c5c22c9 100644 (file)
@@ -26,6 +26,7 @@
         <module>yang-data-api</module>
         <module>yang-data-util</module>
         <module>yang-data-impl</module>
+        <module>yang-data-transform</module>
         <module>yang-data-operations</module>
         <module>yang-data-codec-gson</module>
         <module>yang-model-api</module>
diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml
new file mode 100644 (file)
index 0000000..fe62476
--- /dev/null
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 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
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-parent</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yang-data-transform</artifactId>
+    <name>${project.artifactId}</name>
+    <description>${project.artifactId}</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-data-impl</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/NormalizedNodeTransformations.java
new file mode 100644 (file)
index 0000000..766dd8b
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * 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.yangtools.transform;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.base.Throwables;
+import java.io.IOException;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+
+@Beta
+public final class NormalizedNodeTransformations {
+
+    private NormalizedNodeTransformations() {
+        throw new UnsupportedOperationException("Utility class.");
+    }
+
+    public static NormalizedNode<?, ?> transformQNames(NormalizedNode<?, ?> original, Function<QName, QName> mapping) {
+        NormalizedNodeResult result = new NormalizedNodeResult();
+        NormalizedNodeStreamWriter nodeWriter = ImmutableNormalizedNodeStreamWriter.from(result);
+        NormalizedNodeStreamWriter transformWriter = QNameTransformingStreamWriter.fromFunction(nodeWriter, mapping);
+        try {
+            NormalizedNodeWriter.forStreamWriter(transformWriter).write(original);
+            return result.getResult();
+        } catch (IOException e) {
+            throw Throwables.propagate(e);
+        }
+    }
+
+    /**
+     *
+     * Returns a {@link NormalizedNode} with QNames replaced by supplied mapping.
+     *
+     * @param original Original Normalized Node
+     * @param mapping Map of QNames to transform. Not listed QNames are preserved.
+     * @return Normalized Node with replaced QNames.
+     */
+    public static NormalizedNode<?, ?> replaceQNames(@Nonnull NormalizedNode<?, ?> original,
+            @Nonnull Map<QName, QName> mapping) {
+        return transformQNames(original, new QNameReplacementFunction(mapping));
+    }
+
+    /**
+     *
+     * Returns a {@link NormalizedNode} with QNameModules replaced by supplied mapping.
+     *
+     * @param original Original Normalized Node
+     * @param mapping Map of QNameModules to transform. Not listed QNameModules are preserved.
+     * @return Normalized Node with replaced QNameModules.
+     */
+
+    public static NormalizedNode<?, ?> replaceQNameModules(@Nonnull NormalizedNode<?, ?> original,
+            @Nonnull Map<QNameModule, QNameModule> mapping) {
+        return transformQNames(original, new QNameModuleReplacementFunction(mapping));
+    }
+
+}
diff --git a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java
new file mode 100644 (file)
index 0000000..6790fc0
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * 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.yangtools.transform;
+
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+
+class QNameModuleReplacementFunction implements Function<QName, QName> {
+
+    private final Map<QNameModule, QNameModule> mapping;
+
+    QNameModuleReplacementFunction(Map<QNameModule, QNameModule> mapping) {
+        this.mapping = Preconditions.checkNotNull(mapping);
+    }
+
+    @Override
+    public QName apply(QName input) {
+        QNameModule potential = mapping.get(input.getModule());
+        if (potential != null) {
+            return QName.cachedReference(QName.create(potential, input.getLocalName()));
+        }
+        return input;
+    }
+
+}
diff --git a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameReplacementFunction.java b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameReplacementFunction.java
new file mode 100644 (file)
index 0000000..cba587c
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * 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.yangtools.transform;
+
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import java.util.Map;
+import org.opendaylight.yangtools.yang.common.QName;
+
+class QNameReplacementFunction implements Function<QName, QName> {
+
+    private final Map<QName, QName> mapping;
+
+    QNameReplacementFunction(Map<QName, QName> mapping) {
+        this.mapping = Preconditions.checkNotNull(mapping);
+    }
+
+    @Override
+    public QName apply(QName input) {
+        QName potential = mapping.get(input);
+        return potential != null ? potential : input;
+    }
+
+}
diff --git a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameTransformingStreamWriter.java b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameTransformingStreamWriter.java
new file mode 100644 (file)
index 0000000..70925f1
--- /dev/null
@@ -0,0 +1,198 @@
+/*
+ * 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.yangtools.transform;
+
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ForwardingObject;
+import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+
+/**
+ *
+ * Stateless Normalized Node Stream Writer decorator, which performs QName translation.
+ *
+ * This class serves as base for Normalized Node Stream Writer decorators with option to transform
+ * QNames by user-implemented {@link #transform(QName)} function.
+ *
+ */
+public abstract class QNameTransformingStreamWriter extends ForwardingObject implements NormalizedNodeStreamWriter {
+
+    // FIXME: Probably use loading cache to decrease memory
+    @Override
+    protected abstract NormalizedNodeStreamWriter delegate();
+
+    /**
+     * Returns decorator, which uses supplied function to transform QNames.
+     *
+     * @param delegate Underlying normalized node stream writer
+     * @param transformation Transformation function, function is required to return non-null
+     *        values.
+     * @return decorator, which uses supplied function to transform QNames.
+     */
+    public static NormalizedNodeStreamWriter fromFunction(final NormalizedNodeStreamWriter delegate,
+            final Function<QName, QName> transformation) {
+        return new QNameTransformingStreamWriter() {
+
+            @Override
+            protected NormalizedNodeStreamWriter delegate() {
+              return delegate;
+            }
+
+            @Override
+            protected QName transform(QName key) {
+                return transformation.apply(key);
+            }
+
+        };
+    }
+
+    /**
+     * Returns decorator, which uses supplied map to transform QNames.
+     *
+     * QNames not present in map are left unchanged.
+     *
+     * @param delegate Underlying normalized node stream writer
+     * @param mapping Immutable map which represent mapping from original to new values.
+     * @return decorator, which uses supplied mapping to transform QNames.
+     */
+    public static NormalizedNodeStreamWriter createQNameReplacing(NormalizedNodeStreamWriter delegate,
+            final Map<QName, QName> mapping) {
+        return fromFunction(delegate, new QNameReplacementFunction(mapping));
+    }
+
+    /**
+     * Returns decorator, which uses supplied map to transform QNameModules.
+     *
+     * QNameModules not present in map are left unchanged.
+     *
+     * @param delegate Underlying normalized node stream writer
+     * @param mapping Immutable map which represent mapping from original to new values.
+     * @return decorator, which uses supplied mapping to transform QNameModules.
+     */
+    public static NormalizedNodeStreamWriter createQNameModuleReplacing(NormalizedNodeStreamWriter delegate,
+            final Map<QNameModule, QNameModule> mapping) {
+        return fromFunction(delegate, new QNameModuleReplacementFunction(mapping));
+    }
+
+    /**
+     * Transforms a QName to new mapping.
+     *
+     * NOTE: If QName should be unchanged implemention needs to return original QName.
+     *
+     * @param key QName to transform.
+     * @return Returns new value of QName.
+     */
+    protected abstract @Nonnull QName transform(@Nonnull QName key);
+
+    @Override
+    public void leafNode(NodeIdentifier name, Object value) throws IOException, IllegalArgumentException {
+        delegate().leafNode(transform(name), value);
+    }
+
+    @Override
+    public void startLeafSet(NodeIdentifier name, int childSizeHint) throws IOException, IllegalArgumentException {
+        delegate().startLeafSet(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void leafSetEntryNode(Object value) throws IOException, IllegalArgumentException {
+        delegate().leafSetEntryNode(value);
+    }
+
+    @Override
+    public void startContainerNode(NodeIdentifier name, int childSizeHint) throws IOException, IllegalArgumentException {
+        delegate().startContainerNode(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void startUnkeyedList(NodeIdentifier name, int childSizeHint) throws IOException, IllegalArgumentException {
+        delegate().startUnkeyedList(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void startUnkeyedListItem(NodeIdentifier name, int childSizeHint) throws IOException, IllegalStateException {
+        delegate().startUnkeyedListItem(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void startMapNode(NodeIdentifier name, int childSizeHint) throws IOException, IllegalArgumentException {
+        delegate().startMapNode(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void startMapEntryNode(NodeIdentifierWithPredicates identifier, int childSizeHint) throws IOException,
+            IllegalArgumentException {
+        delegate().startMapEntryNode(transform(identifier), childSizeHint);
+    }
+
+    @Override
+    public void startOrderedMapNode(NodeIdentifier name, int childSizeHint) throws IOException,
+            IllegalArgumentException {
+        delegate().startOrderedMapNode(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void startChoiceNode(NodeIdentifier name, int childSizeHint) throws IOException, IllegalArgumentException {
+        delegate().startChoiceNode(transform(name), childSizeHint);
+    }
+
+    @Override
+    public void startAugmentationNode(AugmentationIdentifier identifier) throws IOException, IllegalArgumentException {
+        delegate().startAugmentationNode(transform(identifier));
+    }
+
+    @Override
+    public void anyxmlNode(NodeIdentifier name, Object value) throws IOException, IllegalArgumentException {
+        delegate().anyxmlNode(transform(name), value);
+    }
+
+    @Override
+    public void endNode() throws IOException, IllegalStateException {
+        delegate().endNode();
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate().close();
+    }
+
+    @Override
+    public void flush() throws IOException {
+        delegate().flush();
+    }
+
+    private NodeIdentifier transform(NodeIdentifier name) {
+        return new NodeIdentifier(transform(name.getNodeType()));
+    }
+
+    private AugmentationIdentifier transform(AugmentationIdentifier identifier) {
+        ImmutableSet.Builder<QName> builder = ImmutableSet.builder();
+        for (QName original : identifier.getPossibleChildNames()) {
+            builder.add(transform(original));
+        }
+        return new AugmentationIdentifier(builder.build());
+    }
+
+    private NodeIdentifierWithPredicates transform(NodeIdentifierWithPredicates identifier) {
+        Map<QName, Object> keyValues = new HashMap<>();
+        for (Map.Entry<QName, Object> original : identifier.getKeyValues().entrySet()) {
+            keyValues.put(transform(original.getKey()), original.getValue());
+        }
+        return new NodeIdentifierWithPredicates(transform(identifier.getNodeType()), keyValues);
+    }
+}