From cb28808ed2f1fa6037102fb260bfe191c4eec75c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 1 Jun 2016 12:29:14 +0200 Subject: [PATCH] BUG-865: Remove users of SchemaAwareNormalizedNodeStreamWriter This is a cleanup of users inside yangtools. This patch should be merged only after all users of deprecated methods have been migrated. Change-Id: Ic659214d84598d1d03dcc9c281352d72caf3cb2e Signed-off-by: Robert Varga --- .../stream/DataSchemaNodeAwareAdaptor.java | 74 ------------------- .../data/codec/gson/JsonParserStream.java | 6 +- .../yang/data/codec/xml/XmlParserStream.java | 10 +-- .../data/util/AbstractNodeDataWithSchema.java | 4 +- .../data/util/AnyXmlNodeDataWithSchema.java | 4 +- .../data/util/ChoiceNodeDataWithSchema.java | 4 +- .../util/CompositeNodeDataWithSchema.java | 14 +--- .../util/ContainerNodeDataWithSchema.java | 4 +- .../util/LeafListEntryNodeDataWithSchema.java | 4 +- .../data/util/LeafListNodeDataWithSchema.java | 4 +- .../data/util/LeafNodeDataWithSchema.java | 4 +- .../util/ListEntryNodeDataWithSchema.java | 4 +- .../data/util/ListNodeDataWithSchema.java | 4 +- .../YangModeledAnyXmlNodeDataWithSchema.java | 4 +- 14 files changed, 30 insertions(+), 114 deletions(-) delete mode 100644 yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAwareAdaptor.java diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAwareAdaptor.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAwareAdaptor.java deleted file mode 100644 index 9264913e9d..0000000000 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/DataSchemaNodeAwareAdaptor.java +++ /dev/null @@ -1,74 +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 com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; -import javax.annotation.Nonnull; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; - -/** - * Utility class for adapting {@link NormalizedNodeStreamWriter}s to their {@link DataSchemaNodeAware} counterparts - * which ignore the provided schema node. - */ -@Beta -public final class DataSchemaNodeAwareAdaptor { - private DataSchemaNodeAwareAdaptor() { - throw new UnsupportedOperationException(); - } - - public static SchemaAwareNormalizedNodeStreamAttributeWriter forAttributeWriter( - @Nonnull final NormalizedNodeStreamAttributeWriter writer) { - Preconditions.checkNotNull(writer, "Writer must not be null"); - - if (writer instanceof SchemaAwareNormalizedNodeStreamAttributeWriter) { - return (SchemaAwareNormalizedNodeStreamAttributeWriter) writer; - } - - return new AttributeWriter() { - @Override - protected NormalizedNodeStreamAttributeWriter delegate() { - return writer; - } - }; - } - - public static SchemaAwareNormalizedNodeStreamWriter forWriter(@Nonnull final NormalizedNodeStreamWriter writer) { - Preconditions.checkNotNull(writer, "Writer must not be null"); - - if (writer instanceof SchemaAwareNormalizedNodeStreamWriter) { - return (SchemaAwareNormalizedNodeStreamWriter) writer; - } - if (writer instanceof NormalizedNodeStreamAttributeWriter) { - return forAttributeWriter((NormalizedNodeStreamAttributeWriter) writer); - } - - return new Writer() { - @Override - protected NormalizedNodeStreamWriter delegate() { - return writer; - } - }; - } - - private static abstract class AttributeWriter extends ForwardingNormalizedNodeStreamAttributeWriter - implements SchemaAwareNormalizedNodeStreamAttributeWriter { - @Override - public void nextDataSchemaNode(final DataSchemaNode schema) { - // Intentional no-op - } - } - - private static abstract class Writer extends ForwardingNormalizedNodeStreamWriter - implements SchemaAwareNormalizedNodeStreamWriter { - @Override - public void nextDataSchemaNode(final DataSchemaNode schema) { - // Intentional no-op - } - } -} diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 275a90dde0..90ade685d9 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -24,9 +24,7 @@ import java.util.Collections; import java.util.Deque; import java.util.HashSet; import java.util.Set; -import org.opendaylight.yangtools.yang.data.api.schema.stream.DataSchemaNodeAwareAdaptor; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.util.AbstractNodeDataWithSchema; import org.opendaylight.yangtools.yang.data.util.AnyXmlNodeDataWithSchema; import org.opendaylight.yangtools.yang.data.util.CompositeNodeDataWithSchema; @@ -56,7 +54,7 @@ import org.opendaylight.yangtools.yang.model.api.YangModeledAnyXmlSchemaNode; @Beta public final class JsonParserStream implements Closeable, Flushable { private final Deque namespaces = new ArrayDeque<>(); - private final SchemaAwareNormalizedNodeStreamWriter writer; + private final NormalizedNodeStreamWriter writer; private final JSONCodecFactory codecs; private final SchemaContext schema; private final DataSchemaNode parentNode; @@ -64,7 +62,7 @@ public final class JsonParserStream implements Closeable, Flushable { private JsonParserStream(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext, final DataSchemaNode parentNode) { this.schema = Preconditions.checkNotNull(schemaContext); - this.writer = DataSchemaNodeAwareAdaptor.forWriter(writer); + this.writer = Preconditions.checkNotNull(writer); this.codecs = JSONCodecFactory.create(schemaContext); this.parentNode = parentNode; } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java index f9e491b4e4..5ee39805fd 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java @@ -25,9 +25,7 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.dom.DOMSource; -import org.opendaylight.yangtools.yang.data.api.schema.stream.DataSchemaNodeAwareAdaptor; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.util.AbstractNodeDataWithSchema; import org.opendaylight.yangtools.yang.data.util.AnyXmlNodeDataWithSchema; import org.opendaylight.yangtools.yang.data.util.CompositeNodeDataWithSchema; @@ -57,7 +55,7 @@ import org.xml.sax.SAXException; public final class XmlParserStream implements Closeable, Flushable { private String rootElement = null; - private final SchemaAwareNormalizedNodeStreamWriter writer; + private final NormalizedNodeStreamWriter writer; private final XmlCodecFactory codecs; private final SchemaContext schema; private final DataSchemaNode parentNode; @@ -65,7 +63,7 @@ public final class XmlParserStream implements Closeable, Flushable { private XmlParserStream(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext, final DataSchemaNode parentNode) { this.schema = Preconditions.checkNotNull(schemaContext); - this.writer = DataSchemaNodeAwareAdaptor.forWriter(writer); + this.writer = Preconditions.checkNotNull(writer); this.codecs = XmlCodecFactory.create(schemaContext); this.parentNode = parentNode; } @@ -115,7 +113,7 @@ public final class XmlParserStream implements Closeable, Flushable { return this; } - private String readAnyXmlValue(XMLStreamReader in) throws XMLStreamException { + private String readAnyXmlValue(final XMLStreamReader in) throws XMLStreamException { String result = ""; String anyXmlElementName = in.getLocalName(); @@ -138,7 +136,7 @@ public final class XmlParserStream implements Closeable, Flushable { return result; } - private void read(final XMLStreamReader in, AbstractNodeDataWithSchema parent) throws XMLStreamException, + private void read(final XMLStreamReader in, final AbstractNodeDataWithSchema parent) throws XMLStreamException, URISyntaxException, ParserConfigurationException, SAXException, IOException { if (in.hasNext()) { if (parent instanceof LeafNodeDataWithSchema || parent instanceof LeafListEntryNodeDataWithSchema) { diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java index 0d5234bdca..861767a9b1 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNodeDataWithSchema.java @@ -12,7 +12,7 @@ import com.google.common.base.Preconditions; import java.io.IOException; import java.util.Objects; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; /** @@ -40,7 +40,7 @@ public abstract class AbstractNodeDataWithSchema { * @param writer Target writer * @throws IOException reported when thrown by the writer. */ - public abstract void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException; + public abstract void write(final NormalizedNodeStreamWriter writer) throws IOException; protected final NodeIdentifier provideNodeIdentifier() { return NodeIdentifier.create(schema.getQName()); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java index 873e280574..a1eac46b48 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; public class AnyXmlNodeDataWithSchema extends SimpleNodeDataWithSchema { @@ -18,7 +18,7 @@ public class AnyXmlNodeDataWithSchema extends SimpleNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { writer.nextDataSchemaNode(getSchema()); writer.leafNode(provideNodeIdentifier(), getValue()); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java index e4813a9a55..009481562e 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -39,7 +39,7 @@ class ChoiceNodeDataWithSchema extends CompositeNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { writer.nextDataSchemaNode(getSchema()); writer.startChoiceNode(provideNodeIdentifier(), childSizeHint()); super.write(writer); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java index 93b87bb20b..4253811c06 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/CompositeNodeDataWithSchema.java @@ -19,10 +19,9 @@ import java.util.Collection; import java.util.Deque; import java.util.List; import java.util.Map.Entry; -import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; @@ -189,7 +188,7 @@ public class CompositeNodeDataWithSchema extends AbstractNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { for (AbstractNodeDataWithSchema child : children) { child.write(writer); } @@ -216,7 +215,7 @@ public class CompositeNodeDataWithSchema extends AbstractNodeDataWithSchema { * @param child child node * @return augmentation schema */ - private AugmentationSchema findCorrespondingAugment(final DataSchemaNode parent, final DataSchemaNode child) { + private static AugmentationSchema findCorrespondingAugment(final DataSchemaNode parent, final DataSchemaNode child) { if (parent instanceof AugmentationTarget && !(parent instanceof ChoiceSchemaNode)) { for (AugmentationSchema augmentation : ((AugmentationTarget) parent).getAvailableAugmentations()) { DataSchemaNode childInAugmentation = augmentation.getDataChildByName(child.getQName()); @@ -233,10 +232,5 @@ public class CompositeNodeDataWithSchema extends AbstractNodeDataWithSchema { return new YangInstanceIdentifier.AugmentationIdentifier(ImmutableSet.copyOf(qnames)); } - private static final Function QNAME_FUNCTION = new Function() { - @Override - public QName apply(@Nonnull final DataSchemaNode input) { - return input.getQName(); - } - }; + private static final Function QNAME_FUNCTION = input -> input.getQName(); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java index ef16192c79..576cdc977a 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; class ContainerNodeDataWithSchema extends CompositeNodeDataWithSchema { @@ -18,7 +18,7 @@ class ContainerNodeDataWithSchema extends CompositeNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { writer.nextDataSchemaNode(getSchema()); writer.startContainerNode(provideNodeIdentifier(), childSizeHint()); super.write(writer); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java index 24ce4b9b69..b2c3928cd3 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; public class LeafListEntryNodeDataWithSchema extends SimpleNodeDataWithSchema { @@ -17,7 +17,7 @@ public class LeafListEntryNodeDataWithSchema extends SimpleNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { writer.nextDataSchemaNode(getSchema()); writer.leafSetEntryNode(getSchema().getQName(), getValue()); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java index 7f1f3e7f01..e7e45e83d3 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; @@ -18,7 +18,7 @@ public class LeafListNodeDataWithSchema extends CompositeNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { final LeafListSchemaNode schema = (LeafListSchemaNode) getSchema(); writer.nextDataSchemaNode(schema); if (schema.isUserOrdered()) { diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java index 6f241cb7b5..e400c8f1b9 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; public class LeafNodeDataWithSchema extends SimpleNodeDataWithSchema { @@ -18,7 +18,7 @@ public class LeafNodeDataWithSchema extends SimpleNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { writer.nextDataSchemaNode(getSchema()); writer.leafNode(provideNodeIdentifier(), getValue()); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java index e9f06f9999..65d927e802 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListEntryNodeDataWithSchema.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; @@ -49,7 +49,7 @@ public class ListEntryNodeDataWithSchema extends CompositeNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { final Collection keyDef = ((ListSchemaNode) getSchema()).getKeyDefinition(); if (keyDef.isEmpty()) { writer.nextDataSchemaNode(getSchema()); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java index 2ec1b02f43..50512e6d27 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ListNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; @@ -19,7 +19,7 @@ public class ListNodeDataWithSchema extends CompositeNodeDataWithSchema { } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { final ListSchemaNode schema = (ListSchemaNode) getSchema(); writer.nextDataSchemaNode(schema); if (schema.getKeyDefinition().isEmpty()) { diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/YangModeledAnyXmlNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/YangModeledAnyXmlNodeDataWithSchema.java index a8f89ec974..c9a5c5ac99 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/YangModeledAnyXmlNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/YangModeledAnyXmlNodeDataWithSchema.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.util; import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.stream.SchemaAwareNormalizedNodeStreamWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.YangModeledAnyXmlSchemaNode; final class YangModeledAnyXmlNodeDataWithSchema extends CompositeNodeDataWithSchema { @@ -18,7 +18,7 @@ final class YangModeledAnyXmlNodeDataWithSchema extends CompositeNodeDataWithSch } @Override - public void write(final SchemaAwareNormalizedNodeStreamWriter writer) throws IOException { + public void write(final NormalizedNodeStreamWriter writer) throws IOException { writer.nextDataSchemaNode(getSchema()); writer.startYangModeledAnyXmlNode(provideNodeIdentifier(), childSizeHint()); super.write(writer); -- 2.36.6