From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 5 Jan 2017 16:06:35 +0000 (+0100)
Subject: Bug 7425: Recognize instance-identifier in union template
X-Git-Tag: release/boron-sr3~14
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=7b1ef1557ab6e21cc2dc54c8696af1c9aacde296

Bug 7425: Recognize instance-identifier in union template

Previously, it was wrongly identified as a generated type,
but InstanceIdentifier is a base type, so no getValue() there.

Change-Id: I18d67357753eda6e241a608fc5a2c933aa1f9eda
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry picked from commit aaa5f227c44cb48a579004f2aa500c4fa8f41b0b)
---

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 b2c5d5a0bb..b2bc7c3e16 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
@@ -127,6 +127,9 @@ class UnionTemplate extends ClassTemplate {
                             «IF "java.lang.String".equals(propRet.fullyQualifiedName)»
                                 ««« type string
                                 «field.fieldName» = «property.fieldName».toCharArray();
+                            «ELSEIF "org.opendaylight.yangtools.yang.binding.InstanceIdentifier".equals(propRet.fullyQualifiedName)»
+                                ««« type instance-identifier
+                                «field.fieldName» = «property.fieldName».toString().toCharArray();
                             «ELSEIF "byte[]".equals(propRet.name)»
                                 ««« type binary
                                 «field.fieldName» = new «String.importedName»(«property.fieldName»).toCharArray();