From 8fcc8e1a0ce550e2a0ba916e670af2b0664681dd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Jun 2017 13:59:50 +0200 Subject: [PATCH 1/1] Enforce checkstyle on yang-data-codec-xml Trivial cleanups and flip the switch. Change-Id: I24e912f00d7374a894793b4ddf903a3587d85197 Signed-off-by: Robert Varga --- yang/yang-data-codec-xml/pom.xml | 38 ++++++++----- ...reXMLStreamNormalizedNodeStreamWriter.java | 4 +- ...ssXMLStreamNormalizedNodeStreamWriter.java | 29 +++++----- .../yang/data/codec/xml/UnionXmlCodec.java | 2 + .../XMLStreamNormalizedNodeStreamWriter.java | 57 ++++++++++--------- .../data/codec/xml/XMLStreamWriterUtils.java | 6 +- .../yang/data/codec/xml/XmlCodec.java | 5 -- .../yang/data/codec/xml/XmlParserStream.java | 11 +++- .../yang/data/codec/xml/Bug5396Test.java | 5 +- .../xml/NormalizedNodeXmlTranslationTest.java | 12 ++-- .../codec/xml/NormalizedNodesToXmlTest.java | 8 +-- .../yang/data/codec/xml/RandomPrefixTest.java | 26 ++++----- ...LStreamNormalizedNodeStreamWriterTest.java | 15 ++--- .../data/codec/xml/XmlStreamUtilsTest.java | 2 +- .../codec/xml/XmlToNormalizedNodesTest.java | 20 +++---- .../YangModeledAnyXMLDeserializationTest.java | 31 +++++----- .../YangModeledAnyXMLSerializationTest.java | 7 ++- 17 files changed, 153 insertions(+), 125 deletions(-) diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml index 047e4ba5e4..0e42e638e5 100644 --- a/yang/yang-data-codec-xml/pom.xml +++ b/yang/yang-data-codec-xml/pom.xml @@ -70,19 +70,31 @@ - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + 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 857ea91dd9..2cbe0f2421 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 @@ -84,7 +84,8 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter extends XMLStreamNorm } @Override - public void leafNode(final NodeIdentifier name, final Object value, final Map attributes) throws IOException { + public void leafNode(final NodeIdentifier name, final Object value, final Map attributes) + throws IOException { final LeafSchemaNode schema = tracker.leafNode(name); writeElement(schema.getQName(), value, attributes, schema); } @@ -101,6 +102,7 @@ final class SchemaAwareXMLStreamNormalizedNodeStreamWriter extends XMLStreamNorm final LeafListSchemaNode schema = tracker.leafSetEntryNode(name); writeElement(schema.getQName(), value, Collections.emptyMap(), schema); } + @Override public void startLeafSet(final NodeIdentifier name, final int childSizeHint) { tracker.startLeafSet(name); diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java index 9450c7a14b..9964a19837 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java @@ -43,18 +43,20 @@ class SchemalessXMLStreamNormalizedNodeStreamWriter extends XMLStreamNormalizedN } @Override - public void leafNode(final NodeIdentifier name, final Object value, final Map attributes) throws IOException { + public void leafNode(final NodeIdentifier name, final Object value, final Map attributes) + throws IOException { writeElement(name.getNodeType(), value, attributes, null); } @Override - public void leafSetEntryNode(final QName name, final Object value, final Map attributes) throws IOException { - writeElement(name, value, attributes, null); + public void leafNode(final NodeIdentifier name, final Object value) throws IOException { + writeElement(name.getNodeType(), value, Collections.emptyMap(), null); } @Override - public void leafNode(final NodeIdentifier name, final Object value) throws IOException { - writeElement(name.getNodeType(), value, Collections.emptyMap(), null); + public void leafSetEntryNode(final QName name, final Object value, final Map attributes) + throws IOException { + writeElement(name, value, attributes, null); } @Override @@ -101,7 +103,8 @@ class SchemalessXMLStreamNormalizedNodeStreamWriter extends XMLStreamNormalizedN } @Override - protected void writeValue(final XMLStreamWriter xmlWriter, final QName qname, @Nonnull final Object value, final Object context) + protected void writeValue(final XMLStreamWriter xmlWriter, final QName qname, @Nonnull final Object value, + final Object context) throws XMLStreamException { xmlWriter.writeCharacters(value.toString()); } @@ -121,13 +124,13 @@ class SchemalessXMLStreamNormalizedNodeStreamWriter extends XMLStreamNormalizedN protected void endNode(final XMLStreamWriter xmlWriter) throws IOException, XMLStreamException { ContainerType type = containerTypeStack.pop(); switch (type) { - case CONTAINER: - case LIST_ITEM: - case ANY_XML: - xmlWriter.writeEndElement(); - break; - default: - break; + case CONTAINER: + case LIST_ITEM: + case ANY_XML: + xmlWriter.writeEndElement(); + break; + default: + break; } } } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/UnionXmlCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/UnionXmlCodec.java index ec20542160..fd04f3f3a3 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/UnionXmlCodec.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/UnionXmlCodec.java @@ -72,6 +72,7 @@ abstract class UnionXmlCodec implements XmlCodec { } @Override + @SuppressWarnings("checkstyle:illegalCatch") public final T parseValue(final NamespaceContext ctx, final String str) { for (XmlCodec codec : codecs) { final Object ret; @@ -89,6 +90,7 @@ abstract class UnionXmlCodec implements XmlCodec { } @Override + @SuppressWarnings("checkstyle:illegalCatch") public void writeValue(final XMLStreamWriter ctx, final Object value) throws XMLStreamException { for (XmlCodec codec : codecs) { if (!codec.getDataType().isInstance(value)) { diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java index 6eb16b97eb..0a287f5b59 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamNormalizedNodeStreamWriter.java @@ -51,21 +51,23 @@ import org.w3c.dom.Element; */ public abstract class XMLStreamNormalizedNodeStreamWriter implements NormalizedNodeStreamAttributeWriter { private static final Logger LOG = LoggerFactory.getLogger(XMLStreamNormalizedNodeStreamWriter.class); - private static final String COM_SUN_TRANSFORMER = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"; + private static final String COM_SUN_TRANSFORMER = + "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"; private static final TransformerFactory TRANSFORMER_FACTORY; + static { - TransformerFactory f = TransformerFactory.newInstance(); - if (!f.getFeature(StAXResult.FEATURE)) { + TransformerFactory fa = TransformerFactory.newInstance(); + if (!fa.getFeature(StAXResult.FEATURE)) { LOG.warn("Platform-default TransformerFactory {} does not support StAXResult, attempting fallback to {}", - f, COM_SUN_TRANSFORMER); - f = TransformerFactory.newInstance(COM_SUN_TRANSFORMER, null); - if (!f.getFeature(StAXResult.FEATURE)) { + fa, COM_SUN_TRANSFORMER); + fa = TransformerFactory.newInstance(COM_SUN_TRANSFORMER, null); + if (!fa.getFeature(StAXResult.FEATURE)) { throw new TransformerFactoryConfigurationError("No TransformerFactory supporting StAXResult found."); } } - TRANSFORMER_FACTORY = f; + TRANSFORMER_FACTORY = fa; } private static final Set BROKEN_NAMESPACES = ConcurrentHashMap.newKeySet(); @@ -90,7 +92,7 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz } /** - * Create a new writer with the specified context and rooted in the specified schema path + * Create a new writer with the specified context and rooted in the specified schema path. * * @param writer Output {@link XMLStreamWriter} * @param context Associated {@link SchemaContext}. @@ -122,22 +124,20 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz abstract void startListItem(final PathArgument name) throws IOException; - abstract void endNode(XMLStreamWriter xmlWriter) throws IOException, XMLStreamException; - private void writeAttributes(@Nonnull final Map attributes) throws IOException { - for (final Entry qNameStringEntry : attributes.entrySet()) { + for (final Entry entry : attributes.entrySet()) { try { - final QName qname = qNameStringEntry.getKey(); + final QName qname = entry.getKey(); final String namespace = qname.getNamespace().toString(); if (!Strings.isNullOrEmpty(namespace)) { final String prefix = getPrefix(qname.getNamespace(), namespace); - writer.writeAttribute(prefix, namespace, qname.getLocalName(), qNameStringEntry.getValue()); + writer.writeAttribute(prefix, namespace, qname.getLocalName(), entry.getValue()); } else { - writer.writeAttribute(qname.getLocalName(), qNameStringEntry.getValue()); + writer.writeAttribute(qname.getLocalName(), entry.getValue()); } } catch (final XMLStreamException e) { - throw new IOException("Unable to emit attribute " + qNameStringEntry, e); + throw new IOException("Unable to emit attribute " + entry, e); } } } @@ -203,7 +203,8 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz // TODO can the transformer be a constant ? is it thread safe ? final Transformer transformer = TRANSFORMER_FACTORY.newTransformer(); // Writer has to be wrapped in a wrapper that ignores endDocument event - // EndDocument event forbids any other modification to the writer so a nested anyXml breaks serialization + // EndDocument event forbids any other modification to the writer so a nested anyXml breaks + // serialization transformer.transform(domSource, new StAXResult(new DelegateWriterNoEndDoc(writer))); } catch (final TransformerException e) { throw new IOException("Unable to transform anyXml(" + qname + ") value: " + value, e); @@ -232,6 +233,11 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz writeAttributes(attributes); } + @Override + public final void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) throws IOException { + startListItem(name); + } + @Override public final void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint, final Map attributes) throws IOException { @@ -240,13 +246,14 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz } @Override - public final void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) { - startList(name); + public final void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) + throws IOException { + startListItem(identifier); } @Override - public final void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) throws IOException { - startListItem(name); + public final void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) { + startList(name); } @Override @@ -254,12 +261,6 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz startList(name); } - @Override - public final void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) - throws IOException { - startListItem(identifier); - } - @Override public final void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) { startList(name); @@ -280,6 +281,8 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz } } + abstract void endNode(XMLStreamWriter xmlWriter) throws IOException, XMLStreamException; + @Override public final void endNode() throws IOException { try { @@ -313,7 +316,7 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz private static final class DelegateWriterNoEndDoc implements XMLStreamWriter { private final XMLStreamWriter writer; - public DelegateWriterNoEndDoc(final XMLStreamWriter writer) { + DelegateWriterNoEndDoc(final XMLStreamWriter writer) { this.writer = writer; } diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamWriterUtils.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamWriterUtils.java index 5205497bce..0434041d7c 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamWriterUtils.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XMLStreamWriterUtils.java @@ -68,8 +68,8 @@ abstract class XMLStreamWriterUtils { } Preconditions.checkArgument(schemaNode instanceof TypedSchemaNode, - "Unable to write value for node %s, only nodes of type: leaf and leaf-list can be written at this point", - schemaNode.getQName()); + "Unable to write value for node %s, only nodes of type: leaf and leaf-list can be written at this point", + schemaNode.getQName()); TypeDefinition type = ((TypedSchemaNode) schemaNode).getType(); if (type instanceof LeafrefTypeDefinition) { @@ -127,7 +127,7 @@ abstract class XMLStreamWriterUtils { final QName qname = (QName) value; //in case parent is present and same as element namespace write value without namespace - if (qname.getNamespace().equals(parent.getNamespace())){ + if (qname.getNamespace().equals(parent.getNamespace())) { writer.writeCharacters(qname.getLocalName()); } else { final String ns = qname.getNamespace().toString(); diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodec.java index bebb5ca979..32cd8d92fd 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodec.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlCodec.java @@ -14,11 +14,6 @@ import javax.xml.stream.XMLStreamWriter; import org.opendaylight.yangtools.yang.data.util.codec.TypeAwareCodec; interface XmlCodec extends TypeAwareCodec { - /** - * {@inheritDoc} - * - * @throws XMLStreamException from {@link XMLStreamWriter} - */ @Override void writeValue(XMLStreamWriter ctx, T value) throws XMLStreamException; } 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 f6baedecab..57bcafa7b0 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 @@ -88,6 +88,8 @@ public final class XmlParserStream implements Closeable, Flushable { } /** + * Construct a new {@link XmlParserStream}. + * * @deprecated Use {@link #create(NormalizedNodeStreamWriter, SchemaContext, SchemaNode)} instead. */ @Deprecated @@ -201,7 +203,8 @@ public final class XmlParserStream implements Closeable, Flushable { DataSchemaNode parentSchema = parent.getSchema(); final String parentSchemaName = parentSchema.getQName().getLocalName(); - if (parentSchemaName.equals(xmlElementName) && in.getEventType() == XMLStreamConstants.END_ELEMENT) { + if (parentSchemaName.equals(xmlElementName) + && in.getEventType() == XMLStreamConstants.END_ELEMENT) { in.nextTag(); break; } @@ -232,6 +235,8 @@ public final class XmlParserStream implements Closeable, Flushable { case XMLStreamConstants.END_ELEMENT: in.nextTag(); break; + default: + break; } } @@ -246,8 +251,8 @@ public final class XmlParserStream implements Closeable, Flushable { parentSimpleNode.setValue(translateValueByType(value, parentSimpleNode.getSchema(), nsContext)); } - private Object translateValueByType(final String value, final DataSchemaNode node, final NamespaceContext namespaceCtx) - throws IOException, SAXException, ParserConfigurationException { + private Object translateValueByType(final String value, final DataSchemaNode node, + final NamespaceContext namespaceCtx) throws IOException, SAXException, ParserConfigurationException { if (node instanceof AnyXmlSchemaNode) { /* * FIXME: Figure out some YANG extension dispatch, which will diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5396Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5396Test.java index cccf6f0654..bd94f56d63 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5396Test.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5396Test.java @@ -40,8 +40,9 @@ public class Bug5396Test { private SchemaContext schemaContext; @Before - public void Init() throws Exception { - fooModuleQName = QNameModule.create(new URI("foo"), SimpleDateFormatUtil.getRevisionFormat().parse("2016-03-22")); + public void setUp() throws Exception { + fooModuleQName = QNameModule.create(new URI("foo"), SimpleDateFormatUtil.getRevisionFormat().parse( + "2016-03-22")); schemaContext = YangParserTestUtils.parseYangSource("/bug5396/yang/foo.yang"); } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java index 8809b03828..75e3e84a27 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java @@ -103,16 +103,18 @@ public class NormalizedNodeXmlTranslationTest { } private static final String NAMESPACE = "urn:opendaylight:params:xml:ns:yang:controller:test"; - private static final Date revision; + private static final Date REVISION; + static { try { - revision = SimpleDateFormatUtil.getRevisionFormat().parse("2014-03-13"); + REVISION = SimpleDateFormatUtil.getRevisionFormat().parse("2014-03-13"); } catch (final ParseException e) { throw new ExceptionInInitializerError(e); } } static final XMLOutputFactory XML_FACTORY; + static { XML_FACTORY = XMLOutputFactory.newFactory(); XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); @@ -247,7 +249,7 @@ public class NormalizedNodeXmlTranslationTest { } private static NodeIdentifier getNodeIdentifier(final String localName) { - return new NodeIdentifier(QName.create(URI.create(NAMESPACE), revision, localName)); + return new NodeIdentifier(QName.create(URI.create(NAMESPACE), REVISION, localName)); } private static AugmentationIdentifier getAugmentIdentifier(final String... childNames) { @@ -303,8 +305,8 @@ public class NormalizedNodeXmlTranslationTest { final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter .create(xmlStreamWriter, schema); - final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter - (xmlNormalizedNodeStreamWriter); + final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter( + xmlNormalizedNodeStreamWriter); normalizedNodeWriter.write(built); diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java index 20816433c2..59bb6fd1a0 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java @@ -131,11 +131,11 @@ public class NormalizedNodesToXmlTest { final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult); - final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create - (xmlStreamWriter, schemaContext); + final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.create( + xmlStreamWriter, schemaContext); - final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter - (xmlNormalizedNodeStreamWriter); + final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter( + xmlNormalizedNodeStreamWriter); normalizedNodeWriter.write(buildOuterContainerNode()); diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixTest.java index 28b7710a9e..52ee399b85 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/RandomPrefixTest.java @@ -48,13 +48,13 @@ public class RandomPrefixTest { for (int i = 0; i < MAX_COUNTER; i++) { final String prefix = RandomPrefix.encode(i); final URI uri = new URI("localhost:" + prefix); - final QName qName = QName.create(QNameModule.create(uri, new Date()), "local-name"); - allGenerated.add(a.encodePrefix(qName.getNamespace())); + final QName qname = QName.create(QNameModule.create(uri, new Date()), "local-name"); + allGenerated.add(a.encodePrefix(qname.getNamespace())); } assertEquals(MAX_COUNTER, allGenerated.size()); - // We are generating MAX_COUNTER_VALUE + 27 prefixes total, so we should encounter a reset in prefix a start from 0 at some point - // At the end, there should be only 27 values in RandomPrefix cache + // We are generating MAX_COUNTER_VALUE + 27 prefixes total, so we should encounter a reset in prefix a start + // from 0 at some point. At the end, there should be only 27 values in RandomPrefix cache assertEquals(MAX_COUNTER, Iterables.size(a.getPrefixes())); assertThat(allGenerated, CoreMatchers.not(CoreMatchers.hasItem("xml"))); assertThat(allGenerated, CoreMatchers.not(CoreMatchers.hasItem("xmla"))); @@ -68,10 +68,10 @@ public class RandomPrefixTest { final RandomPrefix a = new RandomPrefix(null); final URI uri = URI.create("localhost"); - final QName qName = QName.create(QNameModule.create(uri, new Date()), "local-name"); - final QName qName2 = QName.create(QNameModule.create(uri, new Date()), "local-name"); + final QName qname = QName.create(QNameModule.create(uri, new Date()), "local-name"); + final QName qname2 = QName.create(QNameModule.create(uri, new Date()), "local-name"); - assertEquals(a.encodePrefix(qName.getNamespace()), a.encodePrefix(qName2.getNamespace())); + assertEquals(a.encodePrefix(qname.getNamespace()), a.encodePrefix(qname2.getNamespace())); } @Test @@ -79,12 +79,12 @@ public class RandomPrefixTest { final RandomPrefix a = new RandomPrefix(null); final URI uri = URI.create("localhost"); - QName qName = QName.create(uri, new Date(), "local-name"); - assertEquals("a", a.encodePrefix(qName.getNamespace())); - qName = QName.create(QNameModule.create(uri, new Date()), "local-name"); - assertEquals("a", a.encodePrefix(qName.getNamespace())); - qName = QName.create(QNameModule.create(URI.create("second"), new Date()), "local-name"); - assertEquals("b", a.encodePrefix(qName.getNamespace())); + QName qname = QName.create(uri, new Date(), "local-name"); + assertEquals("a", a.encodePrefix(qname.getNamespace())); + qname = QName.create(QNameModule.create(uri, new Date()), "local-name"); + assertEquals("a", a.encodePrefix(qname.getNamespace())); + qname = QName.create(QNameModule.create(URI.create("second"), new Date()), "local-name"); + assertEquals("b", a.encodePrefix(qname.getNamespace())); } } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java index ae95d20b68..16e2b4689d 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java @@ -104,8 +104,8 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { @Before public void setup() throws URISyntaxException, ParseException { - foobarModule = QNameModule.create(new URI("foobar-namespace"), SimpleDateFormatUtil.getRevisionFormat().parse - ("2016-09-19")); + foobarModule = QNameModule.create(new URI("foobar-namespace"), SimpleDateFormatUtil.getRevisionFormat().parse( + "2016-09-19")); outerContainer = QName.create(foobarModule, "outer-container"); @@ -155,8 +155,8 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { final NormalizedNodeStreamWriter schemalessXmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter.createSchemaless(xmlStreamWriter); - final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter - (schemalessXmlNormalizedNodeStreamWriter); + final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter( + schemalessXmlNormalizedNodeStreamWriter); normalizedNodeWriter.write(buildOuterContainerNode()); @@ -189,8 +189,8 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInList2)) .withValue("listleafvalue22").build()).build()).build(); - OrderedMapNode myOrderedListNode = Builders.orderedMapBuilder().withNodeIdentifier(new NodeIdentifier(myOrderedList)) - .withChild(Builders.mapEntryBuilder().withNodeIdentifier( + OrderedMapNode myOrderedListNode = Builders.orderedMapBuilder().withNodeIdentifier( + new NodeIdentifier(myOrderedList)).withChild(Builders.mapEntryBuilder().withNodeIdentifier( new NodeIdentifierWithPredicates(myOrderedList, myKeyLeafInOrderedList, "olistkeyvalue1")) .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(myLeafInOrderedList1)) .withValue("olistleafvalue1").build()) @@ -297,7 +297,8 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { } private static Document loadDocument(final String xmlPath) throws IOException, SAXException { - final InputStream resourceAsStream = SchemalessXMLStreamNormalizedNodeStreamWriterTest.class.getResourceAsStream(xmlPath); + final InputStream resourceAsStream = SchemalessXMLStreamNormalizedNodeStreamWriterTest.class + .getResourceAsStream(xmlPath); final Document currentConfigElement = readXmlToDocument(resourceAsStream); Preconditions.checkNotNull(currentConfigElement); return currentConfigElement; diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStreamUtilsTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStreamUtilsTest.java index 2b975184cd..7868c2203a 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStreamUtilsTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStreamUtilsTest.java @@ -128,7 +128,7 @@ public class XmlStreamUtilsTest { } /** - * One leafref reference to other leafref via relative references + * One leafref reference to other leafref via relative references. */ @Test public void testLeafRefRelativeChaining() { diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java index ecde264cda..a35922771c 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java @@ -79,8 +79,8 @@ public class XmlToNormalizedNodesTest { @Before public void setup() throws URISyntaxException, ParseException { - bazModule = QNameModule.create(new URI("baz-namespace"), SimpleDateFormatUtil.getRevisionFormat().parse - ("1970-01-01")); + bazModule = QNameModule.create(new URI("baz-namespace"), SimpleDateFormatUtil.getRevisionFormat().parse( + "1970-01-01")); outerContainer = QName.create(bazModule, "outer-container"); @@ -239,8 +239,8 @@ public class XmlToNormalizedNodesTest { xmlParser.parse(reader); fail("XMLStreamException should have been thrown because of unterminated leaf element."); } catch (XMLStreamException ex) { - assertTrue(ex.getMessage().contains("elementGetText() function expects text only elment but " + - "START_ELEMENT was encountered.")); + assertTrue(ex.getMessage().contains("elementGetText() function expects text only elment but " + + "START_ELEMENT was encountered.")); } } @@ -262,8 +262,8 @@ public class XmlToNormalizedNodesTest { xmlParser.parse(reader); fail("XMLStreamException should have been thrown because of unterminated leaf element."); } catch (XMLStreamException ex) { - assertTrue(ex.getMessage().contains("The element type \"my-leaf-1\" must be terminated by the matching " + - "end-tag \"\".")); + assertTrue(ex.getMessage().contains("The element type \"my-leaf-1\" must be terminated by the matching " + + "end-tag \"\".")); } } @@ -285,8 +285,8 @@ public class XmlToNormalizedNodesTest { xmlParser.parse(reader); fail("XMLStreamException should have been thrown because of unterminated container element."); } catch (XMLStreamException ex) { - assertTrue(ex.getMessage().contains("The element type \"my-container-1\" must be terminated by the " + - "matching end-tag \"\".")); + assertTrue(ex.getMessage().contains("The element type \"my-container-1\" must be terminated by the " + + "matching end-tag \"\".")); } } @@ -308,8 +308,8 @@ public class XmlToNormalizedNodesTest { xmlParser.parse(reader); fail("IllegalStateException should have been thrown because of an unexisting container element."); } catch (IllegalStateException ex) { - assertTrue(ex.getMessage().contains("Schema for node with name my-container-1 and namespace baz-namespace" + - " doesn't exist.")); + assertTrue(ex.getMessage().contains("Schema for node with name my-container-1 and namespace baz-namespace" + + " doesn't exist.")); } } 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 8eac1709a8..44ca138280 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 @@ -60,7 +60,7 @@ public class YangModeledAnyXMLDeserializationTest { private SchemaContext schemaContext; @Before - public void Init() throws Exception { + public void setUp() throws Exception { barModuleQName = QNameModule.create(new URI("bar"), SimpleDateFormatUtil.getRevisionFormat() .parse("1970-01-01")); myContainer1 = QName.create(barModuleQName, "my-container-1"); @@ -91,8 +91,9 @@ public class YangModeledAnyXMLDeserializationTest { final XMLInputFactory factory = XMLInputFactory.newInstance(); final XMLStreamReader reader = factory.createXMLStreamReader(resourceAsStream); - final ImmutableContainerNodeBuilder result = (ImmutableContainerNodeBuilder) ImmutableContainerNodeSchemaAwareBuilder - .create(yangModeledAnyXML.getSchemaOfAnyXmlData()); + final ImmutableContainerNodeBuilder result = + (ImmutableContainerNodeBuilder) ImmutableContainerNodeSchemaAwareBuilder.create( + yangModeledAnyXML.getSchemaOfAnyXmlData()); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); @@ -112,9 +113,9 @@ public class YangModeledAnyXMLDeserializationTest { Optional> child2 = myContainerNode1.getChild(new NodeIdentifier( myLeaf1)); assertTrue(child2.orNull() instanceof LeafNode); - LeafNode LeafNode1 = (LeafNode) child2.get(); + LeafNode leafNode1 = (LeafNode) child2.get(); - Object leafNode1Value = LeafNode1.getValue(); + Object leafNode1Value = leafNode1.getValue(); assertEquals("value1", leafNode1Value); } @@ -126,8 +127,8 @@ public class YangModeledAnyXMLDeserializationTest { final XMLInputFactory factory = XMLInputFactory.newInstance(); final XMLStreamReader reader = factory.createXMLStreamReader(resourceAsStream); - final ImmutableContainerNodeBuilder result = (ImmutableContainerNodeBuilder) ImmutableContainerNodeSchemaAwareBuilder - .create(schemaContext); + final ImmutableContainerNodeBuilder result = + (ImmutableContainerNodeBuilder) ImmutableContainerNodeSchemaAwareBuilder.create(schemaContext); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); @@ -156,26 +157,26 @@ public class YangModeledAnyXMLDeserializationTest { Optional> child3 = innerContainerNode .getChild(new NodeIdentifier(myLeaf2)); assertTrue(child3.orNull() instanceof LeafNode); - LeafNode LeafNode2 = (LeafNode) child3.get(); + LeafNode leafNode2 = (LeafNode) child3.get(); - Object leafNode2Value = LeafNode2.getValue(); + Object leafNode2Value = leafNode2.getValue(); assertEquals("any-xml-leaf-2-value", leafNode2Value); Optional> child4 = yangModeledAnyXmlNode .getChild(new NodeIdentifier(myLeaf3)); assertTrue(child4.orNull() instanceof LeafNode); - LeafNode LeafNode3 = (LeafNode) child4.get(); + LeafNode leafNode3 = (LeafNode) child4.get(); - Object leafNode3Value = LeafNode3.getValue(); + Object leafNode3Value = leafNode3.getValue(); assertEquals("any-xml-leaf-3-value", leafNode3Value); } private static class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyXmlSchemaNode { - private final QName qName; + private final QName qname; private final ContainerSchemaNode contentSchema; - private YangModeledAnyXMLSchemaNodeImplTest(final QName qName, final ContainerSchemaNode contentSchema) { - this.qName = qName; + private YangModeledAnyXMLSchemaNodeImplTest(final QName qname, final ContainerSchemaNode contentSchema) { + this.qname = qname; this.contentSchema = contentSchema; } @@ -202,7 +203,7 @@ public class YangModeledAnyXMLDeserializationTest { @Nonnull @Override public QName getQName() { - return qName; + return qname; } @Nonnull diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLSerializationTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLSerializationTest.java index 8198cfa20c..be7006f3e0 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLSerializationTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLSerializationTest.java @@ -74,7 +74,8 @@ public class YangModeledAnyXMLSerializationTest extends XMLTestCase { @Test public void testSerializationOfBaz() throws Exception { - final InputStream resourceAsStream = XmlToNormalizedNodesTest.class.getResourceAsStream("/anyxml-support/serialization/baz.xml"); + final InputStream resourceAsStream = XmlToNormalizedNodesTest.class.getResourceAsStream( + "/anyxml-support/serialization/baz.xml"); final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); final XMLStreamReader reader = inputFactory.createXMLStreamReader(resourceAsStream); @@ -115,8 +116,8 @@ public class YangModeledAnyXMLSerializationTest extends XMLTestCase { final NormalizedNodeStreamWriter xmlNormalizedNodeStreamWriter = XMLStreamNormalizedNodeStreamWriter .create(xmlStreamWriter, schemaContext); - final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter - (xmlNormalizedNodeStreamWriter); + final NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter( + xmlNormalizedNodeStreamWriter); normalizedNodeWriter.write(transformedInput); -- 2.36.6