From 32233b204c64b91b9787598818b5463ba3bb31b1 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 11 Oct 2018 11:58:14 +0200 Subject: [PATCH] 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 Signed-off-by: Robert Varga --- .../mdsal/binding/generator/impl/SupportTestUtil.java | 4 ++-- .../mdsal/binding/spec/naming/BindingMapping.java | 3 +-- .../binding/spec/reflect/AugmentationFieldGetterTest.java | 2 +- .../javav2/generator/util/JavaIdentifierNormalizerTest.java | 2 +- .../generator/renderers/YangModuleInfoTemplateRenderer.java | 4 ++-- .../java/api/generator/renderers/BuilderRendererTest.java | 2 +- .../runtime/reflection/AugmentationFieldGetterTest.java | 2 +- .../mdsal/binding/javav2/util/BindingMapping.java | 3 +-- .../opendaylight/mdsal/eos/common/api/GenericEntityTest.java | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) 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 814d9268a2..94b0ebb039 100644 --- 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 d3becefe79..4d1ac4ce56 100644 --- 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 6ae8170679..e2de73d8d4 100644 --- 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 c1f58bb84a..78888460ed 100644 --- 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 17e010a4a5..93cf8e4576 100644 --- 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 11a8c5c22a..302df4f822 100644 --- 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 ea16886aa9..1047b9338e 100644 --- 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 ebaa3fca17..56516486b4 100644 --- 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 6f78ddc7f6..e4072bca41 100644 --- 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))); } -- 2.36.6