From: Robert Varga Date: Fri, 17 Mar 2017 09:49:43 +0000 (+0100) Subject: Cleanup codecs a bit X-Git-Tag: release/carbon~26 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=631451dffc88bef43df4834f6d9e241c0b5d57c5;p=yangtools.git Cleanup codecs a bit - prevent unnecessary boxing - add type arguments - static methods - do not use deprecated methods Change-Id: Ic129d327804d3b28066c84d6101cbe262e2101b1 Signed-off-by: Robert Varga --- 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 2a1f8e1c99..0d73512b7a 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 @@ -15,7 +15,6 @@ import com.google.common.base.Preconditions; import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.net.URI; -import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.RegEx; import javax.xml.transform.dom.DOMSource; @@ -275,8 +274,7 @@ public final class JSONNormalizedNodeStreamWriter implements NormalizedNodeStrea // text value, i.e. a number, string, boolean or null if (TEXT_NODE == childNode.getNodeType()) { final String childNodeText = childNode.getNodeValue(); - final Matcher matcher = NUMBER_PATTERN.matcher(childNodeText); - if (matcher.matches()) { + if (NUMBER_PATTERN.matcher(childNodeText).matches()) { writer.value(parseNumber(childNodeText)); } else if ("true".equals(childNodeText) || "false".equals(childNodeText)) { writer.value(Boolean.parseBoolean(childNodeText)); @@ -303,12 +301,11 @@ public final class JSONNormalizedNodeStreamWriter implements NormalizedNodeStrea // json numbers are 64 bit wide floating point numbers - in java terms it is either long or double private static Number parseNumber(final String numberText) { - Matcher matcher = NOT_DECIMAL_NUMBER_PATTERN.matcher(numberText); - if (matcher.matches()) { - return Long.parseLong(numberText); - } else { - return Double.parseDouble(numberText); + if (NOT_DECIMAL_NUMBER_PATTERN.matcher(numberText).matches()) { + return Long.valueOf(numberText); } + + return Double.valueOf(numberText); } private static boolean isJsonObject(final Node firstChild) { diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java index 273238c2cf..f4157ea535 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.data.codec.gson; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadTextFile; @@ -50,7 +50,7 @@ public class Bug4501Test { final JsonParserStream jsonParser = JsonParserStream.create(streamWriter, schemaContext); jsonParser.parse(new JsonReader(new StringReader(inputJson))); final NormalizedNode transformedInput = result.getResult(); - assertNotNull(transformedInput instanceof UnkeyedListNode); + assertTrue(transformedInput instanceof UnkeyedListNode); final UnkeyedListNode hop = (UnkeyedListNode) transformedInput; final Optional> lrsBits = hop.getChild(0).getChild( diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java index 116080fab1..6bfa175f28 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java @@ -86,7 +86,7 @@ public class Bug5446Test { return writer.toString(); } - private ContainerNode createRootNode() { + private static ContainerNode createRootNode() { LeafNode ipAddress = ImmutableNodes.leafNode(ipAddressQName, BaseEncoding.base64().decode("fwAAAQ==")); return ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(rootQName)) .withChild(ipAddress).build(); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug6112Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug6112Test.java index bbc0a07b6f..8c4f14cc86 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug6112Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug6112Test.java @@ -39,7 +39,7 @@ public class Bug6112Test { schemaContext = YangParserTestUtils.parseYangSources("/bug-6112/yang"); } - private NormalizedNode readJson(final String jsonPath) throws IOException, URISyntaxException { + private static NormalizedNode readJson(final String jsonPath) throws IOException, URISyntaxException { final String inputJson = loadTextFile(jsonPath); final NormalizedNodeResult result = new NormalizedNodeResult(); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java index 889a9bfe6c..bb459fc960 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java @@ -64,7 +64,7 @@ public class YangModeledAnyXmlSupportTest { final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); xmlParser.parse(reader); assertNotNull(result.getResult()); 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 a32254ebe1..cccf6f0654 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 @@ -62,7 +62,7 @@ public class Bug5396Test { } } - private void testInputXML(String xmlPath, String expectedValue) throws Exception { + private void testInputXML(final String xmlPath, final String expectedValue) throws Exception { final InputStream resourceAsStream = XmlToNormalizedNodesTest.class.getResourceAsStream(xmlPath); final XMLInputFactory factory = XMLInputFactory.newInstance(); @@ -72,7 +72,7 @@ public class Bug5396Test { final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); xmlParser.parse(reader); assertNotNull(result.getResult()); diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java index 75548659ce..70f3b4dc49 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java @@ -54,7 +54,7 @@ public class Bug5446Test extends XMLTestCase { static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private final QNameModule fooModuleQName; 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 3e4ee08c97..8809b03828 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 @@ -115,7 +115,7 @@ public class NormalizedNodeXmlTranslationTest { static final XMLOutputFactory XML_FACTORY; static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private static ContainerNode augmentChoiceHell2() { @@ -169,7 +169,7 @@ public class NormalizedNodeXmlTranslationTest { final NormalizedNodeBuilder> booleanBuilder = Builders .leafBuilder().withNodeIdentifier(getNodeIdentifier("boolean")); - booleanBuilder.withValue(false); + booleanBuilder.withValue(Boolean.FALSE); b.withChild(booleanBuilder.build()); final ListNodeBuilder> leafListBuilder = Builders.leafSetBuilder() @@ -282,7 +282,7 @@ public class NormalizedNodeXmlTranslationTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schema); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schema, schema); xmlParser.parse(reader); final NormalizedNode built = result.getResult(); @@ -296,7 +296,7 @@ public class NormalizedNodeXmlTranslationTest { final DOMResult domResult = new DOMResult(document); final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); - outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); + outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE); final XMLStreamWriter xmlStreamWriter = outputFactory.createXMLStreamWriter(domResult); 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 4338cbeb30..20816433c2 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 @@ -127,7 +127,7 @@ public class NormalizedNodesToXmlTest { final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument()); final XMLOutputFactory factory = XMLOutputFactory.newInstance(); - factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); + factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE); final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult); 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 0c98495618..ae95d20b68 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 @@ -148,7 +148,7 @@ public class SchemalessXMLStreamNormalizedNodeStreamWriterTest { final DOMResult domResult = new DOMResult(UntrustedXML.newDocumentBuilder().newDocument()); final XMLOutputFactory factory = XMLOutputFactory.newInstance(); - factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); + factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE); final XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(domResult); 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 81df3d47af..ecde264cda 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 @@ -119,7 +119,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); xmlParser.parse(reader); xmlParser.flush(); @@ -147,7 +147,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); xmlParser.parse(reader); final NormalizedNode transformedInput = result.getResult(); @@ -167,7 +167,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("IllegalStateException should have been thrown because of duplicate leaf."); @@ -190,7 +190,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("IllegalStateException should have been thrown because of duplicate anyxml"); @@ -212,7 +212,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("IllegalStateException should have been thrown because of duplicate container"); @@ -234,7 +234,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("XMLStreamException should have been thrown because of unterminated leaf element."); @@ -257,7 +257,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("XMLStreamException should have been thrown because of unterminated leaf element."); @@ -280,7 +280,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("XMLStreamException should have been thrown because of unterminated container element."); @@ -303,7 +303,7 @@ public class XmlToNormalizedNodesTest { final NormalizedNodeResult result = new NormalizedNodeResult(); final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); try { xmlParser.parse(reader); fail("IllegalStateException should have been thrown because of an unexisting container element."); 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 1aa608eefe..8eac1709a8 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 @@ -80,7 +80,7 @@ public class YangModeledAnyXMLDeserializationTest { @Test public void testRawAnyXMLFromBar() throws Exception { - DataSchemaNode barContainer = schemaContext.getDataChildByName(QName.create(barModuleQName, "bar"));; + DataSchemaNode barContainer = schemaContext.getDataChildByName(QName.create(barModuleQName, "bar")); assertTrue(barContainer instanceof ContainerSchemaNode); final YangModeledAnyXmlSchemaNode yangModeledAnyXML = new YangModeledAnyXMLSchemaNodeImplTest(myAnyXMLDataBar, (ContainerSchemaNode) barContainer); @@ -131,7 +131,7 @@ public class YangModeledAnyXMLDeserializationTest { final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); xmlParser.parse(reader); final NormalizedNode output = result.build(); @@ -174,7 +174,7 @@ public class YangModeledAnyXMLDeserializationTest { private final QName qName; private final ContainerSchemaNode contentSchema; - private YangModeledAnyXMLSchemaNodeImplTest(QName qName, ContainerSchemaNode contentSchema) { + private YangModeledAnyXMLSchemaNodeImplTest(final QName qName, final ContainerSchemaNode contentSchema) { this.qName = qName; this.contentSchema = contentSchema; } 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 abfc447d87..8198cfa20c 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 @@ -83,7 +83,7 @@ public class YangModeledAnyXMLSerializationTest extends XMLTestCase { final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result); - final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext); + final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, schemaContext, schemaContext); xmlParser.parse(reader); final NormalizedNode transformedInput = result.getResult(); @@ -108,7 +108,7 @@ public class YangModeledAnyXMLSerializationTest extends XMLTestCase { final DOMResult domResult = new DOMResult(document); final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); - outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); + outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE); final XMLStreamWriter xmlStreamWriter = outputFactory.createXMLStreamWriter(domResult); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/LeafSetEntryNodeBaseParser.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/LeafSetEntryNodeBaseParser.java index 59abc56a68..fbb28f1c7b 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/LeafSetEntryNodeBaseParser.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/LeafSetEntryNodeBaseParser.java @@ -11,7 +11,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import java.util.Map; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; @@ -24,28 +23,28 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; * * @param type of elements to be parsed */ -public abstract class LeafSetEntryNodeBaseParser implements ExtensibleParser, LeafListSchemaNode> { +public abstract class LeafSetEntryNodeBaseParser implements ExtensibleParser, LeafListSchemaNode> { - private final BuildingStrategy> buildingStrategy; + private final BuildingStrategy> buildingStrategy; public LeafSetEntryNodeBaseParser() { buildingStrategy = new SimpleLeafSetEntryBuildingStrategy(); } - public LeafSetEntryNodeBaseParser(final BuildingStrategy> buildingStrategy) { + public LeafSetEntryNodeBaseParser(final BuildingStrategy> buildingStrategy) { this.buildingStrategy = buildingStrategy; } @SuppressWarnings("unchecked") @Override - public final LeafSetEntryNode parse(Iterable elements, LeafListSchemaNode schema) { + public final LeafSetEntryNode parse(final Iterable elements, final LeafListSchemaNode schema) { final int size = Iterables.size(elements); Preconditions.checkArgument(size == 1, "Xml elements mapped to leaf node illegal count: %s", size); final E e = elements.iterator().next(); Object value = parseLeafListEntry(e,schema); - NormalizedNodeAttrBuilder> leafEntryBuilder = Builders + NormalizedNodeAttrBuilder> leafEntryBuilder = Builders .leafSetEntryBuilder(schema); leafEntryBuilder.withAttributes(getAttributes(e)); leafEntryBuilder.withValue(value); @@ -76,7 +75,7 @@ public abstract class LeafSetEntryNodeBaseParser implements ExtensibleParser< */ protected abstract Map getAttributes(E e); - public static class SimpleLeafSetEntryBuildingStrategy implements BuildingStrategy> { + public static class SimpleLeafSetEntryBuildingStrategy implements BuildingStrategy> { @Override public LeafSetEntryNode build(final NormalizedNodeBuilder> builder) { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java index 66f7ba0c69..b1e878bef7 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.data.impl.codecs; import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.opendaylight.yangtools.yang.data.api.codec.BooleanCodec; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @@ -23,17 +24,19 @@ public class BooleanCodecStringTest { @SuppressWarnings("unchecked") @Test public void testSerialize() { - BooleanCodec codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), BooleanCodec.class); + BooleanCodec codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), + BooleanCodec.class); assertEquals("serialize", "", codec.serialize(null)); - assertEquals("serialize", "true", codec.serialize(true)); - assertEquals("serialize", "false", codec.serialize(false)); + assertEquals("serialize", "true", codec.serialize(Boolean.TRUE)); + assertEquals("serialize", "false", codec.serialize(Boolean.FALSE)); } @SuppressWarnings("unchecked") @Test public void testDeserialize() { - BooleanCodec codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), BooleanCodec.class); + BooleanCodec codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), + BooleanCodec.class); assertEquals("deserialize", Boolean.TRUE, codec.deserialize("true")); assertEquals("deserialize", Boolean.TRUE, codec.deserialize("TRUE")); 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 0c2c6e8c50..e4ede1f76e 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 @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; + import java.io.File; import java.io.FileNotFoundException; import java.net.URISyntaxException; @@ -79,8 +80,8 @@ public class BuilderTest { private static final MapEntryNode LIST_MAIN_CHILD_1 = ImmutableNodes.mapEntry(LIST_MAIN, LIST_MAIN_CHILD_QNAME_1, 1); private static final MapEntryNode LIST_MAIN_CHILD_2 = ImmutableNodes.mapEntry(LIST_MAIN, LIST_MAIN_CHILD_QNAME_1, 2); private static final MapEntryNode LIST_MAIN_CHILD_3 = ImmutableNodes.mapEntry(LIST_MAIN, LIST_MAIN_CHILD_QNAME_1, 3); - private static final Integer SIZE = 3; - private static final NodeWithValue BAR_PATH = new NodeWithValue<>(LEAF_LIST_MAIN, "bar"); + private static final int SIZE = 3; + private static final NodeWithValue BAR_PATH = new NodeWithValue<>(LEAF_LIST_MAIN, "bar"); private static final LeafSetEntryNode LEAF_SET_ENTRY_NODE = ImmutableLeafSetEntryNodeBuilder.create() .withNodeIdentifier(BAR_PATH) .withValue("bar") @@ -127,13 +128,11 @@ public class BuilderTest { .build(); assertNotNull(Builders.orderedMapBuilder(list)); - assertEquals(SIZE, (Integer) orderedMapNodeCreateNull.getSize()); + assertEquals(SIZE, orderedMapNodeCreateNull.getSize()); assertEquals(orderedMapNodeCreateNode.getSize(), orderedMapNodeCreateNull.getSize() - 1); assertEquals(NODE_IDENTIFIER_LIST, orderedMapNodeCreateSize.getIdentifier()); - assertEquals(orderedMapNodeCreateNull.getChild(0), LIST_MAIN_CHILD_1); - assertEquals((Integer) orderedMapNodeCreateNull.getValue().size(), SIZE); - assertNotNull(orderedMapNodeCreateNull.hashCode()); - assertEquals((Integer) orderedMapNodeCreateNull.getValue().size(), SIZE); + assertEquals(LIST_MAIN_CHILD_1, orderedMapNodeCreateNull.getChild(0)); + assertEquals(SIZE, orderedMapNodeCreateNull.getValue().size()); assertEquals(orderedMapNodeSchemaAware.getChild(0), orderedMapNodeSchemaAwareMapNodeConst.getChild(0)); } @@ -159,7 +158,6 @@ public class BuilderTest { assertNotNull(Builders.orderedLeafSetBuilder(leafList)); assertNotNull(Builders.anyXmlBuilder()); - assertNotNull(orderedLeafSetShemaAware.hashCode()); assertNotNull(orderedLeafSetShemaAware); assertEquals(1, ((OrderedLeafSetNode)orderedLeafSet).getSize()); assertEquals("baz", ((OrderedLeafSetNode)orderedLeafSet).getChild(0).getValue()); @@ -177,7 +175,6 @@ public class BuilderTest { collectionNodeBuilder.withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST); collectionNodeBuilder.withValue(mapEntryNodeColl); final MapNode mapNode = collectionNodeBuilder.build(); - assertNotNull(mapNode.hashCode()); final MapNode mapNodeSchemaAware = ImmutableMapNodeSchemaAwareBuilder.create(list, getImmutableMapNode()).build(); assertNotNull(mapNodeSchemaAware); assertNotNull(Builders.mapBuilder(mapNode)); @@ -219,7 +216,6 @@ public class BuilderTest { } catch (IndexOutOfBoundsException e) { } - assertNotNull(unkeyedListNodeSize.getSize()); assertNotNull(unkeyedListNodeSize.getValue()); assertEquals(unkeyedListEntryNode, unkeyedListNodeCreated.getChild(0)); assertEquals(unkeyedListNode.getNodeType().getLocalName(), unkeyedListNodeSize.getNodeType() diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java index 5f373d1f6c..e7799ba4a1 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java @@ -8,12 +8,12 @@ package org.opendaylight.yangtools.yang.data.impl.schema; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import java.io.File; import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.junit.Before; @@ -205,7 +205,7 @@ public class NormalizedDataBuilderTest { } private static DataSchemaNode findChildNode(final Iterable children, final String name) { - List containers = Lists.newArrayList(); + List containers = new ArrayList<>(); for (DataSchemaNode dataSchemaNode : children) { if (dataSchemaNode.getQName().getLocalName().equals(name)) { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java index 88407f0d7f..4b5e7ba2ea 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java @@ -153,7 +153,8 @@ public class SchemaOrderedNormalizedNodeWriterTest { XMLAssert.assertXMLIdentical(new Diff(EXPECTED_2, stringWriter.toString()), true); } - private SchemaContext getSchemaContext(final String filePath) throws URISyntaxException, ReactorException, FileNotFoundException { + private static SchemaContext getSchemaContext(final String filePath) throws URISyntaxException, + ReactorException, FileNotFoundException { return YangParserTestUtils.parseYangSource(filePath); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5396.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5396.java index 79abde6c6c..83a09a8f3c 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5396.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5396.java @@ -43,7 +43,7 @@ public class Bug5396 { static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private QNameModule fooModuleQName; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5446Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5446Test.java index b67269a766..748bfddf54 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5446Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5446Test.java @@ -56,7 +56,7 @@ public class Bug5446Test extends XMLTestCase { static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private final QNameModule fooModuleQName; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java index 3079e9ab6c..76dd614f7a 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java @@ -159,7 +159,7 @@ public class NormalizedNodeXmlTranslationTest { final NormalizedNodeBuilder> booleanBuilder = Builders .leafBuilder().withNodeIdentifier(getNodeIdentifier("boolean")); - booleanBuilder.withValue(false); + booleanBuilder.withValue(Boolean.FALSE); b.withChild(booleanBuilder.build()); final ListNodeBuilder> leafListBuilder = Builders.leafSetBuilder() @@ -315,7 +315,7 @@ public class NormalizedNodeXmlTranslationTest { static final XMLOutputFactory XML_FACTORY; static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private static void writeNormalizedNode(final NormalizedNode normalized, final DOMResult result, diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLDeserializationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLDeserializationTest.java index b81cf03746..ba3a26bce9 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLDeserializationTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLDeserializationTest.java @@ -52,7 +52,7 @@ public class YangModeledAnyXMLDeserializationTest { static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private QNameModule fooModuleQName; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLSerializationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLSerializationTest.java index 0beec24d40..3aadcd16f2 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLSerializationTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLSerializationTest.java @@ -60,7 +60,7 @@ public class YangModeledAnyXMLSerializationTest extends XMLTestCase { static { XML_FACTORY = XMLOutputFactory.newFactory(); - XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false); + XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.FALSE); } private final QNameModule bazModuleQName; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConfigStatementValidationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConfigStatementValidationTest.java index 5322b9887b..eed8728b32 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConfigStatementValidationTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConfigStatementValidationTest.java @@ -29,13 +29,9 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; // TODO: expand these tests to catch some more obscure cases public class ConfigStatementValidationTest { - private static final Logger LOG = LoggerFactory.getLogger(ConfigStatementValidationTest.class); - private static final Short ONE_ID = 1; private static final Short TWO_ID = 2; diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ConstraintDefinitions.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ConstraintDefinitions.java index 4ee52b343c..e7b93721f2 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ConstraintDefinitions.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ConstraintDefinitions.java @@ -26,7 +26,7 @@ public final class ConstraintDefinitions { result = prime * result + Objects.hashCode(def.getMustConstraints()); result = prime * result + Objects.hashCode(def.getMinElements()); result = prime * result + Objects.hashCode(def.getMaxElements()); - result = prime * result + Objects.hashCode(def.isMandatory()); + result = prime * result + Boolean.hashCode(def.isMandatory()); return result; }