From: Robert Varga <rovarga@cisco.com>
Date: Fri, 20 Nov 2015 22:54:41 +0000 (+0100)
Subject: BUG-4638: fix typedefToGeneratedType()
X-Git-Tag: release/beryllium~38
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c8d9add47c952b20273402e06793e288049a33dc;p=mdsal.git

BUG-4638: fix typedefToGeneratedType()

New parser does not generated ExtendedTypes. Since the callsite is all
about type definitions, it is safe to change that check to a check if
the provided type definitions has a base type.

Change-Id: I39d67b7d4d431c1cc8b212cc81597d667b20a734
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
index 55693323fd..d568c947dd 100644
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
@@ -736,9 +736,8 @@ public final class TypeProviderImpl implements TypeProvider {
             if (!(innerTypeDefinition instanceof LeafrefTypeDefinition)
                     && !(innerTypeDefinition instanceof IdentityrefTypeDefinition)) {
                 Type returnType = null;
-                if (innerTypeDefinition instanceof ExtendedType) {
-                    ExtendedType innerExtendedType = (ExtendedType) innerTypeDefinition;
-                    returnType = provideGeneratedTOFromExtendedType(typedef, innerExtendedType, basePackageName,
+                if (innerTypeDefinition.getBaseType() != null) {
+                    returnType = provideGeneratedTOFromExtendedType(typedef, innerTypeDefinition, basePackageName,
                             module.getName());
                 } else if (innerTypeDefinition instanceof UnionTypeDefinition) {
                     final GeneratedTOBuilder genTOBuilder = provideGeneratedTOBuilderForUnionTypeDef(basePackageName,
@@ -1272,7 +1271,7 @@ public final class TypeProviderImpl implements TypeProvider {
      *             </ul>
      */
     private GeneratedTransferObject provideGeneratedTOFromExtendedType(final TypeDefinition<?> typedef,
-            final ExtendedType innerExtendedType, final String basePackageName, final String moduleName) {
+            final TypeDefinition<?> innerExtendedType, final String basePackageName, final String moduleName) {
         Preconditions.checkArgument(innerExtendedType != null, "Extended type cannot be NULL!");
         Preconditions.checkArgument(basePackageName != null, "String with base package name cannot be NULL!");