Maping of union leaf a bits leaf YANG type to JAVA inner classes.
[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-generator-impl / src / main / java / org / opendaylight / controller / sal / binding / yang / types / TypeProviderImpl.java
index 6bb7907a74ab50be2720c4c37fb75ec4f1cd794d..4824fa75fd000be4910397bc7bd02f3e3775d6ad 100644 (file)
@@ -27,6 +27,7 @@ import org.opendaylight.controller.yang.model.api.type.*;
 import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition.Bit;
 import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
+import org.opendaylight.controller.yang.model.util.StringType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,42 +55,38 @@ public final class TypeProviderImpl implements TypeProvider {
         resolveTypeDefsFromContext();
     }
 
-    public void putReferencedType(final SchemaPath refTypePath,
-                                  final Type refType) {
+    public void putReferencedType(final SchemaPath refTypePath, final Type refType) {
         if (refTypePath == null) {
-            throw new IllegalArgumentException("Path reference of "
-                    + "Enumeration Type Definition cannot be 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!");
+            throw new IllegalArgumentException("Reference to Enumeration " + "Type cannot be NULL!");
         }
         referencedTypes.put(refTypePath, refType);
     }
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.opendaylight.controller.yang.model.type.provider.TypeProvider#
      * javaTypeForYangType(java.lang.String)
      */
     @Override
     public Type javaTypeForYangType(String type) {
-        Type t = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
-                .javaTypeForYangType(type);
+        Type t = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForYangType(type);
         return t;
     }
 
     @Override
-    public Type javaTypeForSchemaDefinitionType(
-            final TypeDefinition<?> typeDefinition) {
+    public Type javaTypeForSchemaDefinitionType(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!)");
+            throw new IllegalArgumentException(
+                    "Type Definition cannot have non specified QName (QName cannot be NULL!)");
         }
         if (typeDefinition.getQName().getLocalName() == null) {
             throw new IllegalArgumentException("Type Definitions Local Name cannot be NULL!");
@@ -106,14 +103,11 @@ public final class TypeProviderImpl implements TypeProvider {
                 returnType = returnTypeForIdentityref(idref);
             } else if (baseTypeDef instanceof EnumTypeDefinition) {
                 final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) baseTypeDef;
-                returnType = resolveEnumFromTypeDefinition(enumTypeDef,
-                        typedefName);
+                returnType = resolveEnumFromTypeDefinition(enumTypeDef, typedefName);
             } else {
-                final Module module = findParentModuleForTypeDefinition(
-                        schemaContext, typeDefinition);
+                final Module module = findParentModuleForTypeDefinition(schemaContext, typeDefinition);
                 if (module != null) {
-                    final Map<String, Type> genTOs = genTypeDefsContextMap
-                            .get(module.getName());
+                    final Map<String, Type> genTOs = genTypeDefsContextMap.get(module.getName());
                     if (genTOs != null) {
                         returnType = genTOs.get(typedefName);
                     }
@@ -131,8 +125,7 @@ public final class TypeProviderImpl implements TypeProvider {
                 final IdentityrefTypeDefinition idref = (IdentityrefTypeDefinition) typeDefinition;
                 returnType = returnTypeForIdentityref(idref);
             } else {
-                returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
-                        .javaTypeForSchemaDefinitionType(typeDefinition);
+                returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType(typeDefinition);
             }
         }
         // TODO: add throw exception when we will be able to resolve ALL yang
@@ -167,14 +160,14 @@ public final class TypeProviderImpl implements TypeProvider {
         return returnType;
     }
 
-    public Type generatedTypeForExtendedDefinitionType(
-            final TypeDefinition<?> 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!)");
+            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!");
@@ -184,14 +177,11 @@ public final class TypeProviderImpl implements TypeProvider {
         if (typeDefinition instanceof ExtendedType) {
             final TypeDefinition<?> baseTypeDef = baseTypeDefForExtendedType(typeDefinition);
 
-            if (!(baseTypeDef instanceof LeafrefTypeDefinition)
-                    && !(baseTypeDef instanceof IdentityrefTypeDefinition)) {
-                final Module module = findParentModuleForTypeDefinition(
-                        schemaContext, 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());
+                    final Map<String, Type> genTOs = genTypeDefsContextMap.get(module.getName());
                     if (genTOs != null) {
                         returnType = genTOs.get(typedefName);
                     }
@@ -201,8 +191,7 @@ public final class TypeProviderImpl implements TypeProvider {
         return returnType;
     }
 
-    private TypeDefinition<?> baseTypeDefForExtendedType(
-            final TypeDefinition<?> extendTypeDef) {
+    private TypeDefinition<?> baseTypeDefForExtendedType(final TypeDefinition<?> extendTypeDef) {
         if (extendTypeDef == null) {
             throw new IllegalArgumentException("Type Definiition reference cannot be NULL!");
         }
@@ -232,23 +221,19 @@ public final class TypeProviderImpl implements TypeProvider {
             if (strXPath.matches(".*//[.* | .*//].*")) {
                 returnType = Types.typeForClass(Object.class);
             } else {
-                final Module module = findParentModuleForTypeDefinition(
-                        schemaContext, leafrefType);
+                final Module module = findParentModuleForTypeDefinition(schemaContext, leafrefType);
                 if (module != null) {
                     final DataSchemaNode dataNode;
                     if (xpath.isAbsolute()) {
-                        dataNode = findDataSchemaNode(schemaContext, module,
-                                xpath);
+                        dataNode = findDataSchemaNode(schemaContext, module, xpath);
                     } else {
-                        dataNode = findDataSchemaNodeForRelativeXPath(
-                                schemaContext, module, leafrefType, xpath);
+                        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()));
+                        returnType = Types.listTypeFor(referencedTypes.get(dataNode.getPath()));
                     } else {
                         returnType = resolveTypeFromDataSchemaNode(dataNode);
                     }
@@ -278,8 +263,7 @@ public final class TypeProviderImpl implements TypeProvider {
         return false;
     }
 
-    private Enumeration resolveEnumFromTypeDefinition(
-            final EnumTypeDefinition enumTypeDef, final String enumName) {
+    private Enumeration resolveEnumFromTypeDefinition(final EnumTypeDefinition enumTypeDef, final String enumName) {
         if (enumTypeDef == null) {
             throw new IllegalArgumentException("EnumTypeDefinition reference cannot be NULL!");
         }
@@ -295,18 +279,15 @@ public final class TypeProviderImpl implements TypeProvider {
 
         final String enumerationName = parseToClassName(enumName);
 
-        Module module = findParentModuleForTypeDefinition(schemaContext,
-                enumTypeDef);
+        Module module = findParentModuleForTypeDefinition(schemaContext, enumTypeDef);
         final String basePackageName = moduleNamespaceToPackageName(module);
 
-        final EnumBuilder enumBuilder = new EnumerationBuilderImpl(
-                basePackageName, enumerationName);
+        final EnumBuilder enumBuilder = new EnumerationBuilderImpl(basePackageName, enumerationName);
         updateEnumPairsFromEnumTypeDef(enumTypeDef, enumBuilder);
         return enumBuilder.toInstance(null);
     }
 
-    private EnumBuilder resolveInnerEnumFromTypeDefinition(
-            final EnumTypeDefinition enumTypeDef, final String enumName,
+    private EnumBuilder resolveInnerEnumFromTypeDefinition(final EnumTypeDefinition enumTypeDef, final String enumName,
             final GeneratedTypeBuilder typeBuilder) {
         if (enumTypeDef == null) {
             throw new IllegalArgumentException("EnumTypeDefinition reference cannot be NULL!");
@@ -325,24 +306,21 @@ public final class TypeProviderImpl implements TypeProvider {
         }
 
         final String enumerationName = parseToClassName(enumName);
-        final EnumBuilder enumBuilder = typeBuilder
-                .addEnumeration(enumerationName);
+        final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumerationName);
 
         updateEnumPairsFromEnumTypeDef(enumTypeDef, enumBuilder);
 
         return enumBuilder;
     }
 
-    private void updateEnumPairsFromEnumTypeDef(
-            final EnumTypeDefinition enumTypeDef, final EnumBuilder 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());
+                        final String enumPairName = parseToClassName(enumPair.getName());
                         Integer enumPairValue = enumPair.getValue();
 
                         if (enumPairValue == null) {
@@ -382,8 +360,7 @@ public final class TypeProviderImpl implements TypeProvider {
             final String moduleName = module.getName();
             final String basePackageName = moduleNamespaceToPackageName(module);
 
-            final Set<TypeDefinition<?>> typeDefinitions = module
-                    .getTypeDefinitions();
+            final Set<TypeDefinition<?>> typeDefinitions = module.getTypeDefinitions();
 
             final Map<String, Type> typeMap = new HashMap<>();
             genTypeDefsContextMap.put(moduleName, typeMap);
@@ -392,20 +369,17 @@ public final class TypeProviderImpl implements TypeProvider {
                 for (final TypeDefinition<?> typedef : typeDefinitions) {
                     typedefToGeneratedType(basePackageName, moduleName, typedef);
                 }
-                final List<ExtendedType> extUnions = UnionDependencySort
-                        .sort(typeDefinitions);
+                final List<ExtendedType> extUnions = UnionDependencySort.sort(typeDefinitions);
                 for (final ExtendedType extUnionType : extUnions) {
-                    addUnionGeneratedTypeDefinition(basePackageName,
-                            extUnionType);
+                    addUnionGeneratedTypeDefinition(basePackageName, extUnionType, null);
                 }
             }
         }
     }
 
-    private Type typedefToGeneratedType(final String basePackageName,
-                                        final String moduleName, final TypeDefinition<?> typedef) {
-        if ((basePackageName != null) && (moduleName != null)
-                && (typedef != null) && (typedef.getQName() != null)) {
+    private Type typedefToGeneratedType(final String basePackageName, final String moduleName,
+            final TypeDefinition<?> typedef) {
+        if ((basePackageName != null) && (moduleName != null) && (typedef != null) && (typedef.getQName() != null)) {
 
             final String typedefName = typedef.getQName().getLocalName();
             final TypeDefinition<?> baseTypeDefinition = baseTypeDefForExtendedType(typedef);
@@ -414,24 +388,22 @@ public final class TypeProviderImpl implements TypeProvider {
                 Type returnType;
                 if (baseTypeDefinition instanceof EnumTypeDefinition) {
                     final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) baseTypeDefinition;
-                    returnType = resolveEnumFromTypeDefinition(enumTypeDef,
-                            typedefName);
+                    returnType = resolveEnumFromTypeDefinition(enumTypeDef, typedefName);
 
                 } else if (baseTypeDefinition instanceof BitsTypeDefinition) {
                     final BitsTypeDefinition bitsTypeDefinition = (BitsTypeDefinition) baseTypeDefinition;
-                    returnType = bitsTypedefToTransferObject(bitsTypeDefinition,
-                            basePackageName, typedefName);
+                    GeneratedTOBuilder genTOBuilder = bitsTypedefToTransferObject(basePackageName, bitsTypeDefinition,
+                            typedefName);
+                    returnType = genTOBuilder.toInstance();
 
                 } else {
                     final Type javaType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
                             .javaTypeForSchemaDefinitionType(baseTypeDefinition);
 
-                    returnType = wrapJavaTypeIntoTO(basePackageName, typedef,
-                            javaType);
+                    returnType = wrapJavaTypeIntoTO(basePackageName, typedef, javaType);
                 }
                 if (returnType != null) {
-                    final Map<String, Type> typeMap = genTypeDefsContextMap
-                            .get(moduleName);
+                    final Map<String, Type> typeMap = genTypeDefsContextMap.get(moduleName);
                     if (typeMap != null) {
                         typeMap.put(typedefName, returnType);
                     }
@@ -442,47 +414,33 @@ public final class TypeProviderImpl implements TypeProvider {
         return null;
     }
 
-    private GeneratedTransferObject wrapJavaTypeIntoTO(
-            final String basePackageName, final TypeDefinition<?> typedef,
+    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 GeneratedTOBuilder genTOBuilder = typedefToTransferObject(basePackageName, typedef);
 
-            final GeneratedPropertyBuilder genPropBuilder = genTOBuilder
-                    .addProperty(propertyName);
+            final GeneratedPropertyBuilder genPropBuilder = genTOBuilder.addProperty(propertyName);
 
             genPropBuilder.setReturnType(javaType);
             genTOBuilder.addEqualsIdentity(genPropBuilder);
             genTOBuilder.addHashIdentity(genPropBuilder);
             genTOBuilder.addToStringProperty(genPropBuilder);
-            if (javaType == BaseYangTypes.STRING_TYPE) {
-                if (typedef instanceof ExtendedType) {
-                    List<PatternConstraint> patternConstraints = ((ExtendedType) typedef).getPatterns();
-                    List<String> regularExpressions = new ArrayList<String>();
-                    String regEx;
-                    String modifiedRegEx;
-                    for (PatternConstraint ptrnCons : patternConstraints) {
-                        regEx = ptrnCons.getRegularExpression();
-                        modifiedRegEx = StringEscapeUtils.escapeJava(regEx);
-                        regularExpressions.add(modifiedRegEx);
-                    }                   
-                    
-                    genTOBuilder.addConstant(Types.listTypeFor(BaseYangTypes.STRING_TYPE),
-                            TypeConstants.PATTERN_CONSTANT_NAME, regularExpressions);
-                }
-            }            
-            
+
+            if (typedef instanceof ExtendedType) {
+                final List<String> regExps = resolveRegExpressionsFromTypedef((ExtendedType) typedef);
+                addStringRegExAsConstant(genTOBuilder, regExps);
+            }
+
             return genTOBuilder.toInstance();
         }
         return null;
     }
 
-    private void addUnionGeneratedTypeDefinition(final String basePackageName,
-                                                 final TypeDefinition<?> typedef) {
+    public GeneratedTOBuilder addUnionGeneratedTypeDefinition(final String basePackageName,
+            final TypeDefinition<?> typedef, String typeDefName) {
         if (basePackageName == null) {
             throw new IllegalArgumentException("Base Package Name cannot be NULL!");
         }
@@ -490,131 +448,176 @@ public final class TypeProviderImpl implements TypeProvider {
             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!)");
+            throw new IllegalArgumentException(
+                    "Type Definition cannot have non specified QName (QName cannot be NULL!)");
         }
 
         final TypeDefinition<?> baseTypeDefinition = typedef.getBaseType();
-        if ((baseTypeDefinition != null)
-                && (baseTypeDefinition instanceof UnionTypeDefinition)) {
+        if ((baseTypeDefinition != null) && (baseTypeDefinition instanceof UnionTypeDefinition)) {
+            final Module parentModule = findParentModuleForTypeDefinition(schemaContext, typedef);
             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());
+            final GeneratedTOBuilder unionGenTransObject;
+            if (typeDefName != null && !typeDefName.isEmpty()) {
+                final String typeName = parseToClassName(typeDefName);
+                unionGenTransObject = new GeneratedTOBuilderImpl(basePackageName, typeName);
+            } else {
+                unionGenTransObject = typedefToTransferObject(basePackageName, typedef);
+            }
+            unionGenTransObject.setIsUnion(true);
+
+            final List<String> regularExpressions = new ArrayList<String>();
+            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 {
+                            final TypeDefinition<?> baseType = baseTypeDefForExtendedType(unionType);
+                            if (typeName.equals(baseType.getQName().getLocalName())) {
+                                final Type javaType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER
+                                        .javaTypeForSchemaDefinitionType(baseType);
+                                if (javaType != null) {
+                                    updateUnionTypeAsProperty(unionGenTransObject, javaType, typeName);
+                                }
+                            }
+                            if (baseType instanceof StringType) {
+                                regularExpressions.addAll(resolveRegExpressionsFromTypedef((ExtendedType) unionType));
                             }
                         }
-                    } 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);
-                        }
+                    }
+                } 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(typedef.getQName().getLocalName(),
-                        unionGenTransObject.toInstance());
             }
+            if (!regularExpressions.isEmpty()) {
+                addStringRegExAsConstant(unionGenTransObject, regularExpressions);
+            }
+
+            genTOsMap.put(typedef.getQName().getLocalName(), unionGenTransObject.toInstance());
+            return unionGenTransObject;
         }
+        return null;
     }
 
-    private void updateUnionTypeAsProperty(
-            final GeneratedTOBuilder unionGenTransObject, final Type type,
+    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.setReturnType(type);
-            propBuilder.setReadOnly(false);
-
-            if (!(type instanceof Enumeration)) {
-                unionGenTransObject.addEqualsIdentity(propBuilder);
-                unionGenTransObject.addHashIdentity(propBuilder);
-                unionGenTransObject.addToStringProperty(propBuilder);
+            if (!unionGenTransObject.containsProperty(propertyName)) {
+                final GeneratedPropertyBuilder propBuilder = unionGenTransObject
+                        .addProperty(parseToValidParamName(propertyName));
+                propBuilder.setReturnType(type);
+
+                if (!(type instanceof Enumeration)) {
+                    unionGenTransObject.addEqualsIdentity(propBuilder);
+                    unionGenTransObject.addHashIdentity(propBuilder);
+                    unionGenTransObject.addToStringProperty(propBuilder);
+                }
             }
         }
     }
 
-    private GeneratedTOBuilder typedefToTransferObject(
-            final String basePackageName, final TypeDefinition<?> typedef) {
+    private GeneratedTOBuilder typedefToTransferObject(final String basePackageName, final TypeDefinition<?> typedef) {
 
-        final String packageName = packageNameForGeneratedType(basePackageName,
-                typedef.getPath());
+        final String packageName = packageNameForGeneratedType(basePackageName, typedef.getPath());
         final String typeDefTOName = typedef.getQName().getLocalName();
 
-        if ((packageName != null) && (typedef != null)
-                && (typeDefTOName != null)) {
+        if ((packageName != null) && (typedef != null) && (typeDefTOName != null)) {
             final String genTOName = parseToClassName(typeDefTOName);
-            final GeneratedTOBuilder newType = new GeneratedTOBuilderImpl(
-                    packageName, genTOName);
+            final GeneratedTOBuilder newType = new GeneratedTOBuilderImpl(packageName, genTOName);
 
             return newType;
         }
         return null;
     }
 
-    private GeneratedTransferObject bitsTypedefToTransferObject(
-            final BitsTypeDefinition bitsTypeDefinition, final String basePackageName, final String typedefName) {
+    public GeneratedTOBuilder bitsTypedefToTransferObject(final String basePackageName,
+            final TypeDefinition<?> typeDef, String typeDefName) {
 
-        if (bitsTypeDefinition == null) {
-            throw new IllegalArgumentException("Bits TypeDefinition cannot be NULL!");
+        if (typeDef == null) {
+            throw new IllegalArgumentException("typeDef cannot be NULL!");
         }
         if (basePackageName == null) {
             throw new IllegalArgumentException("Base Package Name cannot be NULL!");
         }
-        if (typedefName == null) {
-            throw new IllegalArgumentException("Type Definition Local Name cannot be NULL!");
+
+        if (typeDef instanceof BitsTypeDefinition) {
+            BitsTypeDefinition bitsTypeDefinition = (BitsTypeDefinition) typeDef;
+
+            final String typeName = parseToClassName(typeDefName);
+            final GeneratedTOBuilder genTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typeName);
+
+            final List<Bit> bitList = bitsTypeDefinition.getBits();
+            GeneratedPropertyBuilder genPropertyBuilder;
+            for (final Bit bit : bitList) {
+                String name = bit.getName();
+                genPropertyBuilder = genTOBuilder.addProperty(parseToValidParamName(name));
+                genPropertyBuilder.setReadOnly(false);
+                genPropertyBuilder.setReturnType(BaseYangTypes.BOOLEAN_TYPE);
+
+                genTOBuilder.addEqualsIdentity(genPropertyBuilder);
+                genTOBuilder.addHashIdentity(genPropertyBuilder);
+                genTOBuilder.addToStringProperty(genPropertyBuilder);
+            }
+
+            return genTOBuilder;
         }
+        return null;
+    }
 
-        final String typeDefName = parseToClassName(typedefName);
-        final GeneratedTOBuilder genTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typeDefName);
+    private List<String> resolveRegExpressionsFromTypedef(ExtendedType typedef) {
+        final List<String> regExps = new ArrayList<String>();
+        if (typedef == null) {
+            throw new IllegalArgumentException("typedef can't be null");
+        }
+        final TypeDefinition<?> strTypeDef = baseTypeDefForExtendedType(typedef);
+        if (strTypeDef instanceof StringType) {
+            final List<PatternConstraint> patternConstraints = typedef.getPatterns();
+            if (!patternConstraints.isEmpty()) {
+                String regEx;
+                String modifiedRegEx;
+                for (PatternConstraint patternConstraint : patternConstraints) {
+                    regEx = patternConstraint.getRegularExpression();
+                    modifiedRegEx = StringEscapeUtils.escapeJava(regEx);
+                    regExps.add(modifiedRegEx);
+                }
+            }
+        }
+        return regExps;
+    }
 
-        final List<Bit> bitList = bitsTypeDefinition.getBits();
-        GeneratedPropertyBuilder genPropertyBuilder;
-        for (final Bit bit : bitList) {
-            String name = bit.getName();
-            genPropertyBuilder = genTOBuilder.addProperty(parseToValidParamName(name));
-            genPropertyBuilder.setReadOnly(false);
-            genPropertyBuilder.setReturnType(BaseYangTypes.BOOLEAN_TYPE);
+    private void addStringRegExAsConstant(GeneratedTOBuilder genTOBuilder, List<String> regularExpressions) {
+        if (genTOBuilder == null)
+            throw new IllegalArgumentException("genTOBuilder can't be null");
+        if (regularExpressions == null)
+            throw new IllegalArgumentException("regularExpressions can't be null");
 
-            genTOBuilder.addEqualsIdentity(genPropertyBuilder);
-            genTOBuilder.addHashIdentity(genPropertyBuilder);
-            genTOBuilder.addToStringProperty(genPropertyBuilder);
+        if (!regularExpressions.isEmpty()) {
+            genTOBuilder.addConstant(Types.listTypeFor(BaseYangTypes.STRING_TYPE), TypeConstants.PATTERN_CONSTANT_NAME,
+                    regularExpressions);
         }
-        return genTOBuilder.toInstance();
     }
-    
+
 }