Added Support for Union Type def resolving and bug fixes.
[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-generator-impl / src / main / java / org / opendaylight / controller / sal / binding / yang / types / TypeProviderImpl.java
index 0618efc8aec7f8a0732a8daafaf14e1c11203bbc..b3739ec5c44d5812a708139603cd4104ff738d67 100644 (file)
@@ -7,15 +7,7 @@
  */
 package org.opendaylight.controller.sal.binding.yang.types;
 
-import static org.opendaylight.controller.yang.model.util.SchemaContextUtil.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.opendaylight.controller.binding.generator.util.BindingGeneratorUtil;
+import org.opendaylight.controller.binding.generator.util.ReferencedTypeImpl;
 import org.opendaylight.controller.binding.generator.util.Types;
 import org.opendaylight.controller.binding.generator.util.generated.type.builder.EnumerationBuilderImpl;
 import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl;
@@ -27,13 +19,7 @@ import org.opendaylight.controller.sal.binding.model.api.type.builder.EnumBuilde
 import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedPropertyBuilder;
 import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder;
 import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTypeBuilder;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.controller.yang.model.api.*;
 import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair;
 import org.opendaylight.controller.yang.model.api.type.IdentityrefTypeDefinition;
@@ -41,11 +27,19 @@ import org.opendaylight.controller.yang.model.api.type.LeafrefTypeDefinition;
 import org.opendaylight.controller.yang.model.api.type.UnionTypeDefinition;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 
-public class TypeProviderImpl implements TypeProvider {
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.opendaylight.controller.binding.generator.util.BindingGeneratorUtil.*;
+import static org.opendaylight.controller.yang.model.util.SchemaContextUtil.*;
+
+public final class TypeProviderImpl implements TypeProvider {
 
     private final SchemaContext schemaContext;
-    private Map<String, Map<String, GeneratedTransferObject>> genTypeDefsContextMap;
-    private final List<GeneratedTransferObject> allTypeDefinitions;
+    private Map<String, Map<String, Type>> genTypeDefsContextMap;
+    private final Map<SchemaPath, Type> referencedTypes;
 
     public TypeProviderImpl(final SchemaContext schemaContext) {
         if (schemaContext == null) {
@@ -53,12 +47,23 @@ public class TypeProviderImpl implements TypeProvider {
         }
 
         this.schemaContext = schemaContext;
-        this.genTypeDefsContextMap = new HashMap<String, Map<String, GeneratedTransferObject>>();
-        allTypeDefinitions = resolveTypeDefsFromContext();
+        this.genTypeDefsContextMap = new HashMap<>();
+        this.referencedTypes = new HashMap<>();
+        resolveTypeDefsFromContext();
     }
 
-    public List<GeneratedTransferObject> getGeneratedTypeDefs() {
-        return allTypeDefinitions;
+    public void putReferencedType(final SchemaPath refTypePath,
+                                  final Type refType) {
+        if (refTypePath == null) {
+            throw new IllegalArgumentException("Path reference of " +
+                    "Enumeration Type Definition cannot be NULL!");
+        }
+
+        if (refType == null) {
+            throw new IllegalArgumentException("Reference to Enumeration " +
+                    "Type cannot be NULL!");
+        }
+        referencedTypes.put(refTypePath, refType);
     }
 
     /*
@@ -78,45 +83,93 @@ public class TypeProviderImpl implements TypeProvider {
     public Type javaTypeForSchemaDefinitionType(
             final TypeDefinition<?> typeDefinition) {
         Type returnType = null;
-        if (typeDefinition != null) {
-            final String typedefName = typeDefinition.getQName().getLocalName();
-            if (typeDefinition instanceof ExtendedType) {
-                final TypeDefinition<?> baseTypeDef = baseTypeDefForExtendedType(typeDefinition);
-
-                if (baseTypeDef instanceof LeafrefTypeDefinition) {
-                    final LeafrefTypeDefinition leafref = (LeafrefTypeDefinition) baseTypeDef;
-                    returnType = provideTypeForLeafref(leafref);
-                } else if (baseTypeDef instanceof IdentityrefTypeDefinition) {
-
-                } else if (baseTypeDef instanceof EnumTypeDefinition) {
-                    final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) baseTypeDef;
-                    returnType = resolveEnumFromTypeDefinition(enumTypeDef,
-                            typedefName);
-                } else {
+        if (typeDefinition == null) {
+            throw new IllegalArgumentException("Type Definition cannot be " +
+                    "NULL!");
+        }
 
-                    final Module module = resolveModuleFromTypePath(schemaContext, typeDefinition);
+        if (typeDefinition.getQName() == null) {
+            throw new IllegalArgumentException("Type Definition cannot have " +
+                    "non specified QName (QName cannot be NULL!)");
+        }
 
-                    if (module != null) {
-                        final Map<String, GeneratedTransferObject> genTOs = genTypeDefsContextMap
-                                .get(module.getName());
-                        if (genTOs != null) {
-                            returnType = genTOs.get(typedefName);
-                        }
+        if (typeDefinition.getQName().getLocalName() == null) {
+            throw new IllegalArgumentException("Type Definitions Local Name " +
+                    "cannot be NULL!");
+        }
+        final String typedefName = typeDefinition.getQName().getLocalName();
+        if (typeDefinition instanceof ExtendedType) {
+            final TypeDefinition<?> baseTypeDef = baseTypeDefForExtendedType(typeDefinition);
+
+            if (baseTypeDef instanceof LeafrefTypeDefinition) {
+                final LeafrefTypeDefinition leafref = (LeafrefTypeDefinition) baseTypeDef;
+                returnType = provideTypeForLeafref(leafref);
+            } else if (baseTypeDef instanceof IdentityrefTypeDefinition) {
+
+            } else if (baseTypeDef instanceof EnumTypeDefinition) {
+                final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) baseTypeDef;
+                returnType = resolveEnumFromTypeDefinition(enumTypeDef,
+                        typedefName);
+            } else {
+                final Module module = findParentModuleForTypeDefinition(schemaContext,
+                        typeDefinition);
+                if (module != null) {
+                    final Map<String, Type> genTOs = genTypeDefsContextMap
+                            .get(module.getName());
+                    if (genTOs != null) {
+                        returnType = genTOs.get(typedefName);
+                    }
+                    if (returnType == null) {
+                        returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
+                                .javaTypeForSchemaDefinitionType(baseTypeDef);
                     }
                 }
+            }
+        } else {
+            if (typeDefinition instanceof LeafrefTypeDefinition) {
+                final LeafrefTypeDefinition leafref = (LeafrefTypeDefinition) typeDefinition;
+                returnType = provideTypeForLeafref(leafref);
+            } else if (typeDefinition instanceof IdentityrefTypeDefinition) {
+
             } else {
-                if (typeDefinition instanceof LeafrefTypeDefinition) {
-                    final LeafrefTypeDefinition leafref = (LeafrefTypeDefinition) typeDefinition;
-                    returnType = provideTypeForLeafref(leafref);
-                } else if (typeDefinition instanceof EnumTypeDefinition) {
-                    final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) typeDefinition;
-                    returnType = resolveEnumFromTypeDefinition(enumTypeDef,
-                            typedefName);
-                } else if (typeDefinition instanceof IdentityrefTypeDefinition) {
+                returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
+                        .javaTypeForSchemaDefinitionType(typeDefinition);
+            }
+        }
+        return returnType;
+    }
 
-                } else {
-                    returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
-                            .javaTypeForSchemaDefinitionType(typeDefinition);
+    public Type generatedTypeForExtendedDefinitionType(
+            final TypeDefinition<?> typeDefinition) {
+        Type returnType = null;
+        if (typeDefinition == null) {
+            throw new IllegalArgumentException("Type Definition cannot be " +
+                    "NULL!");
+        }
+        if (typeDefinition.getQName() == null) {
+            throw new IllegalArgumentException("Type Definition cannot have " +
+                    "non specified QName (QName cannot be NULL!)");
+        }
+        if (typeDefinition.getQName() == null) {
+            throw new IllegalArgumentException("Type Definitions Local Name " +
+                    "cannot be NULL!");
+        }
+
+        final String typedefName = typeDefinition.getQName().getLocalName();
+        if (typeDefinition instanceof ExtendedType) {
+            final TypeDefinition<?> baseTypeDef = baseTypeDefForExtendedType(typeDefinition);
+
+            if (!(baseTypeDef instanceof LeafrefTypeDefinition)
+                    && !(baseTypeDef instanceof IdentityrefTypeDefinition)) {
+                final Module module = findParentModuleForTypeDefinition(schemaContext,
+                        typeDefinition);
+
+                if (module != null) {
+                    final Map<String, Type> genTOs = genTypeDefsContextMap
+                            .get(module.getName());
+                    if (genTOs != null) {
+                        returnType = genTOs.get(typedefName);
+                    }
                 }
             }
         }
@@ -125,56 +178,55 @@ public class TypeProviderImpl implements TypeProvider {
 
     private TypeDefinition<?> baseTypeDefForExtendedType(
             final TypeDefinition<?> extendTypeDef) {
-        if (extendTypeDef != null) {
-            final TypeDefinition<?> baseTypeDef = extendTypeDef.getBaseType();
-            if (baseTypeDef instanceof ExtendedType) {
-                return baseTypeDefForExtendedType(baseTypeDef);
-            } else {
-                return baseTypeDef;
-            }
+        if (extendTypeDef == null) {
+            throw new IllegalArgumentException("Type Definiition reference " +
+                    "cannot be NULL!");
         }
-        return null;
+        final TypeDefinition<?> baseTypeDef = extendTypeDef.getBaseType();
+        if (baseTypeDef instanceof ExtendedType) {
+            return baseTypeDefForExtendedType(baseTypeDef);
+        } else {
+            return baseTypeDef;
+        }
+
     }
 
-    public Type baseTypeForExtendedType(final TypeDefinition<?> typeDefinition) {
+    public Type provideTypeForLeafref(final LeafrefTypeDefinition leafrefType) {
         Type returnType = null;
-        if (typeDefinition != null) {
-            final TypeDefinition<?> baseTypeDefinition = baseTypeDefForExtendedType(typeDefinition);
+        if (leafrefType == null) {
+            throw new IllegalArgumentException("Leafref Type Definition " +
+                    "reference cannot be NULL!");
+        }
 
-            if (baseTypeDefinition instanceof EnumTypeDefinition) {
-                final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) typeDefinition;
-                final String enumName = enumTypeDef.getQName().getLocalName();
-                return resolveEnumFromTypeDefinition(enumTypeDef, enumName);
-            } else {
-                returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
-                        .javaTypeForSchemaDefinitionType(typeDefinition);
-            }
+        if (leafrefType.getPathStatement() == null) {
+            throw new IllegalArgumentException("The Path Statement for " +
+                    "Leafref Type Definition cannot be NULL!");
         }
-        return returnType;
-    }
 
-    public Type provideTypeForLeafref(final LeafrefTypeDefinition leafrefType) {
-        Type returnType = null;
-        if ((leafrefType != null) && (leafrefType.getPathStatement() != null)
-                && (leafrefType.getPath() != null)) {
+        final RevisionAwareXPath xpath = leafrefType.getPathStatement();
+        final String strXPath = xpath.toString();
 
-            final RevisionAwareXPath xpath = leafrefType.getPathStatement();
-            final String strXPath = xpath.toString();
+        if (strXPath != null) {
+            if (strXPath.matches(".*//[.* | .*//].*")) {
+                returnType = Types.typeForClass(Object.class);
+            } else {
+                final Module module = findParentModuleForTypeDefinition(schemaContext, leafrefType);
+                if (module != null) {
+                    final DataSchemaNode dataNode;
+                    if (xpath.isAbsolute()) {
+                        dataNode = findDataSchemaNode(schemaContext, module,
+                                xpath);
+                    } else {
+                        dataNode = findDataSchemaNodeForRelativeXPath(schemaContext,
+                                module, leafrefType, xpath);
+                    }
 
-            if (strXPath != null) {
-                if (strXPath.matches(".*//[.* | .*//].*")) {
-                    returnType = Types.typeForClass(Object.class);
-                } else {
-                    final Module module = resolveModuleFromTypePath(schemaContext, leafrefType);
-                    if (module != null) {
-                        final DataSchemaNode dataNode;
-                        if (xpath.isAbsolute()) {
-                            dataNode = findDataSchemaNode(schemaContext,
-                                    module, xpath);
-                        } else {
-                            dataNode = findDataSchemaNodeForRelativeXPath(schemaContext, module,
-                                            leafrefType, xpath);
-                        }
+                    if (leafContainsEnumDefinition(dataNode)) {
+                        returnType = referencedTypes.get(dataNode.getPath());
+                    } else if (leafListContainsEnumDefinition(dataNode)) {
+                        returnType = Types.listTypeFor(referencedTypes.get(
+                                dataNode.getPath()));
+                    } else {
                         returnType = resolveTypeFromDataSchemaNode(dataNode);
                     }
                 }
@@ -183,83 +235,112 @@ public class TypeProviderImpl implements TypeProvider {
         return returnType;
     }
 
-    private EnumBuilder resolveEnumFromTypeDefinition(
-            final EnumTypeDefinition enumTypeDef, final String enumName,
-            final GeneratedTypeBuilder typeBuilder) {
-        if ((enumTypeDef != null) && (typeBuilder != null)
-                && (enumTypeDef.getQName() != null)
-                && (enumTypeDef.getQName().getLocalName() != null)) {
-
-            final String enumerationName = BindingGeneratorUtil
-                    .parseToClassName(enumName);
-            final EnumBuilder enumBuilder = typeBuilder
-                    .addEnumeration(enumerationName);
-
-            if (enumBuilder != null) {
-                final List<EnumPair> enums = enumTypeDef.getValues();
-                if (enums != null) {
-                    int listIndex = 0;
-                    for (final EnumPair enumPair : enums) {
-                        if (enumPair != null) {
-                            final String enumPairName = BindingGeneratorUtil
-                                    .parseToClassName(enumPair.getName());
-                            Integer enumPairValue = enumPair.getValue();
-
-                            if (enumPairValue == null) {
-                                enumPairValue = listIndex;
-                            }
-                            enumBuilder.addValue(enumPairName, enumPairValue);
-                            listIndex++;
-                        }
-                    }
-                }
-                return enumBuilder;
+    private boolean leafContainsEnumDefinition(final DataSchemaNode dataNode) {
+        if (dataNode instanceof LeafSchemaNode) {
+            final LeafSchemaNode leaf = (LeafSchemaNode) dataNode;
+            if (leaf.getType() instanceof EnumTypeDefinition) {
+                return true;
             }
         }
-        return null;
+        return false;
+    }
+
+    private boolean leafListContainsEnumDefinition(
+            final DataSchemaNode dataNode) {
+        if (dataNode instanceof LeafListSchemaNode) {
+            final LeafListSchemaNode leafList = (LeafListSchemaNode) dataNode;
+            if (leafList.getType() instanceof EnumTypeDefinition) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private Enumeration resolveEnumFromTypeDefinition(
             final EnumTypeDefinition enumTypeDef, final String enumName) {
-        if ((enumTypeDef != null) && (enumTypeDef.getQName() != null)
-                && (enumTypeDef.getQName().getLocalName() != null)) {
-
-            final String enumerationName = BindingGeneratorUtil
-                    .parseToClassName(enumName);
-
-            Module module = resolveModuleFromTypePath(schemaContext, enumTypeDef);
-
-            final String basePackageName = BindingGeneratorUtil
-                    .moduleNamespaceToPackageName(module);
-            final String packageName = BindingGeneratorUtil
-                    .packageNameForGeneratedType(basePackageName,
-                            enumTypeDef.getPath());
-
-            final EnumBuilder enumBuilder = new EnumerationBuilderImpl(
-                    packageName, enumerationName);
-
-            if (enumBuilder != null) {
-                final List<EnumPair> enums = enumTypeDef.getValues();
-                if (enums != null) {
-                    int listIndex = 0;
-                    for (final EnumPair enumPair : enums) {
-                        if (enumPair != null) {
-                            final String enumPairName = BindingGeneratorUtil
-                                    .parseToClassName(enumPair.getName());
-                            Integer enumPairValue = enumPair.getValue();
-
-                            if (enumPairValue == null) {
-                                enumPairValue = listIndex;
-                            }
-                            enumBuilder.addValue(enumPairName, enumPairValue);
-                            listIndex++;
+        if (enumTypeDef == null) {
+            throw new IllegalArgumentException("EnumTypeDefinition reference " +
+                    "cannot be NULL!");
+        }
+        if (enumTypeDef.getValues() == null) {
+            throw new IllegalArgumentException("EnumTypeDefinition MUST " +
+                    "contain at least ONE value definition!");
+        }
+        if (enumTypeDef.getQName() == null) {
+            throw new IllegalArgumentException("EnumTypeDefinition MUST " +
+                    "contain NON-NULL QName!");
+        }
+        if (enumTypeDef.getQName().getLocalName() == null) {
+            throw new IllegalArgumentException("Local Name in " +
+                    "EnumTypeDefinition QName cannot be NULL!");
+        }
+
+        final String enumerationName = parseToClassName(enumName);
+
+        Module module = findParentModuleForTypeDefinition(schemaContext, enumTypeDef);
+        final String basePackageName = moduleNamespaceToPackageName(module);
+
+        final EnumBuilder enumBuilder = new EnumerationBuilderImpl(
+                basePackageName, enumerationName);
+        updateEnumPairsFromEnumTypeDef(enumTypeDef, enumBuilder);
+        return enumBuilder.toInstance(null);
+    }
+
+    private EnumBuilder resolveInnerEnumFromTypeDefinition(
+            final EnumTypeDefinition enumTypeDef, final String enumName,
+            final GeneratedTypeBuilder typeBuilder) {
+        if (enumTypeDef == null) {
+            throw new IllegalArgumentException("EnumTypeDefinition reference " +
+                    "cannot be NULL!");
+        }
+        if (enumTypeDef.getValues() == null) {
+            throw new IllegalArgumentException("EnumTypeDefinition MUST " +
+                    "contain at least ONE value definition!");
+        }
+        if (enumTypeDef.getQName() == null) {
+            throw new IllegalArgumentException("EnumTypeDefinition MUST " +
+                    "contain NON-NULL QName!");
+        }
+        if (enumTypeDef.getQName().getLocalName() == null) {
+            throw new IllegalArgumentException("Local Name in " +
+                    "EnumTypeDefinition QName cannot be NULL!");
+        }
+        if (typeBuilder == null) {
+            throw new IllegalArgumentException("Generated Type Builder " +
+                    "reference cannot be NULL!");
+        }
+
+        final String enumerationName = parseToClassName(enumName);
+        final EnumBuilder enumBuilder = typeBuilder
+                .addEnumeration(enumerationName);
+
+        updateEnumPairsFromEnumTypeDef(enumTypeDef, enumBuilder);
+
+        return enumBuilder;
+    }
+
+    private void updateEnumPairsFromEnumTypeDef(
+            final EnumTypeDefinition enumTypeDef,
+            final EnumBuilder enumBuilder) {
+        if (enumBuilder != null) {
+            final List<EnumPair> enums = enumTypeDef.getValues();
+            if (enums != null) {
+                int listIndex = 0;
+                for (final EnumPair enumPair : enums) {
+                    if (enumPair != null) {
+                        final String enumPairName = parseToClassName(enumPair
+                                .getName());
+                        Integer enumPairValue = enumPair.getValue();
+
+                        if (enumPairValue == null) {
+                            enumPairValue = listIndex;
                         }
+                        enumBuilder.addValue(enumPairName, enumPairValue);
+                        listIndex++;
                     }
                 }
-                return enumBuilder.toInstance(null);
             }
         }
-        return null;
     }
 
     private Type resolveTypeFromDataSchemaNode(final DataSchemaNode dataNode) {
@@ -276,129 +357,185 @@ public class TypeProviderImpl implements TypeProvider {
         return returnType;
     }
 
-    private List<GeneratedTransferObject> resolveTypeDefsFromContext() {
-        final List<GeneratedTransferObject> genTypeDefs = new ArrayList<GeneratedTransferObject>();
+    private void resolveTypeDefsFromContext() {
         final Set<Module> modules = schemaContext.getModules();
-        if (modules != null) {
-            for (final Module module : modules) {
-                if (module != null) {
-                    final String moduleName = module.getName();
-                    final String basePackageName = BindingGeneratorUtil
-                            .moduleNamespaceToPackageName(module);
-
-                    final Set<TypeDefinition<?>> typeDefinitions = module
-                            .getTypeDefinitions();
-
-                    if ((typeDefinitions != null) && (basePackageName != null)) {
-                        for (final TypeDefinition<?> typedef : typeDefinitions) {
-                            final GeneratedTransferObject genTransObj = toGeneratedTransferObject(
-                                    basePackageName, moduleName, typedef);
-                            if (genTransObj != null) {
-                                genTypeDefs.add(genTransObj);
-                            }
-                        }
-                        // for (final TypeDefinition<?> typedef :
-                        // typeDefinitions) {
-                        // addUnionGeneratedTypeDefinition(basePackageName,
-                        // module.getName(), typedef);
-                        // }
-                    }
+        if (modules == null) {
+            throw new IllegalArgumentException("Sef of Modules cannot be " +
+                    "NULL!");
+        }
+        for (final Module module : modules) {
+            if (module == null) {
+                continue;
+            }
+            final String moduleName = module.getName();
+            final String basePackageName = moduleNamespaceToPackageName(module);
+
+            final Set<TypeDefinition<?>> typeDefinitions = module
+                    .getTypeDefinitions();
+
+            final Map<String, Type> typeMap = new HashMap<>();
+            genTypeDefsContextMap.put(moduleName, typeMap);
+
+            if ((typeDefinitions != null) && (basePackageName != null)) {
+                for (final TypeDefinition<?> typedef : typeDefinitions) {
+                    typedefToGeneratedType(basePackageName, moduleName, typedef);
+                }
+                final List<ExtendedType> extUnions = UnionDependencySort
+                        .sort(typeDefinitions);
+                for (final ExtendedType extUnionType : extUnions) {
+                    addUnionGeneratedTypeDefinition(basePackageName, extUnionType);
                 }
             }
         }
-        return genTypeDefs;
     }
 
-    private GeneratedTransferObject toGeneratedTransferObject(
-            final String basePackageName, final String moduleName,
-            final TypeDefinition<?> typedef) {
+    private Type typedefToGeneratedType(final String basePackageName,
+                                        final String moduleName, final TypeDefinition<?> typedef) {
         if ((basePackageName != null) && (moduleName != null)
                 && (typedef != null) && (typedef.getQName() != null)) {
-            final GeneratedTOBuilder genTOBuilder = typedefToTransferObject(
-                    basePackageName, typedef);
 
-            final String typedefName = typedef.getQName().getLocalName();
-            final String propertyName = BindingGeneratorUtil
-                    .parseToValidParamName(typedefName);
 
+            final String typedefName = typedef.getQName().getLocalName();
             final TypeDefinition<?> baseTypeDefinition = baseTypeDefForExtendedType(typedef);
             if (!(baseTypeDefinition instanceof LeafrefTypeDefinition)
                     && !(baseTypeDefinition instanceof IdentityrefTypeDefinition)) {
-                Type returnType = null;
+                Type returnType;
                 if (baseTypeDefinition instanceof EnumTypeDefinition) {
                     final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) baseTypeDefinition;
                     returnType = resolveEnumFromTypeDefinition(enumTypeDef,
                             typedefName);
+
                 } else {
-                    returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
+                    final Type javaType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
                             .javaTypeForSchemaDefinitionType(baseTypeDefinition);
-                }
 
+                    returnType = wrapJavaTypeIntoTO(basePackageName, typedef,
+                            javaType);
+                }
                 if (returnType != null) {
-                    final GeneratedPropertyBuilder genPropBuilder = genTOBuilder
-                            .addProperty(propertyName);
-
-                    genPropBuilder.addReturnType(returnType);
-                    genTOBuilder.addEqualsIdentity(genPropBuilder);
-                    genTOBuilder.addHashIdentity(genPropBuilder);
-                    genTOBuilder.addToStringProperty(genPropBuilder);
-
-                    Map<String, GeneratedTransferObject> transferObjectsMap = genTypeDefsContextMap
-                            .get(moduleName);
-                    if (transferObjectsMap == null) {
-                        transferObjectsMap = new HashMap<String, GeneratedTransferObject>();
-                        genTypeDefsContextMap.put(moduleName,
-                                transferObjectsMap);
-                    }
-
-                    final GeneratedTransferObject transferObject = genTOBuilder
-                            .toInstance();
-                    if (transferObject != null) {
-                        transferObjectsMap.put(typedefName, transferObject);
-                        return transferObject;
+                    final Map<String, Type> typeMap = genTypeDefsContextMap.get
+                            (moduleName);
+                    if (typeMap != null) {
+                        typeMap.put(typedefName, returnType);
                     }
+                    return returnType;
                 }
             }
         }
         return null;
     }
 
+    private GeneratedTransferObject wrapJavaTypeIntoTO(
+            final String basePackageName, final TypeDefinition<?> typedef,
+            final Type javaType) {
+        if (javaType != null) {
+            final String typedefName = typedef.getQName().getLocalName();
+            final String propertyName = parseToValidParamName(typedefName);
+
+            final GeneratedTOBuilder genTOBuilder = typedefToTransferObject(
+                    basePackageName, typedef);
+
+            final GeneratedPropertyBuilder genPropBuilder = genTOBuilder
+                    .addProperty(propertyName);
+
+            genPropBuilder.addReturnType(javaType);
+            genTOBuilder.addEqualsIdentity(genPropBuilder);
+            genTOBuilder.addHashIdentity(genPropBuilder);
+            genTOBuilder.addToStringProperty(genPropBuilder);
+            return genTOBuilder.toInstance();
+        }
+        return null;
+    }
+
     private void addUnionGeneratedTypeDefinition(final String basePackageName,
-            final String moduleName, final TypeDefinition<?> typedef) {
-        if ((basePackageName != null) && (moduleName != null)
-                && (typedef != null) && (typedef.getQName() != null)) {
-            final TypeDefinition<?> baseTypeDefinition = baseTypeDefForExtendedType(typedef);
+                                                 final TypeDefinition<?> typedef) {
+        if (basePackageName == null) {
+            throw new IllegalArgumentException("Base Package Name cannot be " +
+                    "NULL!");
+        }
+        if (typedef == null) {
+            throw new IllegalArgumentException("Type Definition cannot be " +
+                    "NULL!");
+        }
+        if (typedef.getQName() == null) {
+            throw new IllegalArgumentException("Type Definition cannot have " +
+                    "non specified QName (QName cannot be NULL!)");
+        }
 
-            if ((baseTypeDefinition != null)
-                    && (baseTypeDefinition instanceof UnionTypeDefinition)) {
-                final UnionTypeDefinition unionTypeDef = (UnionTypeDefinition) baseTypeDefinition;
-
-                final List<TypeDefinition<?>> unionTypes = unionTypeDef
-                        .getTypes();
-                final Map<String, GeneratedTransferObject> genTOsMap = genTypeDefsContextMap
-                        .get(moduleName);
-                final GeneratedTOBuilder unionGenTransObject = typedefToTransferObject(
-                        basePackageName, typedef);
-                if ((unionTypes != null) && (genTOsMap != null)
-                        && (unionGenTransObject != null)) {
-                    for (final TypeDefinition<?> unionType : unionTypes) {
-                        final String typeName = unionType.getQName()
-                                .getLocalName();
-                        final GeneratedTransferObject genTransferObject = genTOsMap
-                                .get(typeName);
-
-                        if (genTransferObject != null) {
-                            unionGenTransObject
-                                    .addProperty(
-                                            BindingGeneratorUtil
-                                                    .parseToValidParamName(genTransferObject
-                                                            .getName()))
-                                    .addReturnType(genTransferObject);
+        final TypeDefinition<?> baseTypeDefinition = typedef.getBaseType();
+        if ((baseTypeDefinition != null)
+                && (baseTypeDefinition instanceof UnionTypeDefinition)) {
+            final UnionTypeDefinition unionTypeDef = (UnionTypeDefinition) baseTypeDefinition;
+            final List<TypeDefinition<?>> unionTypes = unionTypeDef
+                    .getTypes();
+            final Module parentModule = findParentModuleForTypeDefinition(schemaContext,
+                    typedef);
+
+            Map<String, Type> genTOsMap = null;
+            if (parentModule != null && parentModule.getName() != null) {
+                genTOsMap = genTypeDefsContextMap.get(parentModule.getName());
+            }
+
+            final GeneratedTOBuilder unionGenTransObject = typedefToTransferObject(
+                    basePackageName, typedef);
+            if ((unionTypes != null) && (unionGenTransObject != null)) {
+                for (final TypeDefinition<?> unionType : unionTypes) {
+                    final String typeName = unionType.getQName()
+                            .getLocalName();
+                    if (unionType instanceof ExtendedType) {
+                        final Module unionTypeModule = findParentModuleForTypeDefinition(schemaContext,
+                                unionType);
+                        if (unionTypeModule != null && unionTypeModule.getName() != null) {
+                            final Map<String, Type> innerGenTOs = genTypeDefsContextMap
+                                    .get(unionTypeModule.getName());
+
+                            final GeneratedTransferObject genTransferObject =
+                                    (GeneratedTransferObject) innerGenTOs.get(typeName);
+                            if (genTransferObject != null) {
+                                updateUnionTypeAsProperty(unionGenTransObject,
+                                        genTransferObject,
+                                        genTransferObject.getName());
+                            }
+                        }
+                    } else if (unionType instanceof EnumTypeDefinition) {
+                        final EnumBuilder
+                                enumBuilder = resolveInnerEnumFromTypeDefinition(
+                                (EnumTypeDefinition) unionType, typeName,
+                                unionGenTransObject);
+                        final Type enumRefType = new ReferencedTypeImpl(
+                                enumBuilder.getPackageName(),
+                                enumBuilder.getName());
+                        updateUnionTypeAsProperty(unionGenTransObject,
+                                enumRefType, typeName);
+                    } else {
+                        final Type javaType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
+                                .javaTypeForSchemaDefinitionType(unionType);
+                        if (javaType != null) {
+                            updateUnionTypeAsProperty(unionGenTransObject,
+                                    javaType, typeName);
                         }
                     }
-                    genTOsMap.put(unionTypeDef.getQName().getLocalName(),
-                            unionGenTransObject.toInstance());
                 }
+                genTOsMap.put(typedef.getQName().getLocalName(),
+                        unionGenTransObject.toInstance());
+            }
+        }
+    }
+
+    private void updateUnionTypeAsProperty(
+            final GeneratedTOBuilder unionGenTransObject, final Type type,
+            final String propertyName) {
+        if (unionGenTransObject != null && type != null) {
+            final GeneratedPropertyBuilder propBuilder =
+                    unionGenTransObject.addProperty(parseToValidParamName(
+                            propertyName));
+            propBuilder.addReturnType(type);
+            propBuilder.setReadOnly(false);
+
+            if (!(type instanceof Enumeration)) {
+                unionGenTransObject.addEqualsIdentity(propBuilder);
+                unionGenTransObject.addHashIdentity(propBuilder);
+                unionGenTransObject.addToStringProperty(propBuilder);
             }
         }
     }
@@ -406,14 +543,13 @@ public class TypeProviderImpl implements TypeProvider {
     private GeneratedTOBuilder typedefToTransferObject(
             final String basePackageName, final TypeDefinition<?> typedef) {
 
-        final String packageName = BindingGeneratorUtil
-                .packageNameForGeneratedType(basePackageName, typedef.getPath());
+        final String packageName = packageNameForGeneratedType(basePackageName,
+                typedef.getPath());
         final String typeDefTOName = typedef.getQName().getLocalName();
 
         if ((packageName != null) && (typedef != null)
                 && (typeDefTOName != null)) {
-            final String genTOName = BindingGeneratorUtil
-                    .parseToClassName(typeDefTOName);
+            final String genTOName = parseToClassName(typeDefTOName);
             final GeneratedTOBuilder newType = new GeneratedTOBuilderImpl(
                     packageName, genTOName);