Remove NormalizedNodeStreamAttributeWriter

This removes NormalizedNodeStreamAttributeWriter, which has been
superseded by NormalizedMetadataStreamWriter. This also forces
XML codec to migrate and take proper care of attribute/metadata
mapping.

JIRA: YANGTOOLS-960
Change-Id: Ie4f54595e9c3bb02b712264a10d49a6fe5513d04
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/ForwardingNormalizedNodeStreamAttributeWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/ForwardingNormalizedNodeStreamAttributeWriter.java
deleted file mode 100644 (file)
index 6a669d7..0000000
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/ForwardingNormalizedNodeStreamAttributeWriter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.yang.data.api.schema.stream;
-
-import java.io.IOException;
-import java.util.Map;
-import org.opendaylight.yangtools.yang.common.QName;
-
-public abstract class ForwardingNormalizedNodeStreamAttributeWriter extends ForwardingNormalizedNodeStreamWriter
-        implements NormalizedNodeStreamAttributeWriter {
-    @Override
-    protected abstract NormalizedNodeStreamAttributeWriter delegate();
-
-    @Override
-    public void attributes(final Map<QName, String> attributes) throws IOException {
-        delegate().attributes(attributes);
-    }
-}

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamAttributeWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamAttributeWriter.java
deleted file mode 100644 (file)
index 664128f..0000000
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamAttributeWriter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2014 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.yang.data.api.schema.stream;
-
-import java.io.IOException;
-import java.util.Map;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- * Extension to the NormalizedNodeStreamWriter with attribute support.
- */
-// FIXME: remove this interface
-public interface NormalizedNodeStreamAttributeWriter extends NormalizedNodeStreamWriter {
-
-    void attributes(Map<QName, String> attributes) throws IOException;
-}

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java
index 6556669a219fa5b4d403b0ad102cbd3704e86044..ef1dcc2b3ee0bd9dd40b0ecb7139aba4b0b0ffe2 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java
@@ -132,27 +132,18 @@ public class NormalizedNodeWriter implements Closeable, Flushable {
         if (node instanceof LeafSetEntryNode) {
             final LeafSetEntryNode<?> nodeAsLeafList = (LeafSetEntryNode<?>)node;
             writer.startLeafSetEntryNode(nodeAsLeafList.getIdentifier());
-            if (writer instanceof NormalizedNodeStreamAttributeWriter) {
-                ((NormalizedNodeStreamAttributeWriter) writer).attributes(nodeAsLeafList.getAttributes());
-            }
             writer.scalarValue(nodeAsLeafList.getValue());
             writer.endNode();
             return true;
         } else if (node instanceof LeafNode) {
             final LeafNode<?> nodeAsLeaf = (LeafNode<?>)node;
             writer.startLeafNode(nodeAsLeaf.getIdentifier());
-            if (writer instanceof NormalizedNodeStreamAttributeWriter) {
-                ((NormalizedNodeStreamAttributeWriter) writer).attributes(nodeAsLeaf.getAttributes());
-            }
             writer.scalarValue(nodeAsLeaf.getValue());
             writer.endNode();
             return true;
         } else if (node instanceof AnyXmlNode) {
             final AnyXmlNode anyXmlNode = (AnyXmlNode)node;
             writer.startAnyxmlNode(anyXmlNode.getIdentifier());
-            if (writer instanceof NormalizedNodeStreamAttributeWriter) {
-                ((NormalizedNodeStreamAttributeWriter) writer).attributes(anyXmlNode.getAttributes());
-            }
             writer.domSourceValue(anyXmlNode.getValue());
             writer.endNode();
             return true;
@@ -179,9 +170,6 @@ public class NormalizedNodeWriter implements Closeable, Flushable {
 
     protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException {
         writer.startMapEntryNode(node.getIdentifier(), childSizeHint(node.getValue()));
-        if (writer instanceof NormalizedNodeStreamAttributeWriter) {
-            ((NormalizedNodeStreamAttributeWriter) writer).attributes(node.getAttributes());
-        }
         return writeChildren(node.getValue());
     }
 
@@ -189,17 +177,11 @@ public class NormalizedNodeWriter implements Closeable, Flushable {
         if (node instanceof ContainerNode) {
             final ContainerNode n = (ContainerNode) node;
             writer.startContainerNode(n.getIdentifier(), childSizeHint(n.getValue()));
-            if (writer instanceof NormalizedNodeStreamAttributeWriter) {
-                ((NormalizedNodeStreamAttributeWriter) writer).attributes(n.getAttributes());
-            }
             return writeChildren(n.getValue());
         }
         if (node instanceof YangModeledAnyXmlNode) {
             final YangModeledAnyXmlNode n = (YangModeledAnyXmlNode) node;
             writer.startYangModeledAnyXmlNode(n.getIdentifier(), childSizeHint(n.getValue()));
-            if (writer instanceof NormalizedNodeStreamAttributeWriter) {
-                ((NormalizedNodeStreamAttributeWriter) writer).attributes(n.getAttributes());
-            }
             return writeChildren(n.getValue());
         }
         if (node instanceof MapEntryNode) {
@@ -260,9 +242,6 @@ public class NormalizedNodeWriter implements Closeable, Flushable {
         protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException {
             final NormalizedNodeStreamWriter nnWriter = getWriter();
             nnWriter.startMapEntryNode(node.getIdentifier(), childSizeHint(node.getValue()));
-            if (nnWriter instanceof NormalizedNodeStreamAttributeWriter) {
-                ((NormalizedNodeStreamAttributeWriter) nnWriter).attributes(node.getAttributes());
-            }
 
             final Set<QName> qnames = node.getIdentifier().getKeyValues().keySet();
             // Write out all the key children