From 5bc0e4323cb5961a19c3c1016bf9c9ae25d4aa21 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 29 Aug 2018 18:38:57 +0200 Subject: [PATCH] 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 (cherry picked from commit a993ec185764e9f07b7f1c6751bad8f63f6eecc7) --- .../yang/data/impl/tree/BenchmarkModel.java | 2 +- .../yangtools/util/TopologicalSortTest.java | 14 +++++++------- .../yang/data/impl/schema/BuilderTest.java | 2 +- .../plugin/it/YangToSourcesPluginTestIT.java | 1 - .../api/stmt/DataTreeAwareEffectiveStatement.java | 2 +- .../stmt/SchemaTreeAwareEffectiveStatement.java | 2 +- .../namespace/ChildSchemaNodeNamespace.java | 2 +- .../parser/rfc7950/repo/ArgumentContextUtils.java | 2 +- .../AbstractIdentityRefSpecificationSupport.java | 2 +- .../yangtools/yang/stmt/Bug8922Test.java | 2 +- 10 files changed, 15 insertions(+), 16 deletions(-) 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 af9bf73349..ca13452b74 100644 --- 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 32d215845d..37043a1e62 100644 --- 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 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 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 cfc3ae7a6b..20a20333ae 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 @@ -312,7 +312,7 @@ public class BuilderTest { } private static LeafSetNode getImmutableLeafSetNode() { - final ListNodeBuilder> leafSetBuilder = Builders.leafSetBuilder(); + final ListNodeBuilder> 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 e915008f45..6a60736822 100644 --- 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 fd7c298607..f677ec2824 100644 --- 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> @NonNull Optional 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 e35aeb80bb..ff9363526b 100644 --- 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> @NonNull Optional 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 7968cd4a6d..ce2bbccb9e 100644 --- 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, final SchemaNodeIdentifier identifier) { final Iterator iterator = identifier.getPathFromRoot().iterator(); if (!iterator.hasNext()) { - return Optional.of((Mutable>) 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 6592a89697..de3a502e36 100644 --- 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 ecb8fbacf5..e999729e31 100644 --- 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> baseStatements = - StmtContextUtils.findAllDeclaredSubstatements(stmt, BaseStatement.class); + StmtContextUtils.findAllDeclaredSubstatements(stmt, BaseStatement.class); for (StmtContext 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 cf23539042..f6777e2723 100644 --- 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 -- 2.36.6