Clean various constructs

* Remove intern() on constant strings.
* Avoid some casts by changing test instance types.
* Remove a number of unnecessary type specifiers and casts.
* Remove an unnecessary return.
* Use StringBuilder::append()'s substring parameters instead of a
  separate String::substring().

Change-Id: Iaaa206d233fbc43ed1bed2d651c549643e6e7697
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit a993ec185764e9f07b7f1c6751bad8f63f6eecc7)

diff --git a/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java b/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java
index af9bf73349e1469f73ee3c1b591fb61a8731bb06..ca13452b748bd81ae19b74774af20d1bf5e006b3 100644 (file)
--- a/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java
+++ b/benchmarks/src/main/java/org/opendaylight/yangtools/yang/data/impl/tree/BenchmarkModel.java
@@ -32,7 +32,7 @@ final class BenchmarkModel {
     static final QName OUTER_CHOICE_QNAME = QName.create(TEST_QNAME, "outer-choice").intern();
     static final QName ID_QNAME = QName.create(TEST_QNAME, "id").intern();
     static final QName NAME_QNAME = QName.create(TEST_QNAME, "name").intern();
-    static final QName VALUE_QNAME = QName.create(TEST_QNAME, "value".intern());
+    static final QName VALUE_QNAME = QName.create(TEST_QNAME, "value").intern();
 
     private BenchmarkModel() {
 

diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/TopologicalSortTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/TopologicalSortTest.java
index 32d215845d79a82cd192135b97f0c3a371f402f5..37043a1e62870c2f6faa35e903060d25d133970a 100644 (file)
--- a/common/util/src/test/java/org/opendaylight/yangtools/util/TopologicalSortTest.java
+++ b/common/util/src/test/java/org/opendaylight/yangtools/util/TopologicalSortTest.java
@@ -41,19 +41,19 @@ public class TopologicalSortTest {
     public void testValidSimple() throws Exception {
         Set<Node> nodes = new HashSet<>();
 
-        Node node1 = new NodeImpl();
+        NodeImpl node1 = new NodeImpl();
         nodes.add(node1);
-        Node node2 = new NodeImpl();
+        NodeImpl node2 = new NodeImpl();
         nodes.add(node2);
-        Node node3 = new NodeImpl();
+        NodeImpl node3 = new NodeImpl();
         nodes.add(node3);
         Node node4 = new NodeImpl();
         nodes.add(node4);
 
-        ((NodeImpl) node1).addEdge(node2);
-        ((NodeImpl) node1).addEdge(node3);
-        ((NodeImpl) node2).addEdge(node4);
-        ((NodeImpl) node3).addEdge(node2);
+        node1.addEdge(node2);
+        node1.addEdge(node3);
+        node2.addEdge(node4);
+        node3.addEdge(node2);
 
         List<Node> sorted = TopologicalSort.sort(nodes);
 

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 cfc3ae7a6b2c46636f94c53c28df385af6b1c2b4..20a20333ae1323793b2089dd3fb045c36aec6637 100644 (file)
--- 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
@@ -312,7 +312,7 @@ public class BuilderTest {
     }
 
     private static LeafSetNode<?> getImmutableLeafSetNode() {
-        final ListNodeBuilder<String, LeafSetEntryNode<String>> leafSetBuilder = Builders.<String>leafSetBuilder();
+        final ListNodeBuilder<String, LeafSetEntryNode<String>> leafSetBuilder = Builders.leafSetBuilder();
         leafSetBuilder.withNodeIdentifier(NODE_IDENTIFIER_LEAF_LIST);
         leafSetBuilder.addChild(LEAF_SET_ENTRY_NODE);
         return leafSetBuilder.build();

diff --git a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
index e915008f45473948535e8eaa70695ed26c92714a..6a60736822bbc73911febb0d6c63e23be7da0b0c 100644 (file)
--- a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
+++ b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java
@@ -63,7 +63,6 @@ public class YangToSourcesPluginTestIT {
             fail("Verification exception should have been thrown");
         } catch (VerificationException e) {
             assertVerificationException(e, "Imported module [unknownDep] was not found.");
-            return;
         }
     }
 

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
index fd7c2986071076926af613ffea26745ee2a1f059..f677ec2824bcc0b9fa7a1148ddcb68a083852945 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
@@ -54,6 +54,6 @@ public interface DataTreeAwareEffectiveStatement<A, D extends DeclaredStatement<
      */
     default <E extends DataTreeEffectiveStatement<?>> @NonNull Optional<E> findDataTreeNode(
             final @NonNull QName qname) {
-        return Optional.ofNullable((E)get(Namespace.class, requireNonNull(qname)));
+        return Optional.ofNullable(get(Namespace.class, requireNonNull(qname)));
     }
 }

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
index e35aeb80bb151c31a5bc86aca0ca2dbe735762c4..ff9363526bd7e9a262a3439dde7bae041d5f3adb 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
@@ -50,6 +50,6 @@ public interface SchemaTreeAwareEffectiveStatement<A, D extends DeclaredStatemen
      */
     default <E extends SchemaTreeEffectiveStatement<?>> @NonNull Optional<E> findSchemaTreeNode(
             final @NonNull QName qname) {
-        return Optional.ofNullable((E)get(Namespace.class, requireNonNull(qname)));
+        return Optional.ofNullable(get(Namespace.class, requireNonNull(qname)));
     }
 }

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ChildSchemaNodeNamespace.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ChildSchemaNodeNamespace.java
index 7968cd4a6d958b604eae77d047e2338dfaee66e1..ce2bbccb9e2693e416995692e94c8533a05aaa45 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ChildSchemaNodeNamespace.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/namespace/ChildSchemaNodeNamespace.java
@@ -81,7 +81,7 @@ public final class ChildSchemaNodeNamespace<D extends DeclaredStatement<QName>,
             final SchemaNodeIdentifier identifier) {
         final Iterator<QName> iterator = identifier.getPathFromRoot().iterator();
         if (!iterator.hasNext()) {
-            return Optional.of((Mutable<?, ?, EffectiveStatement<?, ?>>) root);
+            return Optional.of(root);
         }
 
         QName nextPath = iterator.next();

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java
index 6592a89697cce951cb14e43225f12f59b72650c5..de3a502e36ac6ebf88c11cb6b638578031c79f12 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java
@@ -63,7 +63,7 @@ final class ArgumentContextUtils {
                  * According to RFC6020 a single quote character cannot occur in
                  * a single-quoted string, even when preceded by a backslash.
                  */
-                sb.append(str.substring(1, str.length() - 1));
+                sb.append(str, 1, str.length() - 1);
             } else {
                 checkUnquotedString(str, yangVersion, ref);
                 sb.append(str);

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
index ecb8fbacf55b3170cc54be01d30545ef9f2b1784..e999729e319dd9e24000135434bce45777ac28f9 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
@@ -50,7 +50,7 @@ abstract class AbstractIdentityRefSpecificationSupport
         super.onFullDefinitionDeclared(stmt);
 
         final Collection<StmtContext<QName, BaseStatement, ?>> baseStatements =
-                StmtContextUtils.<QName, BaseStatement>findAllDeclaredSubstatements(stmt, BaseStatement.class);
+                StmtContextUtils.findAllDeclaredSubstatements(stmt, BaseStatement.class);
         for (StmtContext<QName, BaseStatement, ?> baseStmt : baseStatements) {
             final QName baseIdentity = baseStmt.getStatementArgument();
             final StmtContext<?, ?, ?> stmtCtx = stmt.getFromNamespace(IdentityNamespace.class, baseIdentity);

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java
index cf2353904258322b8ae9c03a7afbbdb85b738e83..f6777e2723bc09341ced7924a840b45e90224107 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8922Test.java
@@ -31,7 +31,7 @@ public class Bug8922Test {
         assertNotNull(context);
         final SchemaNode findNode = findNode(context, qN("target"), qN("my-con"));
         assertTrue(findNode instanceof ContainerSchemaNode);
-        assertEquals(Optional.of("New description"), ((ContainerSchemaNode) findNode).getDescription());
+        assertEquals(Optional.of("New description"), findNode.getDescription());
     }
 
     @Test