From: Stephen Kitt Date: Wed, 2 Nov 2016 12:02:36 +0000 (+0100) Subject: Cleanup: remove redundant casts X-Git-Tag: release/carbon~264 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=5cf94e667e9102a281b4eee9cf128c0a56f42469;p=yangtools.git Cleanup: remove redundant casts Change-Id: Ibeca74821b2f03c97a31d7bb1b1691c14df33e15 Signed-off-by: Stephen Kitt --- diff --git a/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java b/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java index 0896717eca..1679d7ee1a 100644 --- a/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java +++ b/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java @@ -61,7 +61,7 @@ public class MockitoExampleTutorialTest { SomeService service = mock(SomeService.class); when(service.foobar(any())).thenAnswer(invocation -> { // Urgh! This is ugly.. (Mockito 2.0 may be better, see http://site.mockito.org/mockito/docs/current/org/mockito/ArgumentMatcher.html) - File file = (File) invocation.getArgumentAt(0, File.class); + File file = invocation.getArgumentAt(0, File.class); if (file.getName().equals("hello.txt")) { return 123; } else { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java index 8f03693132..420172dc75 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java @@ -91,7 +91,7 @@ public abstract class SingletonSet implements Set, Immutable, Serializable return a; } - return (T[]) new Object[] { (T) getElement() }; + return (T[]) new Object[] {getElement()}; } @Override diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java index 3d7e40be7d..deeafc1c1b 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java @@ -61,7 +61,7 @@ public class MappingCheckedFutureTest { @Override public Throwable extractWrappedTestEx( final Exception from ) { if (from instanceof ExecutionException ) { - return ((ExecutionException)from).getCause(); + return from.getCause(); } return from; @@ -77,7 +77,7 @@ public class MappingCheckedFutureTest { @Override public Throwable extractWrappedTestEx( final Exception from ) { if (from instanceof ExecutionException ) { - return ((ExecutionException)from).getCause(); + return from.getCause(); } return from; diff --git a/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RegularExpression.java b/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RegularExpression.java index 7f3a445306..5b040263dd 100644 --- a/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RegularExpression.java +++ b/third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RegularExpression.java @@ -666,7 +666,7 @@ public class RegularExpression implements java.io.Serializable { * @return true if the target is matched to this regular expression. */ public boolean matches(char[] target) { - return this.matches(target, 0, target .length , (Match)null); + return this.matches(target, 0, target .length , null); } /** @@ -678,7 +678,7 @@ public class RegularExpression implements java.io.Serializable { * @return true if the target is matched to this regular expression. */ public boolean matches(char[] target, int start, int end) { - return this.matches(target, start, end, (Match)null); + return this.matches(target, start, end, null); } /** @@ -856,7 +856,7 @@ public class RegularExpression implements java.io.Serializable { * @return true if the target is matched to this regular expression. */ public boolean matches(String target) { - return this.matches(target, 0, target .length() , (Match)null); + return this.matches(target, 0, target .length() , null); } /** @@ -868,7 +868,7 @@ public class RegularExpression implements java.io.Serializable { * @return true if the target is matched to this regular expression. */ public boolean matches(String target, int start, int end) { - return this.matches(target, start, end, (Match)null); + return this.matches(target, start, end, null); } /** @@ -1585,7 +1585,7 @@ public class RegularExpression implements java.io.Serializable { * @return true if the target is matched to this regular expression. */ public boolean matches(CharacterIterator target) { - return this.matches(target, (Match)null); + return this.matches(target, null); } 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 59c91c939b..e6a279b329 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 @@ -42,7 +42,7 @@ public class QNameTest { } // no namespace nor revision { - QName qName = new QName((URI) null, localName); + QName qName = new QName(null, localName); assertEquals(localName, qName.toString()); QName copied = QName.create(qName.toString()); assertEquals(qName, copied); @@ -132,7 +132,7 @@ public class QNameTest { private static void assertLocalNameFails(final String localName) { try { - new QName((URI)null, localName); + new QName(null, localName); fail("Local name should fail:" + localName); } catch (IllegalArgumentException e) { } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedReversePathArguments.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedReversePathArguments.java index 7317a622e5..b68ed23a1a 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedReversePathArguments.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedReversePathArguments.java @@ -33,7 +33,7 @@ final class StackedReversePathArguments extends PathArgumentList { } Verify.verify(current instanceof StackedYangInstanceIdentifier); - current = ((StackedYangInstanceIdentifier)current).getParent(); + current = current.getParent(); } } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java index 127db2ddbf..dfe72da591 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java @@ -467,7 +467,7 @@ public abstract class YangInstanceIdentifier implements Path lflst11Values = Sets.newHashSet(); for (final JsonElement jsonElement : lflst11) { assertTrue(jsonElement instanceof JsonPrimitive); - lflst11Values.add(((JsonPrimitive) jsonElement).getAsString()); + lflst11Values.add(jsonElement.getAsString()); } assertEquals(Sets.newHashSet("lflst11 value2\r\nanother line 2", "lflst11 value1\nanother line 1"), @@ -172,7 +172,7 @@ public class NormalizedNodeToJsonStreamTest { final HashSet lflst11Values = Sets.newHashSet(); for (final JsonElement jsonElement : lflst11) { assertTrue(jsonElement instanceof JsonPrimitive); - lflst11Values.add(((JsonPrimitive) jsonElement).getAsString()); + lflst11Values.add(jsonElement.getAsString()); } assertEquals(Sets.newHashSet("lflst11 value2", "lflst11 value1"), lflst11Values); 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 c4ba341711..f11763ac8c 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 @@ -91,7 +91,7 @@ public class NormalizedDataBuilderTest { .withNodeIdentifier( new NodeIdentifierWithPredicates( getNodeIdentifier("list").getNodeType(), Collections.singletonMap( - getNodeIdentifier("uint32InList").getNodeType(), (Object) 1))).build(); + getNodeIdentifier("uint32InList").getNodeType(), 1))).build(); MapNode list = Builders.mapBuilder().withChild(listChild1).withNodeIdentifier(getNodeIdentifier("list")) .build(); diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafInterner.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafInterner.java index 3bd4d721c7..80cec0b2ef 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafInterner.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafInterner.java @@ -13,7 +13,6 @@ import com.google.common.collect.Interner; import com.google.common.collect.Interners; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.yangtools.yang.data.api.AttributesContainer; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -45,7 +44,7 @@ public final class LeafInterner { } private static > T intern(final T sample) { - if (((AttributesContainer) sample).getAttributes().isEmpty()) { + if (sample.getAttributes().isEmpty()) { @SuppressWarnings("unchecked") final T ret = (T) INTERNER.intern(sample); LOG.trace("Interned object {} to {}", sample, ret); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java index eaca037a51..bb9618de9e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java @@ -30,7 +30,7 @@ public class SchemaResolutionException extends SchemaSourceException { private final Collection resolvedSources; public SchemaResolutionException(@Nonnull final String message) { - this(message, (Throwable)null); + this(message, null); } public SchemaResolutionException(@Nonnull final String message, final Throwable cause) { diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java index 0baf827c08..1f169cc954 100644 --- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java +++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java @@ -143,10 +143,8 @@ class SingleModuleYinStatementWriter implements StatementTextWriter { } private static boolean isArgumentYinElement(final StatementDefinition currentStatement) { - if (currentStatement instanceof Rfc6020Mapping) { - return ((Rfc6020Mapping) currentStatement).isArgumentYinElement(); - } else if (currentStatement instanceof ExtensionStatement) { - return ((ExtensionStatement) currentStatement).isArgumentYinElement(); + if (currentStatement instanceof Rfc6020Mapping || currentStatement instanceof ExtensionStatement) { + return currentStatement.isArgumentYinElement(); } return false; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java index 45bf701a1a..ef7338c756 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java @@ -671,7 +671,7 @@ public abstract class StatementContextBase, E @Override public > void addContext(final Class namespace, final KT key, final StmtContext stmt) { - addContextToNamespace(namespace, (K) key, stmt); + addContextToNamespace(namespace, key, stmt); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java index c354ac3109..6344beecc8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java @@ -54,14 +54,14 @@ public class SchemaNodeIdentifierBuildNamespace extends return null; } QName nextPath = iterator.next(); - StmtContext.Mutable> current = (StmtContext.Mutable>) lookupStartStorage + StmtContext.Mutable> current = lookupStartStorage .getFromLocalStorage(ChildSchemaNodes.class, nextPath); if (current == null && lookupStartStorage instanceof StmtContext) { return tryToFindUnknownStatement(nextPath.getLocalName(), (Mutable>) lookupStartStorage); } while (current != null && iterator.hasNext()) { nextPath = iterator.next(); - final StmtContext.Mutable> nextNodeCtx = (StmtContext.Mutable>) current + final StmtContext.Mutable> nextNodeCtx = current .getFromNamespace(ChildSchemaNodes.class, nextPath); if (nextNodeCtx == null) { return tryToFindUnknownStatement(nextPath.getLocalName(), current); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java index a05080207f..74e80301b6 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java @@ -227,7 +227,7 @@ public final class TestUtils { public static void checkIsAddedByUses(final GroupingDefinition node, final boolean expected) { assertEquals(expected, node.isAddedByUses()); - for (DataSchemaNode child : ((DataNodeContainer) node).getChildNodes()) { + for (DataSchemaNode child : node.getChildNodes()) { checkIsAddedByUses(child, expected); } }