From: Robert Varga Date: Wed, 1 Jun 2016 14:16:18 +0000 (+0200) Subject: Further cleanups of code X-Git-Tag: release/boron~99 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4289d94a05680dcef581db627914f6c05b723fee;p=yangtools.git Further cleanups of code Unneeded imports, static methods, missing generics. Change-Id: Ib3fd8282d69067c11fefbc557b4c72c3700f4e63 Signed-off-by: Robert Varga --- diff --git a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java index 81b7e47548..59c91c939b 100644 --- a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java +++ b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java @@ -11,7 +11,6 @@ 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 java.net.URI; import java.util.Date; import org.junit.Test; @@ -131,7 +130,7 @@ public class QNameTest { assertNotNull(qNameModule.getRevisionNamespace()); } - private void assertLocalNameFails(final String localName) { + private static void assertLocalNameFails(final String localName) { try { new QName((URI)null, localName); fail("Local name should fail:" + localName); diff --git a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java index ef26846400..45991b2e28 100644 --- a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java +++ b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java @@ -11,8 +11,6 @@ package org.opendaylight.yangtools.yang.common; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - -import com.google.common.util.concurrent.ListenableFuture; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -133,7 +131,7 @@ public class RpcResultBuilderTest { assertEquals(rpcErrorShort.getErrorType(), rpcErrorShortWarn.getErrorType()); assertEquals(rpcErrorLong.getErrorType(), rpcErrorLongWarn.getErrorType()); assertEquals(rpcResultRpcResultBuilder1, rpcResultRpcResultBuilder2); - assertTrue(rpcResultBuilder.buildFuture() instanceof ListenableFuture); + assertNotNull(rpcResultBuilder.buildFuture()); assertEquals("RpcResult [successful=true, result=null, errors=[RpcError [message=msg, severity=ERROR, " + "errorType=RPC, tag=tag, applicationTag=null, info=null, cause=null]]]", rpcResult.toString()); } @@ -169,9 +167,9 @@ public class RpcResultBuilderTest { "error message", "my-app-tag", "my-info", cause ); } - void verifyRpcError( RpcResult result, int errorIndex, ErrorSeverity expSeverity, - ErrorType expErrorType, String expTag, String expMessage, String expAppTag, - String expInfo, Throwable expCause ) { + void verifyRpcError( final RpcResult result, final int errorIndex, final ErrorSeverity expSeverity, + final ErrorType expErrorType, final String expTag, final String expMessage, final String expAppTag, + final String expInfo, final Throwable expCause ) { List errors = new ArrayList<>( result.getErrors() ); assertTrue( "Expected error at index " + errorIndex + " not found", @@ -186,7 +184,7 @@ public class RpcResultBuilderTest { assertEquals( "getCause", expCause, error.getCause() ); } - void verifyRpcResult( RpcResult result, boolean expSuccess, Object expValue ) { + void verifyRpcResult( final RpcResult result, final boolean expSuccess, final Object expValue ) { assertEquals( "isSuccessful", expSuccess, result.isSuccessful() ); assertEquals( "getResult", expValue, result.getResult() ); } 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 5ee39805fd..1ea337039e 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 @@ -113,7 +113,7 @@ public final class XmlParserStream implements Closeable, Flushable { return this; } - private String readAnyXmlValue(final XMLStreamReader in) throws XMLStreamException { + private static String readAnyXmlValue(final XMLStreamReader in) throws XMLStreamException { String result = ""; String anyXmlElementName = in.getLocalName(); @@ -241,7 +241,7 @@ public final class XmlParserStream implements Closeable, Flushable { return codecs.codecFor(node).deserialize(value); } - private AbstractNodeDataWithSchema newEntryNode(final AbstractNodeDataWithSchema parent) { + private static AbstractNodeDataWithSchema newEntryNode(final AbstractNodeDataWithSchema parent) { AbstractNodeDataWithSchema newChild; if (parent instanceof ListNodeDataWithSchema) { newChild = new ListEntryNodeDataWithSchema(parent.getSchema()); 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 10bf9a2380..3fe28f7932 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,7 +11,6 @@ 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; @@ -23,6 +22,7 @@ import org.junit.Test; import org.opendaylight.yangtools.util.UnmodifiableCollection; 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.ChoiceNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; @@ -80,8 +80,7 @@ public class BuilderTest { 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 YangInstanceIdentifier.NodeWithValue BAR_PATH = new YangInstanceIdentifier - .NodeWithValue(LEAF_LIST_MAIN, "bar"); + 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") @@ -102,7 +101,7 @@ public class BuilderTest { @Test public void immutableOrderedMapBuilderTest() { - final LinkedList mapEntryNodeColl = new LinkedList(); + final LinkedList mapEntryNodeColl = new LinkedList<>(); mapEntryNodeColl.add(LIST_MAIN_CHILD_3); final Map keys = new HashMap<>(); keys.put(LIST_MAIN_CHILD_QNAME_1, 1); @@ -140,38 +139,38 @@ public class BuilderTest { @Test public void immutableOrderedLeafSetNodeBuilderTest() { - final NormalizedNode orderedLeafSet = ImmutableOrderedLeafSetNodeBuilder.create() + final NormalizedNode orderedLeafSet = ImmutableOrderedLeafSetNodeBuilder.create() .withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST) .withChild(LEAF_SET_ENTRY_NODE) .withChildValue("baz") .removeChild(BAR_PATH) .build(); - final LinkedList mapEntryNodeColl = new LinkedList(); - mapEntryNodeColl.add((LeafSetNode)orderedLeafSet); - final UnmodifiableCollection leafSetCollection = (UnmodifiableCollection)orderedLeafSet.getValue(); - final NormalizedNode orderedMapNodeSchemaAware = ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(leafList) + final LinkedList> mapEntryNodeColl = new LinkedList<>(); + mapEntryNodeColl.add((LeafSetNode)orderedLeafSet); + final UnmodifiableCollection leafSetCollection = (UnmodifiableCollection)orderedLeafSet.getValue(); + final NormalizedNode orderedMapNodeSchemaAware = ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(leafList) .withChildValue("baz") .build(); - final UnmodifiableCollection SchemaAwareleafSetCollection = (UnmodifiableCollection)orderedMapNodeSchemaAware + final UnmodifiableCollection SchemaAwareleafSetCollection = (UnmodifiableCollection)orderedMapNodeSchemaAware .getValue(); - final NormalizedNode orderedLeafSetShemaAware = ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(leafList, - (LeafSetNode)orderedLeafSet) + final NormalizedNode orderedLeafSetShemaAware = ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(leafList, + (LeafSetNode)orderedLeafSet) .build(); assertNotNull(Builders.orderedLeafSetBuilder(leafList)); assertNotNull(Builders.anyXmlBuilder()); assertNotNull(orderedLeafSetShemaAware.hashCode()); assertNotNull(orderedLeafSetShemaAware); - assertEquals(1, ((OrderedLeafSetNode)orderedLeafSet).getSize()); - assertEquals("baz", ((OrderedLeafSetNode)orderedLeafSet).getChild(0).getValue()); - assertNotNull(((OrderedLeafSetNode)orderedLeafSet).getChild(BAR_PATH)); + assertEquals(1, ((OrderedLeafSetNode)orderedLeafSet).getSize()); + assertEquals("baz", ((OrderedLeafSetNode)orderedLeafSet).getChild(0).getValue()); + assertNotNull(((OrderedLeafSetNode)orderedLeafSet).getChild(BAR_PATH)); assertEquals(1, leafSetCollection.size()); assertEquals(1, SchemaAwareleafSetCollection.size()); } @Test public void immutableMapNodeBuilderTest() { - final LinkedList mapEntryNodeColl = new LinkedList(); + final LinkedList mapEntryNodeColl = new LinkedList<>(); mapEntryNodeColl.add(LIST_MAIN_CHILD_3); final CollectionNodeBuilder collectionNodeBuilder = ImmutableMapNodeBuilder.create(1); assertNotNull(collectionNodeBuilder); @@ -256,7 +255,7 @@ public class BuilderTest { @Test(expected=NullPointerException.class) public void immutableLeafSetNodeBuilderExceptionTest() { - final LeafSetNode leafSetNode = ImmutableLeafSetNodeBuilder.create(1).withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST) + final LeafSetNode leafSetNode = ImmutableLeafSetNodeBuilder.create(1).withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST) .build(); assertNotNull(leafSetNode); ImmutableLeafSetNodeSchemaAwareBuilder.create(mock(LeafListSchemaNode.class), leafSetNode).build(); @@ -314,7 +313,7 @@ public class BuilderTest { ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(leafList).withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST).build(); } - private static LeafSetNode getImmutableLeafSetNode() { + private static LeafSetNode getImmutableLeafSetNode() { final ListNodeBuilder> leafSetBuilder = Builders.leafSetBuilder(); leafSetBuilder.withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST); leafSetBuilder.addChild(LEAF_SET_ENTRY_NODE); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/LeafSetDomSerializerTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/LeafSetDomSerializerTest.java index ba960d05b7..2802a8ddd8 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/LeafSetDomSerializerTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/LeafSetDomSerializerTest.java @@ -11,7 +11,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.serialize import java.io.IOException; import java.text.ParseException; import org.junit.Test; -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.builder.impl.ImmutableLeafSetEntryNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -23,7 +23,7 @@ import org.w3c.dom.Element; public class LeafSetDomSerializerTest { private LeafSetEntryNodeDomSerializer temp; private LeafListSchemaNode currentLeafList; - private LeafSetEntryNode tempLeafList; + private LeafSetEntryNode tempLeafList; @Test public void leafSetDomSerializerTest() throws IOException, YangSyntaxErrorException, ParseException, ReactorException { @@ -39,8 +39,7 @@ public class LeafSetDomSerializerTest { currentLeafList = (LeafListSchemaNode) currentContainer.getDataChildByName(DomSerializerTestUtils .generateQname("first-leaf-list")); - final YangInstanceIdentifier.NodeWithValue barPath = new YangInstanceIdentifier.NodeWithValue - (DomSerializerTestUtils.generateQname("first-leaf-list"), "bar"); + final NodeWithValue barPath = new NodeWithValue<>(DomSerializerTestUtils.generateQname("first-leaf-list"), "bar"); tempLeafList = ImmutableLeafSetEntryNodeBuilder.create() .withNodeIdentifier(barPath) .withValue("bar") diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java index 6e1c0a72e5..751a79984e 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java @@ -59,7 +59,7 @@ public abstract class AbstractStringInstanceIdentifierCodec extends AbstractName } } else if (arg instanceof NodeWithValue) { sb.append("[.='"); - sb.append(((NodeWithValue) arg).getValue()); + sb.append(((NodeWithValue) arg).getValue()); sb.append("']"); } } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryContextNode.java index c8dd12ca05..540c8720bb 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafListEntryContextNode.java @@ -10,10 +10,10 @@ package org.opendaylight.yangtools.yang.data.util; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; -final class LeafListEntryContextNode extends AbstractLeafNodeContext { +final class LeafListEntryContextNode extends AbstractLeafNodeContext> { public LeafListEntryContextNode(final LeafListSchemaNode potential) { - super(new NodeWithValue(potential.getQName(), null), potential); + super(new NodeWithValue<>(potential.getQName(), null), potential); } @Override diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java index 980f5f7c67..fe5aaffee7 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java @@ -76,7 +76,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder current; private int offset; - XpathStringParsingPathArgumentBuilder(AbstractStringInstanceIdentifierCodec codec, String data) { + XpathStringParsingPathArgumentBuilder(final AbstractStringInstanceIdentifierCodec codec, final String data) { this.codec = Preconditions.checkNotNull(codec); this.data = Preconditions.checkNotNull(data); this.current = codec.getDataContextTree().getRoot(); @@ -106,7 +106,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder nextContextNode(QName name) { + private DataSchemaContextNode nextContextNode(final QName name) { current = current.getChild(name); checkValid(current != null, "%s is not correct schema node identifier.",name); while (current.isMixin()) { @@ -133,7 +133,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder currentNode = nextContextNode(name); checkValid(currentNode.isKeyedEntry(), "Entry %s does not allow specifying predicates.", name); @@ -158,7 +158,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder(name, keyValue); } final DataSchemaContextNode keyNode = currentNode.getChild(key); checkValid(keyNode != null, "%s is not correct schema node identifier.", key); @@ -169,7 +169,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder currentNode = nextContextNode(name); checkValid(!currentNode.isKeyedEntry(), "Entry %s requires key or value predicate to be present", name); return currentNode.getIdentifier(); @@ -210,7 +210,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder typeDefinition = concreteTypeBuilder.buildType(); assertEquals(typeDefinition.getBaseType(), derivedTypeDef.getBaseType()); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/AbstractConstraintEffectiveStatement.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/AbstractConstraintEffectiveStatement.java index 4bc14b46f7..7c2bc71dbe 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/AbstractConstraintEffectiveStatement.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/AbstractConstraintEffectiveStatement.java @@ -30,7 +30,7 @@ abstract class AbstractConstraintEffectiveStatement ctx, ConstraintFactory constraintFactory) { + public AbstractConstraintEffectiveStatement(final StmtContext ctx, final ConstraintFactory constraintFactory) { super(ctx); String descriptionInit = null; String referenceInit = null; @@ -92,7 +92,7 @@ abstract class ConstraintFactory { abstract class ListConstraintFactory extends ConstraintFactory> { @Override - protected List createConstraints(AbstractConstraintEffectiveStatement, ?> stmt, List argument) { + protected List createConstraints(final AbstractConstraintEffectiveStatement, ?> stmt, final List argument) { if (!stmt.isCustomizedStatement()) { return ImmutableList.copyOf(argument); } @@ -109,8 +109,8 @@ abstract class ListConstraintFactory extends ConstraintFactory> { final class LengthConstraintFactory extends ListConstraintFactory { @Override - protected LengthConstraint createCustomizedConstraint(LengthConstraint lengthConstraint, - AbstractConstraintEffectiveStatement, ?> stmt) { + protected LengthConstraint createCustomizedConstraint(final LengthConstraint lengthConstraint, + final AbstractConstraintEffectiveStatement, ?> stmt) { return new LengthConstraintEffectiveImpl(lengthConstraint.getMin(), lengthConstraint.getMax(), stmt.getDescription(), stmt.getReference(), stmt.getErrorAppTag(), stmt.getErrorMessage()); } @@ -118,8 +118,8 @@ final class LengthConstraintFactory extends ListConstraintFactory { @Override - protected RangeConstraint createCustomizedConstraint(RangeConstraint rangeConstraint, - AbstractConstraintEffectiveStatement, ?> stmt) { + protected RangeConstraint createCustomizedConstraint(final RangeConstraint rangeConstraint, + final AbstractConstraintEffectiveStatement, ?> stmt) { return new RangeConstraintEffectiveImpl(rangeConstraint.getMin(), rangeConstraint.getMax(), stmt.getDescription(), stmt.getReference(), stmt.getErrorAppTag(), stmt.getErrorMessage()); } @@ -127,7 +127,7 @@ final class RangeConstraintFactory extends ListConstraintFactory { @Override - protected PatternConstraint createConstraints(AbstractConstraintEffectiveStatement stmt, PatternConstraint argument) { + protected PatternConstraint createConstraints(final AbstractConstraintEffectiveStatement stmt, final PatternConstraint argument) { if (!stmt.isCustomizedStatement()) { return argument; } else { @@ -135,8 +135,8 @@ final class PatternConstraintFactory extends ConstraintFactory stmt) { + private static PatternConstraint createCustomizedConstraint(final PatternConstraint patternConstraint, + final AbstractConstraintEffectiveStatement stmt) { return new PatternConstraintEffectiveImpl(patternConstraint.getRegularExpression(), stmt.getDescription(), stmt.getReference(), stmt.getErrorAppTag(), stmt.getErrorMessage()); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java index 18b6fa72cf..2f6b63ebb8 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; - import com.google.common.collect.Lists; import com.google.common.util.concurrent.CheckedFuture; import java.util.HashSet; @@ -157,14 +156,14 @@ public class SharedSchemaRepositoryWithFeaturesTest { assertNotNull(testLeafC); } - private SettableSchemaProvider getImmediateYangSourceProviderFromResource( + private static SettableSchemaProvider getImmediateYangSourceProviderFromResource( final String resourceName) throws Exception { final ResourceYangSource yangSource = new ResourceYangSource(resourceName); final CheckedFuture aSTSchemaSource = TextToASTTransformer.TRANSFORMATION.apply(yangSource); return SettableSchemaProvider.createImmediate(aSTSchemaSource.get(), ASTSchemaSource.class); } - private void assertSchemaContext(final SchemaContext schemaContext, final int moduleSize) { + private static void assertSchemaContext(final SchemaContext schemaContext, final int moduleSize) { assertNotNull(schemaContext); assertEquals(moduleSize, schemaContext.getModules().size()); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java index 0441cca398..1ce5dc397f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; @@ -56,7 +55,6 @@ public class Bug3874ExtensionTest { assertEquals(1, unknownSchemaNodes.size()); UnknownSchemaNode next = unknownSchemaNodes.iterator().next(); - assertTrue(next instanceof UnknownSchemaNode); assertTrue(next instanceof AnyxmlSchemaLocationEffectiveStatementImpl); AnyxmlSchemaLocationEffectiveStatementImpl anyxmlSchemaLocationUnknownNode= (AnyxmlSchemaLocationEffectiveStatementImpl) next; assertEquals(SupportedExtensionsMapping.ANYXML_SCHEMA_LOCATION.getStatementName(), anyxmlSchemaLocationUnknownNode.getNodeType()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java index 2c189753f9..1bdba2f48c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import java.net.URI; import java.util.Date; import org.junit.Test; @@ -64,7 +63,7 @@ public class Bug4610Test { } - private ContainerEffectiveStatementImpl findContainer(SchemaContext context, QName... path) { + private static ContainerEffectiveStatementImpl findContainer(final SchemaContext context, final QName... path) { SchemaNode node = SchemaContextUtil.findDataSchemaNode(context, SchemaPath.create(true, path)); assertTrue(node instanceof ContainerEffectiveStatementImpl); ContainerEffectiveStatementImpl container = (ContainerEffectiveStatementImpl) node; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481.java index 71f6a89ffa..27c0a81a33 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481.java @@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; - import java.io.FileNotFoundException; import java.net.URISyntaxException; import org.junit.Test; @@ -37,7 +36,7 @@ public class Bug5481 { verifyExtendedLeaf(topContainer); } - private ContainerSchemaNode verifyTopContainer(SchemaContext context) { + private static ContainerSchemaNode verifyTopContainer(final SchemaContext context) { QName top = QName.create("http://example.com/module1", "2016-03-09", "top"); DataSchemaNode dataChildByName = context.getDataChildByName(top); assertTrue(dataChildByName instanceof ContainerSchemaNode); @@ -52,7 +51,7 @@ public class Bug5481 { return topContainer; } - private void verifyExtendedLeaf(ContainerSchemaNode topContainer) { + private static void verifyExtendedLeaf(final ContainerSchemaNode topContainer) { DataSchemaNode dataChildByName2 = topContainer.getDataChildByName(QName.create("http://example.com/module2", "2016-03-09", "extended-leaf")); assertTrue(dataChildByName2 instanceof LeafSchemaNode); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java index 46a9914a62..99566f8d0d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; - import java.io.FileNotFoundException; import java.net.URISyntaxException; import org.junit.Test; @@ -35,7 +34,7 @@ public class Bug5712Test { checkThing2TypeDef(badModule); } - private void checkThing2TypeDef(Module badModule) { + private static void checkThing2TypeDef(final Module badModule) { TypeDefinition thing2 = null; for (TypeDefinition typeDef : badModule.getTypeDefinitions()) { if (typeDef.getQName().getLocalName().equals("thing2")) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java index 01c44391d5..797b65c253 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java @@ -130,13 +130,13 @@ public class TypesResolutionTest { List> unionTypes = baseType.getTypes(); StringTypeDefinition ipv4 = (StringTypeDefinition) unionTypes.get(0); - assertTrue(ipv4.getBaseType() instanceof StringTypeDefinition); + assertNotNull(ipv4.getBaseType()); String expectedPattern = "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}" + "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])" + "(%[\\p{N}\\p{L}]+)?$"; assertEquals(expectedPattern, ipv4.getPatternConstraints().get(0).getRegularExpression()); StringTypeDefinition ipv6 = (StringTypeDefinition) unionTypes.get(1); - assertTrue(ipv6.getBaseType() instanceof StringTypeDefinition); + assertNotNull(ipv6.getBaseType()); List ipv6Patterns = ipv6.getPatternConstraints(); expectedPattern = "^((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}" + "((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|" + "(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}" @@ -153,7 +153,7 @@ public class TypesResolutionTest { Module tested = TestUtils.findModule(testedModules, "ietf-inet-types"); Set> typedefs = tested.getTypeDefinitions(); StringTypeDefinition type = (StringTypeDefinition) TestUtils.findTypedef(typedefs, "domain-name"); - assertTrue(type.getBaseType() instanceof StringTypeDefinition); + assertNotNull(type.getBaseType()); List patterns = type.getPatternConstraints(); assertEquals(1, patterns.size()); String expectedPattern = "^((([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.)*"