Cleanup codecs a bit 69/53469/5
authorRobert Varga <rovarga@cisco.com>
Fri, 17 Mar 2017 09:49:43 +0000 (10:49 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 23 Mar 2017 09:26:57 +0000 (10:26 +0100)
- prevent unnecessary boxing
- add type arguments
- static methods
- do not use deprecated methods

Change-Id: Ic129d327804d3b28066c84d6101cbe262e2101b1
Signed-off-by: Robert Varga <rovarga@cisco.com>
25 files changed:
yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4501Test.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug6112Test.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5396Test.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodeXmlTranslationTest.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/NormalizedNodesToXmlTest.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriterTest.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java
yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLSerializationTest.java
yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/LeafSetEntryNodeBaseParser.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/BuilderTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5396.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/Bug5446Test.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLDeserializationTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/YangModeledAnyXMLSerializationTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConfigStatementValidationTest.java
yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ConstraintDefinitions.java

index 2a1f8e1c990b259aee98fa0c1bc013ce4ed60ebf..0d73512b7adc1e2b9b473566bd141808bf7ca50e 100644 (file)
@@ -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) {
index 273238c2cf114be655092c3f1ad10c414d7f2025..f4157ea535ea6081f61161561d8e2e19c0180223 100644 (file)
@@ -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<DataContainerChild<? extends PathArgument, ?>> lrsBits = hop.getChild(0).getChild(
index 116080fab1022635d964b7d9b34228fadfa1dbbd..6bfa175f28b8ebcfeb1b6519b7e743a7eac54ebc 100644 (file)
@@ -86,7 +86,7 @@ public class Bug5446Test {
         return writer.toString();
     }
 
-    private ContainerNode createRootNode() {
+    private static ContainerNode createRootNode() {
         LeafNode<byte[]> ipAddress = ImmutableNodes.leafNode(ipAddressQName, BaseEncoding.base64().decode("fwAAAQ=="));
         return ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(rootQName))
                 .withChild(ipAddress).build();
index bbc0a07b6f32bbe51e94316ee45b966ef53c34d8..8c4f14cc865504f88bb45aa4c12276fc7ce34f92 100644 (file)
@@ -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();
index 889a9bfe6cb8c45263b9e74720c8ec945957fce0..bb459fc9608ea7a730ab67b3cedf7de0ca76d8b0 100644 (file)
@@ -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());
index a32254ebe145f71cac6d40ba221cc37cab4a0282..cccf6f0654a28d3d52715432a8f153df08494c13 100644 (file)
@@ -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());
index 75548659cebba8dd5370cbbabecc084b95ca38fc..70f3b4dc4929b8eabbf89a9ea01760898e7b2db4 100644 (file)
@@ -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;
index 3e4ee08c97218bad534d6f630c68fdc024f95a6f..8809b038283c2ceaf0076cf3fe83f29d00461f31 100644 (file)
@@ -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<NodeIdentifier, Object, LeafNode<Object>> booleanBuilder = Builders
                 .leafBuilder().withNodeIdentifier(getNodeIdentifier("boolean"));
-        booleanBuilder.withValue(false);
+        booleanBuilder.withValue(Boolean.FALSE);
         b.withChild(booleanBuilder.build());
 
         final ListNodeBuilder<Object, LeafSetEntryNode<Object>> 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);
 
index 4338cbeb30d31a2db422ac599f3145ead592dd75..20816433c23a2395936dbf7f2d132a6672474b5f 100644 (file)
@@ -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);
 
index 0c984956183212bb53b524417a963d9b0f6cf489..ae95d20b6886e00194b0b55ba4a552519434fa03 100644 (file)
@@ -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);
 
index 81df3d47af9b6a154200b213efc122c9392224f8..ecde264cda4fe8214c70f3b686e60e7f2f444b02 100644 (file)
@@ -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.");
index 1aa608eefe24faac5f6183679af2974b23a7a1bc..8eac1709a821036f59cf1836221908945e89287a 100644 (file)
@@ -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;
         }
index abfc447d87acdadcbc77d0331072d39c3943a198..8198cfa20c052ae02d40986a849a69cdd4c7a1b4 100644 (file)
@@ -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);
 
index 59abc56a685e79cdd39ca95bd0ba696d14350f23..fbb28f1c7beb94be9ee8ae920c00c535f4442310 100644 (file)
@@ -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 <E> type of elements to be parsed
  */
-public abstract class LeafSetEntryNodeBaseParser<E> implements ExtensibleParser<YangInstanceIdentifier.NodeWithValue, E, LeafSetEntryNode<?>, LeafListSchemaNode> {
+public abstract class LeafSetEntryNodeBaseParser<E> implements ExtensibleParser<NodeWithValue, E, LeafSetEntryNode<?>, LeafListSchemaNode> {
 
-    private final BuildingStrategy<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<?>> buildingStrategy;
+    private final BuildingStrategy<NodeWithValue, LeafSetEntryNode<?>> buildingStrategy;
 
     public LeafSetEntryNodeBaseParser() {
         buildingStrategy = new SimpleLeafSetEntryBuildingStrategy();
     }
 
-    public LeafSetEntryNodeBaseParser(final BuildingStrategy<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<?>> buildingStrategy) {
+    public LeafSetEntryNodeBaseParser(final BuildingStrategy<NodeWithValue, LeafSetEntryNode<?>> buildingStrategy) {
         this.buildingStrategy = buildingStrategy;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public final LeafSetEntryNode<?> parse(Iterable<E> elements, LeafListSchemaNode schema) {
+    public final LeafSetEntryNode<?> parse(final Iterable<E> 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<YangInstanceIdentifier.NodeWithValue, Object, LeafSetEntryNode<Object>> leafEntryBuilder = Builders
+        NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafEntryBuilder = Builders
                 .leafSetEntryBuilder(schema);
         leafEntryBuilder.withAttributes(getAttributes(e));
         leafEntryBuilder.withValue(value);
@@ -76,7 +75,7 @@ public abstract class LeafSetEntryNodeBaseParser<E> implements ExtensibleParser<
      */
     protected abstract Map<QName, String> getAttributes(E e);
 
-    public static class SimpleLeafSetEntryBuildingStrategy implements BuildingStrategy<YangInstanceIdentifier.NodeWithValue, LeafSetEntryNode<?>> {
+    public static class SimpleLeafSetEntryBuildingStrategy implements BuildingStrategy<NodeWithValue, LeafSetEntryNode<?>> {
 
         @Override
         public LeafSetEntryNode<?> build(final NormalizedNodeBuilder<NodeWithValue, ?, LeafSetEntryNode<?>> builder) {
index 66f7ba0c6945bfcc5c464b940dd38eff5334307e..b1e878bef782ee4e44fefa2d3033ab35483ca02c 100644 (file)
@@ -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<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), BooleanCodec.class);
+        BooleanCodec<String> 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<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), BooleanCodec.class);
+        BooleanCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(),
+            BooleanCodec.class);
 
         assertEquals("deserialize", Boolean.TRUE, codec.deserialize("true"));
         assertEquals("deserialize", Boolean.TRUE, codec.deserialize("TRUE"));
index 0c2c6e8c5081a92e1971a2ca5ba85fc63d31d8b3..e4ede1f76e8ed059e3df8750755747a7958ee74f 100644 (file)
@@ -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<String> 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()
index 5f373d1f6cfa5beeef948c9c66e69c5e8650f3c1..e7799ba4a16d4967e58e1e857f569df67a20610a 100644 (file)
@@ -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<DataSchemaNode> children, final String name) {
-        List<DataNodeContainer> containers = Lists.newArrayList();
+        List<DataNodeContainer> containers = new ArrayList<>();
 
         for (DataSchemaNode dataSchemaNode : children) {
             if (dataSchemaNode.getQName().getLocalName().equals(name)) {
index 88407f0d7f2935e6c95ea42411b8eec5e5173a62..4b5e7ba2ea4a2c189199ac94834cc302a5769461 100644 (file)
@@ -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);
     }
 
index 79abde6c6c2267944f7cf9b33cb11e69de021412..83a09a8f3c82641356a312a85ed881950e5a6978 100644 (file)
@@ -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;
index b67269a766b5b0fd2f1e74387ad2ac4fe8cfeea8..748bfddf545c11115b1943a227b071757410453c 100644 (file)
@@ -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;
index 3079e9ab6c5df12e7378ee298390a64fb2166eb8..76dd614f7a4b1cbf363acdea1c5dee45f622ff5b 100644 (file)
@@ -159,7 +159,7 @@ public class NormalizedNodeXmlTranslationTest {
 
         final NormalizedNodeBuilder<NodeIdentifier, Object, LeafNode<Object>> booleanBuilder = Builders
                 .leafBuilder().withNodeIdentifier(getNodeIdentifier("boolean"));
-        booleanBuilder.withValue(false);
+        booleanBuilder.withValue(Boolean.FALSE);
         b.withChild(booleanBuilder.build());
 
         final ListNodeBuilder<Object, LeafSetEntryNode<Object>> 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,
index b81cf03746fd56f71b1adab45f0f697da7fa6df7..ba3a26bce9ea6d18531230a5ab8368556abdd560 100644 (file)
@@ -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;
index 0beec24d40ddfa841a8501f5a3d3a11b51cf8a3d..3aadcd16f2869343ac818c6439b53c41f4b6c3bb 100644 (file)
@@ -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;
index 5322b9887bf2a2395113fce670a8ac081945b5b1..eed8728b32f15dc5f73a387a774521a947110b54 100644 (file)
@@ -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;
 
index 4ee52b343c146359a90430237602bac9548ab59f..e7b93721f2af1dc3062e18f0b812281cc4045fdb 100644 (file)
@@ -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;
     }