Cleanup: remove redundant casts 34/47834/2
authorStephen Kitt <skitt@redhat.com>
Wed, 2 Nov 2016 12:02:36 +0000 (13:02 +0100)
committerRobert Varga <nite@hq.sk>
Wed, 2 Nov 2016 15:26:24 +0000 (15:26 +0000)
Change-Id: Ibeca74821b2f03c97a31d7bb1b1691c14df33e15
Signed-off-by: Stephen Kitt <skitt@redhat.com>
15 files changed:
common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/tests/MockitoExampleTutorialTest.java
common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java
third-party/xsd-regex/src/main/java/org/opendaylight/yangtools/xsd/regex/RegularExpression.java
yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/QNameTest.java
yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedReversePathArguments.java
yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java
yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafInterner.java
yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java
yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java
yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java

index 0896717eca40d1dbf573cbf85d7c0db966a770e2..1679d7ee1afdc0efc6647f862f931313713a063a 100644 (file)
@@ -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 {
index 8f036931329cce6ec99db8e9ec4595677f8f10a2..420172dc75ccb2d106e4fae98c51715ad4f92dbe 100644 (file)
@@ -91,7 +91,7 @@ public abstract class SingletonSet<E> implements Set<E>, Immutable, Serializable
             return a;
         }
 
-        return (T[]) new Object[] { (T) getElement() };
+        return (T[]) new Object[] {getElement()};
     }
 
     @Override
index 3d7e40be7d2561bd4eba498b2e6122b8adaf289f..deeafc1c1b747b3412387a308abb9b4036548cd1 100644 (file)
@@ -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;
index 7f3a4453067ff7c113751b4b4e64a1bf34b95e38..5b040263ddb7983ac54db802d65a259a869637d4 100644 (file)
@@ -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);
     }
 
 
index 59c91c939bbcb4a1d3abb85eada17cffcb7910ff..e6a279b32925dd536b07d09173330d74b7127379 100644 (file)
@@ -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) {
         }
index 7317a622e578b45de4f7814c1514720a05b24654..b68ed23a1af11feabee61f0980aefa5664747bfe 100644 (file)
@@ -33,7 +33,7 @@ final class StackedReversePathArguments extends PathArgumentList {
             }
 
             Verify.verify(current instanceof StackedYangInstanceIdentifier);
-            current = ((StackedYangInstanceIdentifier)current).getParent();
+            current = current.getParent();
         }
     }
 
index 127db2ddbf0f836ac20e88a92175baa8a7f0971f..dfe72da5912073837ddab275b5f74b93a936e953 100644 (file)
@@ -467,7 +467,7 @@ public abstract class YangInstanceIdentifier implements Path<YangInstanceIdentif
         @Override
         public String toRelativeString(final PathArgument previous) {
             if (previous instanceof AbstractPathArgument) {
-                final QNameModule mod = ((AbstractPathArgument)previous).getNodeType().getModule();
+                final QNameModule mod = previous.getNodeType().getModule();
                 if (getNodeType().getModule().equals(mod)) {
                     return getNodeType().getLocalName();
                 }
index 51ed99fe08cdc994c908aa2e741a307d0457490c..f8bb50d9ab12df9f47c547c5636496b98216bac6 100644 (file)
@@ -122,7 +122,7 @@ public class NormalizedNodeToJsonStreamTest {
                 final HashSet<Object> 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<Object> 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);
index c4ba341711f15887d92b8084c93c56d1cfba5e68..f11763ac8c05d1c7b09688feb4a5d8b565051fb4 100644 (file)
@@ -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();
index 3bd4d721c7e1c4b629af4cb09715460794d1fd85..80cec0b2ef52493eac0cefdba713af82bdb45d2a 100644 (file)
@@ -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 extends LeafNode<?>> 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);
index eaca037a51fd0201f0f8c742d09abffbd1191250..bb9618de9ea26300b56cdfb093b76ce0e30ec66c 100644 (file)
@@ -30,7 +30,7 @@ public class SchemaResolutionException extends SchemaSourceException {
     private final Collection<SourceIdentifier> resolvedSources;
 
     public SchemaResolutionException(@Nonnull final String message) {
-        this(message, (Throwable)null);
+        this(message, null);
     }
 
     public SchemaResolutionException(@Nonnull final String message, final Throwable cause) {
index 0baf827c0861029ab626a9cf05f94932c86b5d4c..1f169cc9547ab08ebebdc181b42646ae377f791c 100644 (file)
@@ -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;
     }
index 45bf701a1aff9086c3e23f4ca0eccdba7da27b11..ef7338c7565d0e1832f9d0edb40dc65d04ccc44d 100644 (file)
@@ -671,7 +671,7 @@ public abstract class StatementContextBase<A, D extends DeclaredStatement<A>, E
     @Override
     public <K, KT extends K, N extends StatementNamespace<K, ?, ?>> void addContext(final Class<N> namespace, final KT key,
             final StmtContext<?, ?, ?> stmt) {
-        addContextToNamespace(namespace, (K) key, stmt);
+        addContextToNamespace(namespace, key, stmt);
     }
 
     @Override
index c354ac310925674e64463cd7e8ee70baf7649f82..6344beecc8583f403c6c2206f3c3d933b697513e 100644 (file)
@@ -54,14 +54,14 @@ public class SchemaNodeIdentifierBuildNamespace extends
             return null;
         }
         QName nextPath = iterator.next();
-        StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>> current = (StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>>) lookupStartStorage
+        StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>> current = lookupStartStorage
                 .getFromLocalStorage(ChildSchemaNodes.class, nextPath);
         if (current == null && lookupStartStorage instanceof StmtContext<?, ?, ?>) {
             return tryToFindUnknownStatement(nextPath.getLocalName(), (Mutable<?, ?, EffectiveStatement<?, ?>>) lookupStartStorage);
         }
         while (current != null && iterator.hasNext()) {
             nextPath = iterator.next();
-            final StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>> nextNodeCtx = (StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>>) current
+            final StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>> nextNodeCtx = current
                     .getFromNamespace(ChildSchemaNodes.class, nextPath);
             if (nextNodeCtx == null) {
                 return tryToFindUnknownStatement(nextPath.getLocalName(), current);
index a05080207fead888a15f52213f50ef70207080fc..74e80301b6e1ac31db3b713929490cc8304bd9c9 100644 (file)
@@ -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);
         }
     }