From ed97b5f73617d930a1a9bbd75c0e0c4273568192 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 8 Apr 2022 16:31:57 +0200 Subject: [PATCH] Centralize MoreObjects import We are importing MoreObjects through Class, let's go through JavaTypeName, centralized in JavaFileTemplate. Also use 'var' to elide the need to refer to it twice. Change-Id: Id7fa0625e8d939195654b710e5f9847303c33861 Signed-off-by: Robert Varga --- .../binding/java/api/generator/ClassTemplate.xtend | 3 +-- .../java/api/generator/InterfaceTemplate.xtend | 3 +-- .../binding/java/api/generator/JavaFileTemplate.java | 6 ++++++ .../java/api/generator/BuilderGeneratorTest.java | 12 ++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend index ef932e6e9b..4b4c9b4518 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend @@ -27,7 +27,6 @@ import static org.opendaylight.mdsal.binding.model.ri.Types.BOOLEAN import static org.opendaylight.mdsal.binding.model.ri.Types.STRING; import static extension org.apache.commons.text.StringEscapeUtils.escapeJava -import com.google.common.base.MoreObjects import com.google.common.base.Preconditions import com.google.common.collect.ImmutableList import com.google.common.collect.Lists @@ -601,7 +600,7 @@ class ClassTemplate extends BaseTemplate { «IF !properties.empty» @«OVERRIDE.importedName» public «STRING.importedName» toString() { - final «MoreObjects.importedName».ToStringHelper helper = «MoreObjects.importedName».toStringHelper(«type.importedName».class); + final var helper = «MOREOBJECTS.importedName».toStringHelper(«type.importedName».class); «FOR property : properties» «CODEHELPERS.importedName».appendValue(helper, "«property.fieldName»", «property.fieldName»); «ENDFOR» diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend index 8d3b3b85e9..9f81b5e8a3 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend @@ -22,7 +22,6 @@ import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.BINDING_ import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.DATA_CONTAINER_IMPLEMENTED_INTERFACE_NAME import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.MoreObjects import java.util.List import java.util.Locale import java.util.Map.Entry @@ -347,7 +346,7 @@ class InterfaceTemplate extends BaseTemplate { * @throws «NPE.importedName» if {@code obj} is null */ static «STRING.importedName» «BINDING_TO_STRING_NAME»(final «type.fullyQualifiedNonNull» obj) { - final «MoreObjects.importedName».ToStringHelper helper = «MoreObjects.importedName».toStringHelper("«type.name»"); + final var helper = «MOREOBJECTS.importedName».toStringHelper("«type.name»"); «FOR property : typeAnalysis.value» «CODEHELPERS.importedName».appendValue(helper, "«property.name»", obj.«property.getterName»()); «ENDFOR» diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java index da69b5027a..1df057e7d4 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java @@ -14,6 +14,7 @@ import static org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.enco import static org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.replaceAllIllegalChars; import com.google.common.base.CharMatcher; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSortedSet; import java.lang.reflect.Method; import java.util.AbstractMap; @@ -139,6 +140,11 @@ class JavaFileTemplate { */ static final @NonNull JavaTypeName CODEHELPERS = JavaTypeName.create(CodeHelpers.class); + /** + * {@code com.google.common.base.MoreObjects} as a JavaTypeName. + */ + static final @NonNull JavaTypeName MOREOBJECTS = JavaTypeName.create(MoreObjects.class); + private static final Comparator METHOD_COMPARATOR = new AlphabeticallyTypeMemberComparator<>(); private static final CharMatcher AMP_MATCHER = CharMatcher.is('&'); private static final Pattern TAIL_COMMENT_PATTERN = Pattern.compile("*/", Pattern.LITERAL); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java index 67aa9a73e9..3f78e88912 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java @@ -167,7 +167,7 @@ public class BuilderGeneratorTest { + " * @throws NullPointerException if {@code obj} is null\n" + " */\n" + "static String bindingToString(final test.@NonNull test obj) {\n" - + " final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(\"test\");\n" + + " final var helper = MoreObjects.toStringHelper(\"test\");\n" + " CodeHelpers.appendValue(helper, \"test\", obj.gettest());\n" + " return helper.toString();\n" + "}\n", genToString(genType).toString()); @@ -185,7 +185,7 @@ public class BuilderGeneratorTest { + " * @throws NullPointerException if {@code obj} is null\n" + " */\n" + "static String bindingToString(final test.@NonNull test obj) {\n" - + " final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(\"test\");\n" + + " final var helper = MoreObjects.toStringHelper(\"test\");\n" + " return helper.toString();\n" + "}\n", genToString(mockGenType(TEST)).toString()); } @@ -202,7 +202,7 @@ public class BuilderGeneratorTest { + " * @throws NullPointerException if {@code obj} is null\n" + " */\n" + "static String bindingToString(final test.@NonNull test obj) {\n" - + " final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(\"test\");\n" + + " final var helper = MoreObjects.toStringHelper(\"test\");\n" + " CodeHelpers.appendValue(helper, \"test1\", obj.gettest1());\n" + " CodeHelpers.appendValue(helper, \"test2\", obj.gettest2());\n" + " return helper.toString();\n" @@ -221,7 +221,7 @@ public class BuilderGeneratorTest { + " * @throws NullPointerException if {@code obj} is null\n" + " */\n" + "static String bindingToString(final test.@NonNull test obj) {\n" - + " final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(\"test\");\n" + + " final var helper = MoreObjects.toStringHelper(\"test\");\n" + " CodeHelpers.appendAugmentations(helper, \"augmentation\", obj);\n" + " return helper.toString();\n" + "}\n", genToString(mockAugment(mockGenType(TEST))).toString()); @@ -239,7 +239,7 @@ public class BuilderGeneratorTest { + " * @throws NullPointerException if {@code obj} is null\n" + " */\n" + "static String bindingToString(final test.@NonNull test obj) {\n" - + " final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(\"test\");\n" + + " final var helper = MoreObjects.toStringHelper(\"test\");\n" + " CodeHelpers.appendValue(helper, \"test\", obj.gettest());\n" + " CodeHelpers.appendAugmentations(helper, \"augmentation\", obj);\n" + " return helper.toString();\n" @@ -258,7 +258,7 @@ public class BuilderGeneratorTest { + " * @throws NullPointerException if {@code obj} is null\n" + " */\n" + "static String bindingToString(final test.@NonNull test obj) {\n" - + " final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(\"test\");\n" + + " final var helper = MoreObjects.toStringHelper(\"test\");\n" + " CodeHelpers.appendValue(helper, \"test1\", obj.gettest1());\n" + " CodeHelpers.appendValue(helper, \"test2\", obj.gettest2());\n" + " CodeHelpers.appendAugmentations(helper, \"augmentation\", obj);\n" -- 2.36.6