X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-java-api-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjava%2Fapi%2Fgenerator%2FBuilderGeneratorTest.java;h=a233dc27d027a2ae9585e508df914a84df06a0a2;hb=31776f5c9d96892e93b8378ca09dc0c3caa41c2c;hp=67aa9a73e9fe6ed7e973d5ff488107075edd7246;hpb=adc23d90f8d367517b854bcd7533578c148812e8;p=mdsal.git

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..a233dc27d0 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
@@ -24,7 +24,6 @@ import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics;
 import org.opendaylight.mdsal.binding.model.api.Type;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class BuilderGeneratorTest {
@@ -167,7 +166,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 +184,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 +201,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 +220,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 +238,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 +257,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"
@@ -268,10 +267,9 @@ public class BuilderGeneratorTest {
 
     @Test
     public void builderTemplateGenerateToEqualsComparingOrderTest() {
-        final EffectiveModelContext context = YangParserTestUtils.parseYangResource(
-                "/test-types.yang");
-        final List<GeneratedType> types = new DefaultBindingGenerator().generateTypes(context);
-        assertEquals(29, types.size());
+        final var context = YangParserTestUtils.parseYangResource("/test-types.yang");
+        final var types = new DefaultBindingGenerator().generateTypes(context);
+        assertEquals(27, types.size());
 
         final BuilderTemplate bt = BuilderGenerator.templateForType(
             types.stream().filter(t -> t.getName().equals("Nodes")).findFirst().orElseThrow());