From 02d5aa352315929d3c2511b37c049fea89d0a2a7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 27 Sep 2019 16:09:55 +0200 Subject: [PATCH] Rename Any{Data,Xml}SchemaNode to Any{data,xml}SchemaNode This improves naming consistency, as the statements are called 'anydata' and 'anyxml', not 'any-data' nor 'any-xml'. Change-Id: I5b2563cddba3b39d4b8faa891b85505b61af18b4 Signed-off-by: Robert Varga --- ....java => YangModeledAnyxmlSchemaNode.java} | 4 +-- ...ngModeledAnyxmlEffectiveStatementImpl.java | 10 +++---- .../odlext/parser/Bug3874ExtensionTest.java | 6 ++-- .../GetFilterElementAttributesSchemaNode.java | 6 ++-- .../yangtools/rfc6241/parser/NetconfTest.java | 6 ++-- .../gson/JSONNormalizedNodeStreamWriter.java | 8 +++--- .../data/codec/gson/JsonParserStream.java | 6 ++-- ...reXMLStreamNormalizedNodeStreamWriter.java | 10 +++---- .../yang/data/codec/xml/XmlParserStream.java | 28 +++++++++---------- .../xml/AnydataNormalizeToContainerTest.java | 6 ++-- .../data/codec/xml/AnydataSerializeTest.java | 10 +++---- .../yang/data/codec/xml/Bug8675Test.java | 4 +-- .../YangModeledAnyXMLDeserializationTest.java | 8 +++--- .../yang/data/impl/codec/SchemaTracker.java | 22 +++++++-------- .../yang/data/impl/schema/Builders.java | 8 +++--- .../ImmutableNormalizedNodeStreamWriter.java | 8 +++--- .../data/impl/schema/InstanceIdToNodes.java | 16 +++++------ ...ImmutableAnyXmlNodeSchemaAwareBuilder.java | 6 ++-- ...ImmutableYangModeledAnyXmlNodeBuilder.java | 10 +++---- .../yang/data/impl/schema/BuilderTest.java | 4 +-- .../yang/data/util/AnyXmlContextNode.java | 6 ++-- .../data/util/AnyXmlNodeDataWithSchema.java | 6 ++-- .../yang/data/util/AnydataContextNode.java | 6 ++-- .../data/util/AnydataNodeDataWithSchema.java | 8 +++--- .../util/CompositeNodeDataWithSchema.java | 22 +++++++-------- .../yang/data/util/DataSchemaContextNode.java | 12 ++++---- .../YangModeledAnyXmlNodeDataWithSchema.java | 6 ++-- ...SchemaNode.java => AnydataSchemaNode.java} | 3 +- ...lSchemaNode.java => AnyxmlSchemaNode.java} | 3 +- .../yang/model/api/DataSchemaNode.java | 4 +-- .../yang/model/api/HelperMethods.java | 2 +- .../yang/model/api/package-info.java | 2 +- .../AnydataEffectiveStatementImpl.java | 10 +++---- .../anyxml/AnyxmlEffectiveStatementImpl.java | 10 +++---- .../yang/parser/stmt/rfc7950/Bug6883Test.java | 10 +++---- .../yang/stmt/AugmentProcessTest.java | 6 ++-- .../yang/stmt/DeclaredStatementsTest.java | 4 +-- .../yang/stmt/DeviationResolutionTest.java | 8 +++--- .../yang/stmt/GroupingAndUsesStmtTest.java | 4 +-- .../yangtools/yang/stmt/GroupingTest.java | 10 +++---- .../yang/stmt/IfFeatureResolutionTest.java | 8 +++--- .../yang/stmt/NotificationStmtTest.java | 4 +-- .../yangtools/yang/stmt/RpcStmtTest.java | 6 ++-- .../yang/stmt/YangParserSimpleTest.java | 8 +++--- .../yang/stmt/YangParserWithContextTest.java | 6 ++-- 45 files changed, 179 insertions(+), 181 deletions(-) rename yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/{YangModeledAnyXmlSchemaNode.java => YangModeledAnyxmlSchemaNode.java} (92%) rename yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/{AnyDataSchemaNode.java => AnydataSchemaNode.java} (91%) rename yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/{AnyXmlSchemaNode.java => AnyxmlSchemaNode.java} (88%) diff --git a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/YangModeledAnyXmlSchemaNode.java b/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/YangModeledAnyxmlSchemaNode.java similarity index 92% rename from yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/YangModeledAnyXmlSchemaNode.java rename to yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/YangModeledAnyxmlSchemaNode.java index 5213641fa1..bcfa211415 100644 --- a/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/YangModeledAnyXmlSchemaNode.java +++ b/yang/odlext-model-api/src/main/java/org/opendaylight/yangtools/odlext/model/api/YangModeledAnyxmlSchemaNode.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.odlext.model.api; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaNode; @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; * Statement */ @Beta -public interface YangModeledAnyXmlSchemaNode extends AnyXmlSchemaNode { +public interface YangModeledAnyxmlSchemaNode extends AnyxmlSchemaNode { /** * Returns the root schema node of the data in this anyxml node. diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java index 66ca9fa095..fbb678c557 100644 --- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java +++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java @@ -14,9 +14,9 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; final class YangModeledAnyxmlEffectiveStatementImpl extends ForwardingEffectiveStatement - implements YangModeledAnyXmlSchemaNode, AnyxmlEffectiveStatement { + implements YangModeledAnyxmlSchemaNode, AnyxmlEffectiveStatement { private final @NonNull AnyxmlEffectiveStatement delegate; private final @NonNull ContainerSchemaNode contentSchema; @@ -49,8 +49,8 @@ final class YangModeledAnyxmlEffectiveStatementImpl return contentSchema; } - private AnyXmlSchemaNode delegateSchemaNode() { - return (AnyXmlSchemaNode) delegate; + private AnyxmlSchemaNode delegateSchemaNode() { + return (AnyxmlSchemaNode) delegate; } @Override diff --git a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java b/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java index e48baba606..f0b309d822 100644 --- a/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java +++ b/yang/odlext-parser-support/src/test/java/org/opendaylight/yangtools/odlext/parser/Bug3874ExtensionTest.java @@ -16,7 +16,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.yangtools.odlext.model.api.OpenDaylightExtensionsStatements; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -64,8 +64,8 @@ public class Bug3874ExtensionTest { QName myAnyXmlDataQName = QName.create(foo, "my-anyxml-data"); DataSchemaNode dataChildByName = context.findDataChildByName(myAnyXmlDataQName).get(); - assertTrue(dataChildByName instanceof YangModeledAnyXmlSchemaNode); - YangModeledAnyXmlSchemaNode yangModeledAnyXml = (YangModeledAnyXmlSchemaNode) dataChildByName; + assertTrue(dataChildByName instanceof YangModeledAnyxmlSchemaNode); + YangModeledAnyxmlSchemaNode yangModeledAnyXml = (YangModeledAnyxmlSchemaNode) dataChildByName; SchemaNode myContainer2 = SchemaContextUtil.findDataSchemaNode(context, SchemaPath.create(true, myContainer2QName)); diff --git a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java b/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java index 48aaf7213e..5394df1a52 100644 --- a/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java +++ b/yang/rfc6241-model-api/src/main/java/org/opendaylight/yangtools/rfc6241/model/api/GetFilterElementAttributesSchemaNode.java @@ -9,7 +9,7 @@ package org.opendaylight.yangtools.rfc6241.model.api; import com.google.common.annotations.Beta; import java.util.Optional; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; /** @@ -19,12 +19,12 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @Beta public interface GetFilterElementAttributesSchemaNode extends UnknownSchemaNode { /** - * Attempt to find a {@link GetFilterElementAttributesSchemaNode} in a parent {@link AnyXmlSchemaNode}. + * Attempt to find a {@link GetFilterElementAttributesSchemaNode} in a parent {@link AnyxmlSchemaNode}. * * @param parent Parent to search * @return {@link GetFilterElementAttributesSchemaNode} child, if present. */ - static Optional findIn(final AnyXmlSchemaNode parent) { + static Optional findIn(final AnyxmlSchemaNode parent) { return parent.getUnknownSchemaNodes().stream().filter(GetFilterElementAttributesSchemaNode.class::isInstance) .findAny().map(GetFilterElementAttributesSchemaNode.class::cast); } diff --git a/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java b/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java index dfc633849f..9af969f7a1 100644 --- a/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java +++ b/yang/rfc6241-parser-support/src/test/java/org/opendaylight/yangtools/rfc6241/parser/NetconfTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.opendaylight.yangtools.rfc6241.model.api.GetFilterElementAttributesSchemaNode; import org.opendaylight.yangtools.rfc6241.model.api.NetconfConstants; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; @@ -75,8 +75,8 @@ public class NetconfTest { final Optional optFilter = def.getInput().findDataTreeChild(FILTER); assertEquals(expected, optFilter.isPresent()); optFilter.ifPresent(filter -> { - assertThat(filter, is(instanceOf(AnyXmlSchemaNode.class))); - assertTrue(GetFilterElementAttributesSchemaNode.findIn((AnyXmlSchemaNode) filter).isPresent()); + assertThat(filter, is(instanceOf(AnyxmlSchemaNode.class))); + assertTrue(GetFilterElementAttributesSchemaNode.findIn((AnyxmlSchemaNode) filter).isPresent()); }); } } diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java index 6bac91c4a5..6d3ba419fa 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java @@ -33,8 +33,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriterExtension; import org.opendaylight.yangtools.yang.data.impl.codec.SchemaTracker; import org.opendaylight.yangtools.yang.data.util.SingleChildDataNodeContainer; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -358,7 +358,7 @@ public abstract class JSONNormalizedNodeStreamWriter implements NormalizedNodeSt final Object current = tracker.getParent(); if (current instanceof TypedDataSchemaNode) { writeValue(value, codecs.codecFor((TypedDataSchemaNode) current)); - } else if (current instanceof AnyDataSchemaNode) { + } else if (current instanceof AnydataSchemaNode) { writeAnydataValue(value); } else { throw new IllegalStateException(String.format("Cannot emit scalar %s for %s", value, current)); @@ -368,7 +368,7 @@ public abstract class JSONNormalizedNodeStreamWriter implements NormalizedNodeSt @Override public void domSourceValue(final DOMSource value) throws IOException { final Object current = tracker.getParent(); - checkState(current instanceof AnyXmlSchemaNode, "Cannot emit DOMSource %s for %s", value, current); + checkState(current instanceof AnyxmlSchemaNode, "Cannot emit DOMSource %s for %s", value, current); // FIXME: should have a codec based on this :) writeAnyXmlValue(value); } 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 ede58a5a18..0ef409c10b 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 @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Set; import javax.xml.transform.dom.DOMSource; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.util.AbstractNodeDataWithSchema; @@ -240,8 +240,8 @@ public final class JsonParserStream implements Closeable, Flushable { while (in.hasNext()) { final String jsonElementName = in.nextName(); DataSchemaNode parentSchema = parent.getSchema(); - if (parentSchema instanceof YangModeledAnyXmlSchemaNode) { - parentSchema = ((YangModeledAnyXmlSchemaNode) parentSchema).getSchemaOfAnyXmlData(); + if (parentSchema instanceof YangModeledAnyxmlSchemaNode) { + parentSchema = ((YangModeledAnyxmlSchemaNode) parentSchema).getSchemaOfAnyXmlData(); } final Entry namespaceAndName = resolveNamespace(jsonElementName, parentSchema); final String localName = namespaceAndName.getKey(); diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java index 7185cabe27..86f4041bac 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamNormalizedNodeStreamWriter.java @@ -24,8 +24,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.impl.codec.SchemaTracker; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -88,7 +88,7 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter extends XMLStreamNorm endElement(); } } else if (schema instanceof ContainerSchemaNode || schema instanceof LeafSchemaNode - || schema instanceof AnyDataSchemaNode || schema instanceof AnyXmlSchemaNode) { + || schema instanceof AnydataSchemaNode || schema instanceof AnyxmlSchemaNode) { endElement(); } } @@ -153,7 +153,7 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter extends XMLStreamNorm final Object current = tracker.getParent(); if (current instanceof TypedDataSchemaNode) { writeValue(value, (SchemaNode) current); - } else if (current instanceof AnyDataSchemaNode) { + } else if (current instanceof AnydataSchemaNode) { anydataValue(value); } else { throw new IllegalStateException("Unexpected scalar value " + value + " with " + current); @@ -163,7 +163,7 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter extends XMLStreamNorm @Override public void domSourceValue(final DOMSource value) throws IOException { final Object current = tracker.getParent(); - checkState(current instanceof AnyXmlSchemaNode, "Unexpected scala value %s with %s", value, current); + checkState(current instanceof AnyxmlSchemaNode, "Unexpected scala value %s with %s", value, current); anyxmlValue(value); } 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 93dc036dd7..53952b1694 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 @@ -42,7 +42,7 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stax.StAXSource; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.rfc7952.model.api.AnnotationSchemaNode; import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext; import org.opendaylight.yangtools.rfc8528.data.api.MountPointContextFactory; @@ -70,8 +70,8 @@ import org.opendaylight.yangtools.yang.data.util.OperationAsContainer; import org.opendaylight.yangtools.yang.data.util.ParserStreamUtils; import org.opendaylight.yangtools.yang.data.util.SimpleNodeDataWithSchema; import org.opendaylight.yangtools.yang.data.util.YangModeledAnyXmlNodeDataWithSchema; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; @@ -253,16 +253,16 @@ public final class XmlParserStream implements Closeable, Flushable { nodeDataWithSchema = new ContainerNodeDataWithSchema((ContainerSchemaNode) parentNode); } else if (parentNode instanceof ListSchemaNode) { nodeDataWithSchema = new ListNodeDataWithSchema((ListSchemaNode) parentNode); - } else if (parentNode instanceof YangModeledAnyXmlSchemaNode) { - nodeDataWithSchema = new YangModeledAnyXmlNodeDataWithSchema((YangModeledAnyXmlSchemaNode) parentNode); - } else if (parentNode instanceof AnyXmlSchemaNode) { - nodeDataWithSchema = new AnyXmlNodeDataWithSchema((AnyXmlSchemaNode) parentNode); + } else if (parentNode instanceof YangModeledAnyxmlSchemaNode) { + nodeDataWithSchema = new YangModeledAnyXmlNodeDataWithSchema((YangModeledAnyxmlSchemaNode) parentNode); + } else if (parentNode instanceof AnyxmlSchemaNode) { + nodeDataWithSchema = new AnyXmlNodeDataWithSchema((AnyxmlSchemaNode) parentNode); } else if (parentNode instanceof LeafSchemaNode) { nodeDataWithSchema = new LeafNodeDataWithSchema((LeafSchemaNode) parentNode); } else if (parentNode instanceof LeafListSchemaNode) { nodeDataWithSchema = new LeafListNodeDataWithSchema((LeafListSchemaNode) parentNode); - } else if (parentNode instanceof AnyDataSchemaNode) { - nodeDataWithSchema = new AnydataNodeDataWithSchema((AnyDataSchemaNode) parentNode); + } else if (parentNode instanceof AnydataSchemaNode) { + nodeDataWithSchema = new AnydataNodeDataWithSchema((AnydataSchemaNode) parentNode); } else { throw new IllegalStateException("Unsupported schema node type " + parentNode.getClass() + "."); } @@ -430,7 +430,7 @@ public final class XmlParserStream implements Closeable, Flushable { return; } - if (parent instanceof YangModeledAnyXmlSchemaNode) { + if (parent instanceof YangModeledAnyxmlSchemaNode) { parent.setAttributes(getElementAttributes(in)); } @@ -460,8 +460,8 @@ public final class XmlParserStream implements Closeable, Flushable { break; } - if (parentSchema instanceof YangModeledAnyXmlSchemaNode) { - parentSchema = ((YangModeledAnyXmlSchemaNode) parentSchema).getSchemaOfAnyXmlData(); + if (parentSchema instanceof YangModeledAnyxmlSchemaNode) { + parentSchema = ((YangModeledAnyxmlSchemaNode) parentSchema).getSchemaOfAnyXmlData(); } final String elementNS = in.getNamespaceURI(); @@ -609,7 +609,7 @@ public final class XmlParserStream implements Closeable, Flushable { private Object translateValueByType(final Object value, final DataSchemaNode node, final NamespaceContext namespaceCtx) { - if (node instanceof AnyXmlSchemaNode) { + if (node instanceof AnyxmlSchemaNode) { checkArgument(value instanceof Document); /* * FIXME: Figure out some YANG extension dispatch, which will reuse JSON parsing or XML parsing - @@ -617,7 +617,7 @@ public final class XmlParserStream implements Closeable, Flushable { */ return new DOMSource(((Document) value).getDocumentElement()); } - if (node instanceof AnyDataSchemaNode) { + if (node instanceof AnydataSchemaNode) { checkArgument(value instanceof Document); return new DOMSourceAnydata(new DOMSource(((Document) value).getDocumentElement())); } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataNormalizeToContainerTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataNormalizeToContainerTest.java index 926dfdc18a..b65b22b71e 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataNormalizeToContainerTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataNormalizeToContainerTest.java @@ -23,7 +23,7 @@ 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.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -38,8 +38,8 @@ public class AnydataNormalizeToContainerTest extends AbstractAnydataTest { //Create Data Scheme from yang file SchemaPath anydataPath = SchemaPath.create(true, FOO_QNAME); final SchemaNode fooSchemaNode = SchemaContextUtil.findDataSchemaNode(SCHEMA_CONTEXT, anydataPath); - assertTrue(fooSchemaNode instanceof AnyDataSchemaNode); - final AnyDataSchemaNode anyDataSchemaNode = (AnyDataSchemaNode) fooSchemaNode; + assertTrue(fooSchemaNode instanceof AnydataSchemaNode); + final AnydataSchemaNode anyDataSchemaNode = (AnydataSchemaNode) fooSchemaNode; SchemaPath containerPath = SchemaPath.create(true, CONT_QNAME); final SchemaNode barSchemaNode = SchemaContextUtil.findDataSchemaNode(SCHEMA_CONTEXT, containerPath); diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataSerializeTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataSerializeTest.java index 2d8c9b5480..b3acfb8605 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataSerializeTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/AnydataSerializeTest.java @@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableAnydataNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.util.ImmutableNormalizedAnydata; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; @@ -87,8 +87,8 @@ public class AnydataSerializeTest extends AbstractAnydataTest { //Create Data Scheme from yang file SchemaPath anydataPath = SchemaPath.create(true, FOO_QNAME); final SchemaNode dataSchemaNode = SchemaContextUtil.findDataSchemaNode(SCHEMA_CONTEXT, anydataPath); - assertTrue(dataSchemaNode instanceof AnyDataSchemaNode); - final AnyDataSchemaNode anyDataSchemaNode = (AnyDataSchemaNode) dataSchemaNode; + assertTrue(dataSchemaNode instanceof AnydataSchemaNode); + final AnydataSchemaNode anyDataSchemaNode = (AnydataSchemaNode) dataSchemaNode; // deserialization final XMLStreamReader reader @@ -137,7 +137,7 @@ public class AnydataSerializeTest extends AbstractAnydataTest { //Load XML from file and write it with xmlParseStream final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument()); final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult); - final AnyDataSchemaNode anyDataSchemaNode = (AnyDataSchemaNode) SchemaContextUtil.findDataSchemaNode( + final AnydataSchemaNode anyDataSchemaNode = (AnydataSchemaNode) SchemaContextUtil.findDataSchemaNode( SCHEMA_CONTEXT, SchemaPath.create(true, FOO_QNAME)); final NormalizedNodeStreamWriter streamWriter = XMLStreamNormalizedNodeStreamWriter.create( xmlStreamWriter, SCHEMA_CONTEXT); @@ -169,7 +169,7 @@ public class AnydataSerializeTest extends AbstractAnydataTest { final DOMSource domSource = new DOMSource(doc.getDocumentElement()); //Get specific attribute from Yang file. - final AnyDataSchemaNode contWithAttr = (AnyDataSchemaNode) SchemaContextUtil.findDataSchemaNode( + final AnydataSchemaNode contWithAttr = (AnydataSchemaNode) SchemaContextUtil.findDataSchemaNode( SCHEMA_CONTEXT, SchemaPath.create(true, FOO_QNAME)); //Create NormalizedNodeResult diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug8675Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug8675Test.java index cd4ef6dd77..cc1895e0dd 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug8675Test.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug8675Test.java @@ -21,7 +21,7 @@ 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.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -108,7 +108,7 @@ public class Bug8675Test { @Test public void testAnyXmlAsRootElement() throws Exception { - final AnyXmlSchemaNode topLevelAnyXml = (AnyXmlSchemaNode) fooModule.findDataChildByName( + final AnyxmlSchemaNode topLevelAnyXml = (AnyxmlSchemaNode) fooModule.findDataChildByName( QName.create(fooModule.getQNameModule(), "top-level-anyxml")).get(); final InputStream resourceAsStream = XmlToNormalizedNodesTest.class.getResourceAsStream("/bug8675/foo-4.xml"); diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java index c41876f9b0..4ec503def9 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java @@ -18,7 +18,7 @@ import java.util.Optional; import javax.xml.stream.XMLStreamReader; import org.junit.Before; import org.junit.Test; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -77,7 +77,7 @@ public class YangModeledAnyXMLDeserializationTest { public void testRawAnyXMLFromBar() throws Exception { DataSchemaNode barContainer = schemaContext.findDataChildByName(QName.create(barModuleQName, "bar")).get(); assertTrue(barContainer instanceof ContainerSchemaNode); - final YangModeledAnyXmlSchemaNode yangModeledAnyXML = new YangModeledAnyXMLSchemaNodeImplTest(myAnyXMLDataBar, + final YangModeledAnyxmlSchemaNode yangModeledAnyXML = new YangModeledAnyXMLSchemaNodeImplTest(myAnyXMLDataBar, (ContainerSchemaNode) barContainer); final InputStream resourceAsStream = YangModeledAnyXMLDeserializationTest.class.getResourceAsStream( @@ -117,7 +117,7 @@ public class YangModeledAnyXMLDeserializationTest { final InputStream resourceAsStream = YangModeledAnyXMLDeserializationTest.class.getResourceAsStream( "/anyxml-support/xml/foo.xml"); final Module foo = schemaContext.findModules("foo").iterator().next(); - final YangModeledAnyXmlSchemaNode myAnyXmlData = (YangModeledAnyXmlSchemaNode) foo.findDataChildByName( + final YangModeledAnyxmlSchemaNode myAnyXmlData = (YangModeledAnyxmlSchemaNode) foo.findDataChildByName( QName.create(foo.getQNameModule(), "my-anyxml-data")).get(); final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream); @@ -161,7 +161,7 @@ public class YangModeledAnyXMLDeserializationTest { assertEquals("any-xml-leaf-3-value", leafNode3Value); } - private static final class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyXmlSchemaNode { + private static final class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyxmlSchemaNode { private final QName qname; private final ContainerSchemaNode contentSchema; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java index 00cb904333..40e86f3ee8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java @@ -18,7 +18,7 @@ import java.util.Collection; import java.util.Deque; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -26,8 +26,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithV import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; @@ -217,10 +217,10 @@ public final class SchemaTracker { LOG.debug("Enter yang modeled anyXml {}", name); final SchemaNode schema = getSchema(name); - checkArgument(schema instanceof YangModeledAnyXmlSchemaNode, "Node %s is not an yang modeled anyXml.", + checkArgument(schema instanceof YangModeledAnyxmlSchemaNode, "Node %s is not an yang modeled anyXml.", schema.getPath()); - schemaStack.push(((YangModeledAnyXmlSchemaNode) schema).getSchemaOfAnyXmlData()); + schemaStack.push(((YangModeledAnyxmlSchemaNode) schema).getSchemaOfAnyXmlData()); return schema; } @@ -243,20 +243,20 @@ public final class SchemaTracker { return resolvedSchema; } - public AnyXmlSchemaNode anyxmlNode(final NodeIdentifier name) { + public AnyxmlSchemaNode anyxmlNode(final NodeIdentifier name) { final SchemaNode schema = getSchema(name); - checkArgument(schema instanceof AnyXmlSchemaNode, "Node %s is not anyxml", schema.getPath()); - return (AnyXmlSchemaNode)schema; + checkArgument(schema instanceof AnyxmlSchemaNode, "Node %s is not anyxml", schema.getPath()); + return (AnyxmlSchemaNode)schema; } public void startAnyxmlNode(final NodeIdentifier name) { schemaStack.push(anyxmlNode(name)); } - public AnyDataSchemaNode anydataNode(final NodeIdentifier name) { + public AnydataSchemaNode anydataNode(final NodeIdentifier name) { final SchemaNode schema = getSchema(name); - checkArgument(schema instanceof AnyDataSchemaNode, "Node %s is not anydata", schema.getPath()); - return (AnyDataSchemaNode)schema; + checkArgument(schema instanceof AnydataSchemaNode, "Node %s is not anydata", schema.getPath()); + return (AnydataSchemaNode)schema; } public void startAnydataNode(final NodeIdentifier name) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java index 8c0f927210..8b81e42309 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import javax.xml.transform.dom.DOMSource; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; 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; @@ -57,7 +57,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableOr import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableYangModeledAnyXmlNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -94,12 +94,12 @@ public final class Builders { } public static NormalizedNodeBuilder anyXmlBuilder( - final AnyXmlSchemaNode schema) { + final AnyxmlSchemaNode schema) { return ImmutableAnyXmlNodeSchemaAwareBuilder.create(schema); } public static DataContainerNodeBuilder yangModeledAnyXmlBuilder( - final YangModeledAnyXmlSchemaNode schema) { + final YangModeledAnyxmlSchemaNode schema) { return ImmutableYangModeledAnyXmlNodeBuilder.create(schema); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java index c1f9dc0357..852019175f 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java @@ -18,7 +18,7 @@ import java.util.ArrayDeque; import java.util.Deque; import javax.xml.transform.dom.DOMSource; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; 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; @@ -191,9 +191,9 @@ public class ImmutableNormalizedNodeStreamWriter implements NormalizedNodeStream public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint) { checkDataNodeContainer(); - checkArgument(nextSchema instanceof YangModeledAnyXmlSchemaNode, - "Schema of this node should be instance of YangModeledAnyXmlSchemaNode"); - final YangModeledAnyXmlSchemaNode anyxmlSchema = (YangModeledAnyXmlSchemaNode) nextSchema; + checkArgument(nextSchema instanceof YangModeledAnyxmlSchemaNode, + "Schema of this node should be instance of YangModeledAnyxmlSchemaNode"); + final YangModeledAnyxmlSchemaNode anyxmlSchema = (YangModeledAnyxmlSchemaNode) nextSchema; enter(name, UNKNOWN_SIZE == childSizeHint ? ImmutableYangModeledAnyXmlNodeBuilder.create(anyxmlSchema) : ImmutableYangModeledAnyXmlNodeBuilder.create(anyxmlSchema, childSizeHint)); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java index c9e9b258b4..43c13bba67 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java @@ -27,8 +27,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; @@ -111,7 +111,7 @@ abstract class InstanceIdToNodes extends AbstractIdentif } private static final class AnydataNormalization extends AbstractOpaqueNormalization { - AnydataNormalization(final AnyDataSchemaNode schema) { + AnydataNormalization(final AnydataSchemaNode schema) { super(schema); } @@ -131,7 +131,7 @@ abstract class InstanceIdToNodes extends AbstractIdentif } private static final class AnyXmlNormalization extends AbstractOpaqueNormalization { - AnyXmlNormalization(final AnyXmlSchemaNode schema) { + AnyXmlNormalization(final AnyxmlSchemaNode schema) { super(schema); } @@ -212,10 +212,10 @@ abstract class InstanceIdToNodes extends AbstractIdentif return new InstanceIdToCompositeNodes.ChoiceNodeNormalization((ChoiceSchemaNode) potential); } else if (potential instanceof LeafListSchemaNode) { return fromLeafListSchemaNode((LeafListSchemaNode) potential); - } else if (potential instanceof AnyDataSchemaNode) { - return new AnydataNormalization((AnyDataSchemaNode) potential); - } else if (potential instanceof AnyXmlSchemaNode) { - return new AnyXmlNormalization((AnyXmlSchemaNode) potential); + } else if (potential instanceof AnydataSchemaNode) { + return new AnydataNormalization((AnydataSchemaNode) potential); + } else if (potential instanceof AnyxmlSchemaNode) { + return new AnyXmlNormalization((AnyxmlSchemaNode) potential); } return null; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java index 0ebe62031e..c48e3e5c5a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java @@ -12,16 +12,16 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; public final class ImmutableAnyXmlNodeSchemaAwareBuilder extends ImmutableAnyXmlNodeBuilder { - private ImmutableAnyXmlNodeSchemaAwareBuilder(final AnyXmlSchemaNode schema) { + private ImmutableAnyXmlNodeSchemaAwareBuilder(final AnyxmlSchemaNode schema) { super.withNodeIdentifier(NodeIdentifier.create(schema.getQName())); } public static @NonNull NormalizedNodeBuilder create( - final AnyXmlSchemaNode schema) { + final AnyxmlSchemaNode schema) { return new ImmutableAnyXmlNodeSchemaAwareBuilder(schema); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java index 3abeea8220..ed45e08536 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java @@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.YangModeledAnyXmlNode; @@ -24,13 +24,13 @@ public final class ImmutableYangModeledAnyXmlNodeBuilder extends private final ContainerSchemaNode contentSchema; - private ImmutableYangModeledAnyXmlNodeBuilder(final YangModeledAnyXmlSchemaNode yangModeledAnyXMLSchemaNode) { + private ImmutableYangModeledAnyXmlNodeBuilder(final YangModeledAnyxmlSchemaNode yangModeledAnyXMLSchemaNode) { requireNonNull(yangModeledAnyXMLSchemaNode, "Yang modeled any xml node must not be null."); super.withNodeIdentifier(NodeIdentifier.create(yangModeledAnyXMLSchemaNode.getQName())); this.contentSchema = yangModeledAnyXMLSchemaNode.getSchemaOfAnyXmlData(); } - private ImmutableYangModeledAnyXmlNodeBuilder(final YangModeledAnyXmlSchemaNode yangModeledAnyXMLSchemaNode, + private ImmutableYangModeledAnyXmlNodeBuilder(final YangModeledAnyxmlSchemaNode yangModeledAnyXMLSchemaNode, final int sizeHint) { super(sizeHint); requireNonNull(yangModeledAnyXMLSchemaNode, "Yang modeled any xml node must not be null."); @@ -39,12 +39,12 @@ public final class ImmutableYangModeledAnyXmlNodeBuilder extends } public static @NonNull DataContainerNodeBuilder create( - final YangModeledAnyXmlSchemaNode yangModeledAnyXMLSchemaNode) { + final YangModeledAnyxmlSchemaNode yangModeledAnyXMLSchemaNode) { return new ImmutableYangModeledAnyXmlNodeBuilder(yangModeledAnyXMLSchemaNode); } public static @NonNull DataContainerNodeBuilder create( - final YangModeledAnyXmlSchemaNode yangModeledAnyXMLSchemaNode, final int sizeHint) { + final YangModeledAnyxmlSchemaNode yangModeledAnyXMLSchemaNode, final int sizeHint) { return new ImmutableYangModeledAnyXmlNodeBuilder(yangModeledAnyXMLSchemaNode, sizeHint); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java index 98e683aa50..e2368452ff 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.util.UnmodifiableCollection; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -270,7 +270,7 @@ public class BuilderTest { @Test(expected = NullPointerException.class) public void immutableYangModeledAnyXmlNodeBuilderExceptionTest() { - ImmutableYangModeledAnyXmlNodeBuilder.create(mock(YangModeledAnyXmlSchemaNode.class), 1); + ImmutableYangModeledAnyXmlNodeBuilder.create(mock(YangModeledAnyxmlSchemaNode.class), 1); } @Test(expected = UnsupportedOperationException.class) diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java index 51fba5a22f..94ec33e1bc 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.yang.data.util; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; -final class AnyXmlContextNode extends AbstractOpaqueContextNode { - AnyXmlContextNode(final AnyXmlSchemaNode schema) { +final class AnyXmlContextNode extends AbstractOpaqueContextNode { + AnyXmlContextNode(final AnyxmlSchemaNode schema) { super(schema); } } 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 ac07b62a37..584ea773b8 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 @@ -11,7 +11,7 @@ import java.io.IOException; import javax.xml.transform.dom.DOMSource; import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadataStreamWriter; 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.AnyxmlSchemaNode; /** * Utility class used for tracking parser state as needed by a StAX-like parser. @@ -20,9 +20,9 @@ import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; *

* Represents a YANG anyxml node. */ -public class AnyXmlNodeDataWithSchema extends SimpleNodeDataWithSchema { +public class AnyXmlNodeDataWithSchema extends SimpleNodeDataWithSchema { - public AnyXmlNodeDataWithSchema(final AnyXmlSchemaNode dataSchemaNode) { + public AnyXmlNodeDataWithSchema(final AnyxmlSchemaNode dataSchemaNode) { super(dataSchemaNode); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataContextNode.java index 2c41ee4adc..6cd9e8e5da 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataContextNode.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.yang.data.util; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; -final class AnydataContextNode extends AbstractOpaqueContextNode { - AnydataContextNode(final AnyDataSchemaNode schema) { +final class AnydataContextNode extends AbstractOpaqueContextNode { + AnydataContextNode(final AnydataSchemaNode schema) { super(schema); } } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java index 87b25a833d..2c67cab29b 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnydataNodeDataWithSchema.java @@ -17,17 +17,17 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadataStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.AnydataExtension; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; @Beta -public class AnydataNodeDataWithSchema extends SimpleNodeDataWithSchema { +public class AnydataNodeDataWithSchema extends SimpleNodeDataWithSchema { private Class objectModel; - public AnydataNodeDataWithSchema(final AnyDataSchemaNode dataSchemaNode) { + public AnydataNodeDataWithSchema(final AnydataSchemaNode dataSchemaNode) { super(dataSchemaNode); } - public AnydataNodeDataWithSchema(final AnyDataSchemaNode dataSchemaNode, final Class objectModel) { + public AnydataNodeDataWithSchema(final AnydataSchemaNode dataSchemaNode, final Class objectModel) { super(dataSchemaNode); this.objectModel = requireNonNull(objectModel); } 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 4894aa5f0c..34e97a1c8f 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 @@ -17,11 +17,11 @@ import java.util.Collection; import java.util.Deque; import java.util.List; import java.util.Map.Entry; -import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadataStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; @@ -112,14 +112,14 @@ public class CompositeNodeDataWithSchema extends Abstr SimpleNodeDataWithSchema newChild = null; if (schema instanceof LeafSchemaNode) { newChild = new LeafNodeDataWithSchema((LeafSchemaNode) schema); - } else if (schema instanceof AnyXmlSchemaNode) { - // YangModeledAnyXmlSchemaNode is handled by addCompositeChild method. - if (schema instanceof YangModeledAnyXmlSchemaNode) { + } else if (schema instanceof AnyxmlSchemaNode) { + // YangModeledAnyxmlSchemaNode is handled by addCompositeChild method. + if (schema instanceof YangModeledAnyxmlSchemaNode) { return null; } - newChild = new AnyXmlNodeDataWithSchema((AnyXmlSchemaNode) schema); - } else if (schema instanceof AnyDataSchemaNode) { - newChild = new AnydataNodeDataWithSchema((AnyDataSchemaNode) schema); + newChild = new AnyXmlNodeDataWithSchema((AnyxmlSchemaNode) schema); + } else if (schema instanceof AnydataSchemaNode) { + newChild = new AnydataNodeDataWithSchema((AnydataSchemaNode) schema); } else { return null; } @@ -165,8 +165,8 @@ public class CompositeNodeDataWithSchema extends Abstr newChild = new LeafListNodeDataWithSchema((LeafListSchemaNode) schema); } else if (schema instanceof ContainerSchemaNode) { newChild = new ContainerNodeDataWithSchema((ContainerSchemaNode) schema); - } else if (schema instanceof YangModeledAnyXmlSchemaNode) { - newChild = new YangModeledAnyXmlNodeDataWithSchema((YangModeledAnyXmlSchemaNode)schema); + } else if (schema instanceof YangModeledAnyxmlSchemaNode) { + newChild = new YangModeledAnyXmlNodeDataWithSchema((YangModeledAnyxmlSchemaNode)schema); } else { newChild = new CompositeNodeDataWithSchema<>(schema); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java index 03f80669ba..3b83de3b14 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java @@ -20,8 +20,8 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; @@ -171,10 +171,10 @@ public abstract class DataSchemaContextNode extends Abst return new ChoiceNodeContextNode((ChoiceSchemaNode) potential); } else if (potential instanceof LeafListSchemaNode) { return fromLeafListSchemaNode((LeafListSchemaNode) potential); - } else if (potential instanceof AnyDataSchemaNode) { - return new AnydataContextNode((AnyDataSchemaNode) potential); - } else if (potential instanceof AnyXmlSchemaNode) { - return new AnyXmlContextNode((AnyXmlSchemaNode) potential); + } else if (potential instanceof AnydataSchemaNode) { + return new AnydataContextNode((AnydataSchemaNode) potential); + } else if (potential instanceof AnyxmlSchemaNode) { + return new AnyXmlContextNode((AnyxmlSchemaNode) potential); } return null; } 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 c55cba702b..fe481a4a16 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.odlext.model.api.YangModeledAnyXmlSchemaNode; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.rfc7952.data.api.NormalizedMetadataStreamWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; @@ -20,9 +20,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre * Represents a YANG-modeled-anyxml node. */ public final class YangModeledAnyXmlNodeDataWithSchema - extends CompositeNodeDataWithSchema { + extends CompositeNodeDataWithSchema { - public YangModeledAnyXmlNodeDataWithSchema(final YangModeledAnyXmlSchemaNode yangModeledAnyXml) { + public YangModeledAnyXmlNodeDataWithSchema(final YangModeledAnyxmlSchemaNode yangModeledAnyXml) { super(yangModeledAnyXml); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyDataSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java similarity index 91% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyDataSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java index 0ba7cfaee3..2e5fc2e555 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyDataSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnydataSchemaNode.java @@ -20,9 +20,8 @@ import java.util.Optional; * model for anydata content to become known through protocol signaling or other means that are outside the scope * of this document. */ -// FIXME: 4.0.0: rename this to 'AnydataSchemaNode' @Beta -public interface AnyDataSchemaNode extends DataSchemaNode, MandatoryAware, MustConstraintAware { +public interface AnydataSchemaNode extends DataSchemaNode, MandatoryAware, MustConstraintAware { /** * Schema of data. * diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java similarity index 88% rename from yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java index c8c2513dfb..37a8595227 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyxmlSchemaNode.java @@ -16,7 +16,6 @@ package org.opendaylight.yangtools.yang.model.api; * This interface was modeled according to definition in * [RFC-6020] The anyxml Statement */ -// FIXME: 4.0.0: rename this to 'AnyxmlSchemaNode' -public interface AnyXmlSchemaNode extends DataSchemaNode, MandatoryAware, MustConstraintAware { +public interface AnyxmlSchemaNode extends DataSchemaNode, MandatoryAware, MustConstraintAware { } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java index ab6650eb5a..cf9e60fc95 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java @@ -23,8 +23,8 @@ package org.opendaylight.yangtools.yang.model.api; * @see ChoiceSchemaNode * @see CaseSchemaNode * @see LeafSchemaNode - * @see AnyXmlSchemaNode - * @see AnyDataSchemaNode + * @see AnyxmlSchemaNode + * @see AnydataSchemaNode */ public interface DataSchemaNode extends SchemaNode, CopyableNode, WhenConditionAware { /** diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java index 054f5cd6e4..3323cc9c59 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/HelperMethods.java @@ -28,6 +28,6 @@ final class HelperMethods { private static boolean isDataNode(final DataSchemaNode node) { return node instanceof ContainerSchemaNode || node instanceof LeafSchemaNode || node instanceof LeafListSchemaNode || node instanceof ListSchemaNode - || node instanceof AnyDataSchemaNode || node instanceof AnyXmlSchemaNode; + || node instanceof AnydataSchemaNode || node instanceof AnyxmlSchemaNode; } } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java index cd3cb5ed1f..da81108ba5 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java @@ -31,7 +31,7 @@ * *

*
anyxml - *
{@link org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode} + *
{@link org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode} * *
argument *
{@link org.opendaylight.yangtools.yang.model.api.ExtensionDefinition#getArgument()} diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java index 06fa4a5104..f9031abc65 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataEffectiveStatementImpl.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.Objects; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.MustDefinition; @@ -30,17 +30,17 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; */ @Beta final class AnydataEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode - implements AnydataEffectiveStatement, AnyDataSchemaNode, DerivableSchemaNode { + implements AnydataEffectiveStatement, AnydataSchemaNode, DerivableSchemaNode { private final ImmutableSet mustConstraints; - private final AnyDataSchemaNode original; + private final AnydataSchemaNode original; private final ContainerSchemaNode schema; private final boolean mandatory; AnydataEffectiveStatementImpl( final StmtContext> ctx) { super(ctx); - this.original = (AnyDataSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); + this.original = (AnydataSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); mandatory = findFirstEffectiveSubstatementArgument(MandatoryEffectiveStatement.class).orElse(Boolean.FALSE) .booleanValue(); mustConstraints = ImmutableSet.copyOf(allSubstatementsOfType(MustDefinition.class)); @@ -52,7 +52,7 @@ final class AnydataEffectiveStatementImpl extends AbstractEffectiveDataSchemaNod } @Override - public Optional getOriginal() { + public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java index 2452efc812..7f29cf513f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlEffectiveStatementImpl.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Objects; import java.util.Optional; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement; @@ -22,15 +22,15 @@ import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveData import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class AnyxmlEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode - implements AnyxmlEffectiveStatement, AnyXmlSchemaNode, DerivableSchemaNode { + implements AnyxmlEffectiveStatement, AnyxmlSchemaNode, DerivableSchemaNode { private final ImmutableSet mustConstraints; - private final AnyXmlSchemaNode original; + private final AnyxmlSchemaNode original; private final boolean mandatory; AnyxmlEffectiveStatementImpl(final StmtContext ctx) { super(ctx); - this.original = (AnyXmlSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); + this.original = (AnyxmlSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null); mandatory = findFirstEffectiveSubstatementArgument(MandatoryEffectiveStatement.class).orElse(Boolean.FALSE) .booleanValue(); mustConstraints = ImmutableSet.copyOf(allSubstatementsOfType(MustDefinition.class)); @@ -47,7 +47,7 @@ final class AnyxmlEffectiveStatementImpl extends AbstractEffectiveDataSchemaNode } @Override - public Optional getOriginal() { + public Optional getOriginal() { return Optional.ofNullable(original); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java index bc5c6dd6fa..8891459a2f 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java @@ -17,7 +17,7 @@ import com.google.common.collect.Iterables; import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -33,7 +33,7 @@ public class Bug6883Test { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/bug6883"); assertNotNull(schemaContext); - final AnyDataSchemaNode topAnyData = assertAnyData(schemaContext, ImmutableList.of("top")); + final AnydataSchemaNode topAnyData = assertAnyData(schemaContext, ImmutableList.of("top")); assertEquals(Status.DEPRECATED, topAnyData.getStatus()); assertEquals(Optional.of("top anydata"), topAnyData.getDescription()); @@ -51,12 +51,12 @@ public class Bug6883Test { assertAnyData(schemaContext, ImmutableList.of("my-choice", "case-shorthand-anydata", "case-shorthand-anydata")); } - private static AnyDataSchemaNode assertAnyData(final SchemaContext context, final Iterable localNamesPath) { + private static AnydataSchemaNode assertAnyData(final SchemaContext context, final Iterable localNamesPath) { final Iterable qNames = Iterables.transform(localNamesPath, localName -> QName.create(FOO_NS, localName)); final SchemaNode findDataSchemaNode = SchemaContextUtil.findDataSchemaNode(context, SchemaPath.create(qNames, true)); - assertTrue(findDataSchemaNode instanceof AnyDataSchemaNode); - return (AnyDataSchemaNode) findDataSchemaNode; + assertTrue(findDataSchemaNode instanceof AnydataSchemaNode); + return (AnydataSchemaNode) findDataSchemaNode; } } \ No newline at end of file diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java index ef7a9192c1..b5660a5f6e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java @@ -19,7 +19,7 @@ import java.net.URI; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -141,12 +141,12 @@ public class AugmentProcessTest { final ContainerSchemaNode contAdded2Node = (ContainerSchemaNode) targetContNode.getDataChildByName(contAdded2); assertNotNull(contAdded2Node); - final AnyXmlSchemaNode axmlNode = (AnyXmlSchemaNode) contAdded2Node.getDataChildByName(axml); + final AnyxmlSchemaNode axmlNode = (AnyxmlSchemaNode) contAdded2Node.getDataChildByName(axml); assertNotNull(axmlNode); final ContainerSchemaNode contGrpNode = (ContainerSchemaNode) targetContNode.getDataChildByName(contGrp); assertNotNull(contGrpNode); - final AnyXmlSchemaNode axmlGrpNode = (AnyXmlSchemaNode) contGrpNode.getDataChildByName(axmlGrp); + final AnyxmlSchemaNode axmlGrpNode = (AnyxmlSchemaNode) contGrpNode.getDataChildByName(axmlGrp); assertNotNull(axmlGrpNode); final ContainerSchemaNode augCont1Node = (ContainerSchemaNode) root.getDataChildByName(augCont1); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java index f54bf62ea9..03545c4275 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java @@ -21,7 +21,7 @@ import java.util.function.Predicate; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -82,7 +82,7 @@ public class DeclaredStatementsTest { final Module testModule = schemaContext.findModules("anyxml-declared-test").iterator().next(); assertNotNull(testModule); - final AnyXmlSchemaNode anyxmlSchemaNode = (AnyXmlSchemaNode) testModule.getDataChildByName( + final AnyxmlSchemaNode anyxmlSchemaNode = (AnyxmlSchemaNode) testModule.getDataChildByName( QName.create(testModule.getQNameModule(), "foobar")); assertNotNull(anyxmlSchemaNode); final AnyxmlStatement anyxmlStatement = ((AnyxmlEffectiveStatement) anyxmlSchemaNode).getDeclared(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java index b844dc1a0f..c97e81db40 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java @@ -22,8 +22,8 @@ import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint; @@ -107,13 +107,13 @@ public class DeviationResolutionTest { final NotificationDefinition myNotification = barModule.getNotifications().iterator().next(); assertEquals(2, myNotification.getMustConstraints().size()); - final AnyXmlSchemaNode myAnyxml = (AnyXmlSchemaNode) barModule.getDataChildByName( + final AnyxmlSchemaNode myAnyxml = (AnyxmlSchemaNode) barModule.getDataChildByName( QName.create(barModule.getQNameModule(), "my-anyxml")); assertNotNull(myAnyxml); assertTrue(myAnyxml.isMandatory()); assertEquals(2, myAnyxml.getUnknownSchemaNodes().size()); - final AnyDataSchemaNode myAnyData = (AnyDataSchemaNode) barModule.findDataChildByName( + final AnydataSchemaNode myAnyData = (AnydataSchemaNode) barModule.findDataChildByName( QName.create(barModule.getQNameModule(), "my-anydata")).orElse(null); assertNotNull(myAnyData); assertTrue(myAnyData.isMandatory()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java index fa34d5650b..b7399bd0f6 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; @@ -62,7 +62,7 @@ public class GroupingAndUsesStmtTest { assertEquals("target", grouping.getQName().getLocalName()); assertEquals(5, grouping.getChildNodes().size()); - final AnyXmlSchemaNode anyXmlNode = (AnyXmlSchemaNode) grouping.getDataChildByName( + final AnyxmlSchemaNode anyXmlNode = (AnyxmlSchemaNode) grouping.getDataChildByName( QName.create(testModule.getQNameModule(), "data")); assertNotNull(anyXmlNode); final ChoiceSchemaNode choiceNode = (ChoiceSchemaNode) grouping.getDataChildByName( diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java index 2ca353cdc1..dea745f814 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; @@ -166,12 +166,12 @@ public class GroupingTest { assertEquals(1, uses.size()); // check uses process - final AnyXmlSchemaNode data_u = (AnyXmlSchemaNode) destination.getDataChildByName(QName.create( + final AnyxmlSchemaNode data_u = (AnyxmlSchemaNode) destination.getDataChildByName(QName.create( foo.getQNameModule(), "data")); assertNotNull(data_u); assertTrue(data_u.isAddedByUses()); - final AnyXmlSchemaNode data_g = (AnyXmlSchemaNode) grouping.getDataChildByName(QName.create( + final AnyxmlSchemaNode data_g = (AnyxmlSchemaNode) grouping.getDataChildByName(QName.create( baz.getQNameModule(), "data")); assertNotNull(data_g); assertFalse(data_g.isAddedByUses()); @@ -278,12 +278,12 @@ public class GroupingTest { assertEquals(1, uses.size()); // check uses process - final AnyXmlSchemaNode data_u = (AnyXmlSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), + final AnyxmlSchemaNode data_u = (AnyxmlSchemaNode) foo.getDataChildByName(QName.create(foo.getQNameModule(), "data")); assertNotNull(data_u); assertTrue(data_u.isAddedByUses()); - final AnyXmlSchemaNode data_g = (AnyXmlSchemaNode) grouping.getDataChildByName(QName.create( + final AnyxmlSchemaNode data_g = (AnyxmlSchemaNode) grouping.getDataChildByName(QName.create( baz.getQNameModule(), "data")); assertNotNull(data_g); assertFalse(data_g.isAddedByUses()); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java index 4115485ca2..82b3dbc109 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java @@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableSet; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -97,7 +97,7 @@ public class IfFeatureResolutionTest { final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-leaf-g")); assertNull(augmentingTestLeafG); - final AnyXmlSchemaNode augmentingTestAnyxmlG = (AnyXmlSchemaNode) testContainerG.getDataChildByName( + final AnyxmlSchemaNode augmentingTestAnyxmlG = (AnyxmlSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-anyxml-g")); assertNotNull(augmentingTestAnyxmlG); @@ -215,7 +215,7 @@ public class IfFeatureResolutionTest { final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-leaf-g")); assertNotNull(augmentingTestLeafG); - final AnyXmlSchemaNode augmentingTestAnyxmlG = (AnyXmlSchemaNode) testContainerG.getDataChildByName( + final AnyxmlSchemaNode augmentingTestAnyxmlG = (AnyxmlSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-anyxml-g")); assertNotNull(augmentingTestAnyxmlG); @@ -307,7 +307,7 @@ public class IfFeatureResolutionTest { final LeafSchemaNode augmentingTestLeafG = (LeafSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-leaf-g")); assertNull(augmentingTestLeafG); - final AnyXmlSchemaNode augmentingTestAnyxmlG = (AnyXmlSchemaNode) testContainerG.getDataChildByName( + final AnyxmlSchemaNode augmentingTestAnyxmlG = (AnyxmlSchemaNode) testContainerG.getDataChildByName( QName.create(testModule.getQNameModule(), "augmenting-test-anyxml-g")); assertNotNull(augmentingTestAnyxmlG); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java index 5044394024..87f6356f1e 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java @@ -15,7 +15,7 @@ import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResour import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; @@ -47,7 +47,7 @@ public class NotificationStmtTest { assertNotNull(leaf); leaf = (LeafSchemaNode) notification.getDataChildByName(QName.create(testModule.getQNameModule(), "severity")); assertNotNull(leaf); - final AnyXmlSchemaNode anyXml = (AnyXmlSchemaNode) notification.getDataChildByName(QName.create( + final AnyxmlSchemaNode anyXml = (AnyxmlSchemaNode) notification.getDataChildByName(QName.create( testModule.getQNameModule(), "reporting-entity")); assertNotNull(anyXml); } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java index cffdeabe52..0458bf3b77 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java @@ -19,7 +19,7 @@ import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; @@ -53,7 +53,7 @@ public class RpcStmtTest { final ContainerSchemaNode container = (ContainerSchemaNode) input.getDataChildByName( QName.create(testModule.getQNameModule(), "source")); assertNotNull(container); - AnyXmlSchemaNode anyXml = (AnyXmlSchemaNode) input.getDataChildByName( + AnyxmlSchemaNode anyXml = (AnyxmlSchemaNode) input.getDataChildByName( QName.create(testModule.getQNameModule(), "filter")); assertNotNull(anyXml); @@ -61,7 +61,7 @@ public class RpcStmtTest { assertNotNull(output); assertEquals(1, output.getChildNodes().size()); - anyXml = (AnyXmlSchemaNode) output.getDataChildByName(QName.create(testModule.getQNameModule(), "data")); + anyXml = (AnyxmlSchemaNode) output.getDataChildByName(QName.create(testModule.getQNameModule(), "data")); assertNotNull(anyXml); final Module fooModule = result.findModule("foo", Revision.of("2016-09-23")).get(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java index a873b6b785..328ac01b3d 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; @@ -54,7 +54,7 @@ public class YangParserSimpleTest { @Test public void testParseAnyXml() { - final AnyXmlSchemaNode data = (AnyXmlSchemaNode) testModule.getDataChildByName( + final AnyxmlSchemaNode data = (AnyxmlSchemaNode) testModule.getDataChildByName( QName.create(testModule.getQNameModule(), "data")); assertNotNull("'anyxml data not found'", data); assertFalse(data.equals(null)); @@ -100,7 +100,7 @@ public class YangParserSimpleTest { @Test public void testParseAnyData() { - final AnyDataSchemaNode anydata = (AnyDataSchemaNode) testModule.findDataChildByName( + final AnydataSchemaNode anydata = (AnydataSchemaNode) testModule.findDataChildByName( QName.create(testModule.getQNameModule(), "data2")).orElse(null); assertNotNull("'anydata data not found'", anydata); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java index c01ffff87d..259aa1d25c 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.Uint8; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -128,12 +128,12 @@ public class YangParserWithContextTest { assertEquals(1, uses.size()); // check uses process - final AnyXmlSchemaNode data_u = (AnyXmlSchemaNode) destination.getDataChildByName(QName.create( + final AnyxmlSchemaNode data_u = (AnyxmlSchemaNode) destination.getDataChildByName(QName.create( testModule.getQNameModule(), "data")); assertNotNull(data_u); assertTrue(data_u.isAddedByUses()); - final AnyXmlSchemaNode data_g = (AnyXmlSchemaNode) grouping.getDataChildByName(QName.create( + final AnyxmlSchemaNode data_g = (AnyxmlSchemaNode) grouping.getDataChildByName(QName.create( contextModule.getQNameModule(), "data")); assertNotNull(data_g); assertFalse(data_g.isAddedByUses()); -- 2.36.6