From 1ccbd41d3677dd27d306b8548ce5e55967f44320 Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Wed, 21 Jun 2017 12:17:18 +0200 Subject: [PATCH] Binding generator v2 - Binary key fix - small isues fixed to get generated code compilable Change-Id: Idccf66675fddaba373758d810e03149c73ca0251 Signed-off-by: Martin Ciglan --- .../javav2/java/api/generator/renderers/BuilderRenderer.java | 2 ++ .../binding/javav2/java/api/generator/builderTemplate.scala.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java index 5345f2b44f..4642cd4d7c 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java @@ -19,6 +19,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSortedSet; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -251,6 +252,7 @@ public class BuilderRenderer extends BaseRenderer { importedNames.put("objects", importedName(Objects.class)); importedNames.put("object", importedName(Object.class)); importedNames.put("string", importedName(String.class)); + importedNames.put("arrays", importedName(Arrays.class)); importedNames.put("stringBuilder", importedName(StringBuilder.class)); importedNames.put("treeNode", importedName(TreeNode.class)); importedNames.put("instantiable", importedName(Instantiable.class)); diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt index 6d0607ebbf..629c8a072b 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt @@ -261,7 +261,7 @@ public class @{genType.getName}Builder implements @{getSimpleNameForBuilder} <@{ getRestrictions(field.getReturnType).getLengthConstraints)} } } - public @{genType.getName}Builder set@{toFirstUpper(field.getName)}(final @{toFirstUpper(field.getReturnType.getName)} value) { + public @{genType.getName}Builder set@{toFirstUpper(field.getName)}(final @{field.getReturnType.getName} value) { @if(!field.getReturnType.isInstanceOf[GeneratedType] && getRestrictions(field.getReturnType) != null) { if (value != null) { @if(getRestrictions(field.getReturnType).getRangeConstraints != null && !getRestrictions(field.getReturnType).getRangeConstraints.isEmpty) { -- 2.36.6