Remove redundant string operations

* use StringBuilder::append to extract substrings directly;
* split combined append/concatenation into multiple append calls;
* use "" instead of new String();
* remove a couple of unnecessary toString() calls.

Change-Id: If09efe90d756c3b1faf30c27eb94d514593a4861
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java
index 814d9268a26eeff8b09584d4eab9328488cad0b0..94b0ebb0391ecb4da4a56e2b5376e4213a6bdd8e 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java
@@ -98,10 +98,10 @@ public class SupportTestUtil {
     public static String resolveFullNameOfReturnType(final Type type) {
         final StringBuilder nameBuilder = new StringBuilder();
         if (type instanceof ParameterizedType) {
-            nameBuilder.append(type.getName() + "<");
+            nameBuilder.append(type.getName()).append('<');
             ParameterizedType parametrizedTypes = (ParameterizedType) type;
             for (Type parametrizedType : parametrizedTypes.getActualTypeArguments()) {
-                nameBuilder.append(parametrizedType.getName() + ",");
+                nameBuilder.append(parametrizedType.getName()).append(',');
             }
             if (nameBuilder.charAt(nameBuilder.length() - 1) == ',') {
                 nameBuilder.deleteCharAt(nameBuilder.length() - 1);

diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java
index d3becefe79f3bf7b58d36893f41d770ecb1826c0..4d1ac4ce565eb0e6ee259d5d7ba707f50048190a 100644 (file)
--- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java
+++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java
@@ -131,8 +131,7 @@ public final class BindingMapping {
             // right characters.
             final String rev = optRev.get().toString();
             checkArgument(rev.length() == 10, "Unsupported revision %s", rev);
-            packageNameBuilder.append("rev");
-            packageNameBuilder.append(rev.substring(2, 4)).append(rev.substring(5, 7)).append(rev.substring(8));
+            packageNameBuilder.append("rev").append(rev, 2, 4).append(rev, 5, 7).append(rev.substring(8));
         } else {
             // No-revision packages are special
             packageNameBuilder.append("norev");

diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/AugmentationFieldGetterTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/AugmentationFieldGetterTest.java
index 6ae817067957acc60009901004fcc80a5c6ff145..e2de73d8d4bf8d98a777eeb152204a9f302a93b1 100644 (file)
--- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/AugmentationFieldGetterTest.java
+++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/AugmentationFieldGetterTest.java
@@ -42,7 +42,7 @@ public class AugmentationFieldGetterTest {
     @Test(expected = IllegalStateException.class)
     public void getWrongGetterTest() throws Exception {
         final AugmentationFieldGetter augmentationFieldGetter = getGetter(TestAugmentationClass.class);
-        augmentationFieldGetter.getAugmentations(new String());
+        augmentationFieldGetter.getAugmentations("");
         fail("Expected IllegalStateException");
     }
 

diff --git a/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java b/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java
index c1f58bb84a359aaa8e188d9f257b02aa92911773..78888460ed5c61199f2d46c6e19ec1b550eb9309 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java
+++ b/binding2/mdsal-binding2-generator-util/src/test/java/org/opendaylight/mdsal/binding/javav2/generator/util/JavaIdentifierNormalizerTest.java
@@ -386,7 +386,7 @@ public class JavaIdentifierNormalizerTest {
             final String str_i = String.valueOf(i);
             final String packageNameNormalizer = JavaIdentifierNormalizer.normalizePartialPackageName(str_i);
             final String expected = Character.getName(str_i.charAt(0)).replaceAll(" ", "").toLowerCase();
-            assertEquals(expected.toString(), packageNameNormalizer);
+            assertEquals(expected, packageNameNormalizer);
         }
     }
 

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java
index 17e010a4a5df7f4c9b0ddc8e62c73da08e66d7cb..93cf8e4576f65f8713532efd6828004043f5a661 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java
@@ -201,12 +201,12 @@ public class YangModuleInfoTemplateRenderer {
             }
             String wildcardParam = "";
             if (type.equals(Types.voidType())) {
-                sb.append("java.lang.Void" + separator);
+                sb.append("java.lang.Void").append(separator);
             } else {
                 if (type instanceof WildcardType) {
                     wildcardParam = "? extends ";
                 }
-                sb.append(wildcardParam + getExplicitType(type) + separator);
+                sb.append(wildcardParam).append(getExplicitType(type)).append(separator);
                 count = count + 1;
             }
         }

diff --git a/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRendererTest.java b/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRendererTest.java
index 11a8c5c22aad65655e61a42bdd305906378b2688..302df4f8220e6b1b794e880273dd8b1993eb1a7e 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRendererTest.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRendererTest.java
@@ -98,7 +98,7 @@ public class BuilderRendererTest {
     public void builderTemplateGenerateToStringWithMorePropertiesWithAugmentTest() throws Exception {
         final GeneratedType genType = mockGenTypeMoreMeth("get" + TEST);
         mockAugment(genType);
-        final String generateToString = genToString(genType).toString();
+        final String generateToString = genToString(genType);
         assertTrue(generateToString.contains("if (_test1 != null) {"));
         assertTrue(generateToString.contains("builder.append(\"_test1=\");"));
         assertTrue(generateToString.contains("builder.append(_test1);"));

diff --git a/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java
index ea16886aa96d5d767e14872b4b923c8321bf91a7..1047b9338efffb3c35a78c71fa515ad64dacfdb4 100644 (file)
--- a/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java
+++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java
@@ -42,7 +42,7 @@ public class AugmentationFieldGetterTest {
     @Test(expected = IllegalStateException.class)
     public void getWrongGetterTest() throws Exception {
         final AugmentationFieldGetter augmentationFieldGetter = getGetter(TestAugmentationClass.class);
-        augmentationFieldGetter.getAugmentations(new String());
+        augmentationFieldGetter.getAugmentations("");
         fail("Expected IllegalStateException");
     }
 

diff --git a/binding2/mdsal-binding2-util/src/main/java/org/opendaylight/mdsal/binding/javav2/util/BindingMapping.java b/binding2/mdsal-binding2-util/src/main/java/org/opendaylight/mdsal/binding/javav2/util/BindingMapping.java
index ebaa3fca17a973f737447d8ad372c48935b2f4a8..56516486b4961588d372a5456cf0dc470b29a120 100644 (file)
--- a/binding2/mdsal-binding2-util/src/main/java/org/opendaylight/mdsal/binding/javav2/util/BindingMapping.java
+++ b/binding2/mdsal-binding2-util/src/main/java/org/opendaylight/mdsal/binding/javav2/util/BindingMapping.java
@@ -114,8 +114,7 @@ public final class BindingMapping {
             // right characters.
             final String rev = optRev.get().toString();
             checkArgument(rev.length() == 10, "Unsupported revision %s", rev);
-            packageNameBuilder.append("rev");
-            packageNameBuilder.append(rev.substring(2, 4)).append(rev.substring(5, 7)).append(rev.substring(8));
+            packageNameBuilder.append("rev").append(rev, 2, 4).append(rev, 5, 7).append(rev.substring(8));
         } else {
             // No-revision packages are special
             packageNameBuilder.append("norev");

diff --git a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java
index 6f78ddc7f6e6bcbd8cc758105aac96e98c22e2a0..e4072bca41d1a3498f0aef8718ed2262d1ec1151 100644 (file)
--- a/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java
+++ b/entityownership/mdsal-eos-common-api/src/test/java/org/opendaylight/mdsal/eos/common/api/GenericEntityTest.java
@@ -30,7 +30,7 @@ public class GenericEntityTest {
         assertTrue(genericEntity.equals(genericEntity));
         assertTrue(genericEntity.equals(new GenericEntity<>("testType", testClass)));
         assertFalse(genericEntity.equals(genericEntityDiff));
-        assertFalse(genericEntity.equals(new String()));
+        assertFalse(genericEntity.equals(""));
         assertFalse(genericEntity.equals(new GenericEntity<>("differentTestType", testClass)));
     }