From d92aa291ec070cfaf7b680d99f015f4402dcfe60 Mon Sep 17 00:00:00 2001 From: Xiao Liang Date: Wed, 11 Jan 2017 05:59:14 +0000 Subject: [PATCH] Fix getValue() of bits in union Call Arrays.toString instead of calling toString directly for bits in union, since getValue() of bits returns boolean[]. Change-Id: I4b06c95f07ff6d5ff81dc17613ed972b453db184 Signed-off-by: Xiao Liang (cherry picked from commit b689dd6d7ce7ea26fa1f580c5d354749df90a31b) --- .../yangtools/sal/java/api/generator/UnionTemplate.xtend | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend index b2bc7c3e16..85cdbde306 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend @@ -13,6 +13,7 @@ import java.beans.ConstructorProperties import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject import org.opendaylight.yangtools.sal.binding.model.api.Enumeration +import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition /** * Template for generating JAVA class. @@ -159,6 +160,11 @@ class UnionTemplate extends ClassTemplate { && "byte[]".equals((propRet as GeneratedTransferObject).properties.get(0).returnType.name)» ««« generated byte[] typedef «field.fieldName» = BaseEncoding.base64().encode(«property.fieldName».getValue()).toCharArray(); + «ELSEIF propRet instanceof GeneratedTransferObject // Is it a GeneratedTransferObject + && (propRet as GeneratedTransferObject).typedef // Is it a typedef + && (propRet as GeneratedTransferObject).baseType instanceof BitsTypeDefinition» + ««« generated bits typedef + «field.fieldName» = java.util.Arrays.toString(«property.fieldName».getValue()).toCharArray(); «ELSE» ««« generated type «field.fieldName» = «property.fieldName».getValue().toString().toCharArray(); -- 2.36.6