Merge "BUG 2854 : Do not add empty read write transactions to the replicable journal"
[controller.git] / opendaylight / md-sal / sal-common-impl / src / main / java / org / opendaylight / controller / md / sal / common / impl / util / compat / DataNormalizer.java
index ec8ce6ecd5a96e628d2883ab38f24aaab383095a..9876a57d1a23fd2996398709db738747c57cbea6 100644 (file)
@@ -9,33 +9,17 @@ package org.opendaylight.controller.md.sal.common.impl.util.compat;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicates;
-import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import java.util.AbstractMap;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Map;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.AugmentationIdentifier;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.Node;
-import org.opendaylight.yangtools.yang.data.api.SimpleNode;
-import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MixinNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
-import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
-import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode;
-import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl;
-import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
+/**
+ * @deprecated This class provides compatibility between XML semantics
+ * and {@link org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree}
+ */
+@Deprecated
 public class DataNormalizer {
 
     private final DataNormalizationOperation<?> operation;
@@ -44,11 +28,11 @@ public class DataNormalizer {
         operation = DataNormalizationOperation.from(ctx);
     }
 
-    public InstanceIdentifier toNormalized(final InstanceIdentifier legacy) {
+    public YangInstanceIdentifier toNormalized(final YangInstanceIdentifier legacy) {
         ImmutableList.Builder<PathArgument> normalizedArgs = ImmutableList.builder();
 
         DataNormalizationOperation<?> currentOp = operation;
-        Iterator<PathArgument> arguments = legacy.getPath().iterator();
+        Iterator<PathArgument> arguments = legacy.getPathArguments().iterator();
 
         try {
             while (arguments.hasNext()) {
@@ -67,144 +51,29 @@ public class DataNormalizer {
             throw new IllegalArgumentException(String.format("Failed to normalize path %s", legacy), e);
         }
 
-        return new InstanceIdentifier(normalizedArgs.build());
-    }
-
-    public Map.Entry<InstanceIdentifier, NormalizedNode<?, ?>> toNormalized(
-            final Map.Entry<InstanceIdentifier, CompositeNode> legacy) {
-        return toNormalized(legacy.getKey(), legacy.getValue());
+        return YangInstanceIdentifier.create(normalizedArgs.build());
     }
 
-    public Map.Entry<InstanceIdentifier, NormalizedNode<?, ?>> toNormalized(final InstanceIdentifier legacyPath,
-            final CompositeNode legacyData) {
-
-        InstanceIdentifier normalizedPath = toNormalized(legacyPath);
-
+    public DataNormalizationOperation<?> getOperation(final YangInstanceIdentifier legacy) throws DataNormalizationException {
         DataNormalizationOperation<?> currentOp = operation;
-        for (PathArgument arg : normalizedPath.getPath()) {
-            try {
-                currentOp = currentOp.getChild(arg);
-            } catch (DataNormalizationException e) {
-                throw new IllegalArgumentException(String.format("Failed to validate normalized path %s",
-                        normalizedPath), e);
-            }
-        }
-
-        // Write Augmentation data resolution
-        if (legacyData.getValue().size() == 1) {
-            final DataNormalizationOperation<?> potentialOp;
-
-            try {
-                final QName childType = legacyData.getValue().get(0).getNodeType();
-                potentialOp = currentOp.getChild(childType);
-            } catch (DataNormalizationException e) {
-                throw new IllegalArgumentException(String.format("Failed to get child operation for %s", legacyData), e);
-            }
+        Iterator<PathArgument> arguments = legacy.getPathArguments().iterator();
 
-            if (potentialOp.getIdentifier() instanceof AugmentationIdentifier) {
-                currentOp = potentialOp;
-                ArrayList<PathArgument> reworkedArgs = new ArrayList<>(normalizedPath.getPath());
-                reworkedArgs.add(potentialOp.getIdentifier());
-                normalizedPath = new InstanceIdentifier(reworkedArgs);
-            }
+        while (arguments.hasNext()) {
+            currentOp = currentOp.getChild(arguments.next());
         }
-
-        Preconditions.checkArgument(currentOp != null,
-                "Instance Identifier %s does not reference correct schema Node.", normalizedPath);
-        return new AbstractMap.SimpleEntry<InstanceIdentifier, NormalizedNode<?, ?>>(normalizedPath,
-                currentOp.normalize(legacyData));
+        return currentOp;
     }
 
-    public InstanceIdentifier toLegacy(final InstanceIdentifier normalized) throws DataNormalizationException {
+    public YangInstanceIdentifier toLegacy(final YangInstanceIdentifier normalized) throws DataNormalizationException {
         ImmutableList.Builder<PathArgument> legacyArgs = ImmutableList.builder();
-        PathArgument previous = null;
         DataNormalizationOperation<?> currentOp = operation;
-        for (PathArgument normalizedArg : normalized.getPath()) {
+        for (PathArgument normalizedArg : normalized.getPathArguments()) {
             currentOp = currentOp.getChild(normalizedArg);
-            if(!currentOp.isMixin()) {
+            if (!currentOp.isMixin()) {
                 legacyArgs.add(normalizedArg);
             }
         }
-        return new InstanceIdentifier(legacyArgs.build());
-    }
-
-    public CompositeNode toLegacy(final InstanceIdentifier normalizedPath, final NormalizedNode<?, ?> normalizedData) {
-        // Preconditions.checkArgument(normalizedData instanceof
-        // DataContainerNode<?>,"Node object %s, %s should be of type DataContainerNode",normalizedPath,normalizedData);
-        if (normalizedData instanceof DataContainerNode<?>) {
-            return toLegacyFromDataContainer((DataContainerNode<?>) normalizedData);
-        } else if (normalizedData instanceof AnyXmlNode) {
-            Node<?> value = ((AnyXmlNode) normalizedData).getValue();
-            return value instanceof CompositeNode ? (CompositeNode)value : null;
-        }
-        return null;
-    }
-
-    public static Node<?> toLegacy(final NormalizedNode<?, ?> node) {
-        if (node instanceof MixinNode) {
-            /**
-             * Direct reading of MixinNodes is not supported, since it is not
-             * possible in legacy APIs create pointer to Mixin Nodes.
-             *
-             */
-            return null;
-        }
-
-        if (node instanceof DataContainerNode<?>) {
-            return toLegacyFromDataContainer((DataContainerNode<?>) node);
-        } else if (node instanceof AnyXmlNode) {
-            return ((AnyXmlNode) node).getValue();
-        }
-        return toLegacySimple(node);
-
-    }
-
-    private static SimpleNode<?> toLegacySimple(final NormalizedNode<?, ?> node) {
-        return new SimpleNodeTOImpl<Object>(node.getNodeType(), null, node.getValue());
-    }
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static CompositeNode toLegacyFromDataContainer(final DataContainerNode<?> node) {
-        CompositeNodeBuilder<ImmutableCompositeNode> builder = ImmutableCompositeNode.builder();
-        builder.setQName(node.getNodeType());
-        for (NormalizedNode<?, ?> child : node.getValue()) {
-            if (child instanceof MixinNode && child instanceof NormalizedNodeContainer<?, ?, ?>) {
-                builder.addAll(toLegacyNodesFromMixin((NormalizedNodeContainer) child));
-            } else if( child instanceof UnkeyedListNode) {
-                builder.addAll(toLegacyNodesFromUnkeyedList((UnkeyedListNode) child));
-            } else {
-                addToBuilder(builder, toLegacy(child));
-            }
-        }
-        return builder.toInstance();
-    }
-
-    private static Iterable<? extends Node<?>> toLegacyNodesFromUnkeyedList(final UnkeyedListNode mixin) {
-        ArrayList<Node<?>> ret = new ArrayList<>();
-        for (NormalizedNode<?, ?> child : mixin.getValue()) {
-            ret.add(toLegacy(child));
-        }
-        return FluentIterable.from(ret).filter(Predicates.notNull());
-    }
-
-    private static void addToBuilder(final CompositeNodeBuilder<ImmutableCompositeNode> builder, final Node<?> legacy) {
-        if (legacy != null) {
-            builder.add(legacy);
-        }
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private static Iterable<Node<?>> toLegacyNodesFromMixin(
-            final NormalizedNodeContainer<?, ?, NormalizedNode<?, ?>> mixin) {
-        ArrayList<Node<?>> ret = new ArrayList<>();
-        for (NormalizedNode<?, ?> child : mixin.getValue()) {
-            if (child instanceof MixinNode && child instanceof NormalizedNodeContainer<?, ?, ?>) {
-                Iterables.addAll(ret, toLegacyNodesFromMixin((NormalizedNodeContainer) child));
-            } else {
-                ret.add(toLegacy(child));
-            }
-        }
-        return FluentIterable.from(ret).filter(Predicates.notNull());
+        return YangInstanceIdentifier.create(legacyArgs.build());
     }
 
     public DataNormalizationOperation<?> getRootOperation() {