*/\r
package org.opendaylight.yangtools.sal.binding.generator.impl;\r
\r
-import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*;\r
-import static org.opendaylight.yangtools.binding.generator.util.BindingTypes.*;\r
-import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*;\r
-\r
import java.util.ArrayList;\r
import java.util.Collections;\r
import java.util.HashMap;\r
import java.util.List;\r
import java.util.Map;\r
import java.util.Set;\r
-\r
import org.opendaylight.yangtools.binding.generator.util.BindingTypes;\r
import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl;\r
import org.opendaylight.yangtools.binding.generator.util.Types;\r
import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;\r
import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;\r
import org.opendaylight.yangtools.yang.model.util.DataNodeIterator;\r
-import org.opendaylight.yangtools.yang.model.util.ExtendedType;\r
import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;\r
import org.opendaylight.yangtools.yang.model.util.UnionType;\r
import static com.google.common.base.Preconditions.*;\r
import static extension org.opendaylight.yangtools.binding.generator.util.Types.*;\r
+import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*;\r
+import static org.opendaylight.yangtools.binding.generator.util.BindingTypes.*;\r
+import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*;\r
+import org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort\r
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;\r
\r
public class BindingGeneratorImpl implements BindingGenerator {\r
-\r
/**\r
* Outter key represents the package name. Outter value represents map of\r
* all builders in the same package. Inner key represents the schema node\r
* case is used this map.\r
*/\r
private val allGroupings = new HashMap<SchemaPath, GeneratedType>();\r
- \r
- \r
+\r
private val yangToJavaMapping = new HashMap<SchemaPath, Type>();\r
\r
/**\r
*/\r
private val static String AUGMENT_IDENTIFIER_NAME = "augment-identifier";\r
\r
- \r
/**\r
* Resolves generated types from <code>context</code> schema nodes of all\r
* modules.\r
* if <code>context</code> contain no modules\r
*/\r
override generateTypes(SchemaContext context) {\r
- checkArgument(context !== null,"Schema Context reference cannot be NULL.");\r
- checkState(context.modules !== null,"Schema Context does not contain defined modules.");\r
- val List<Type> generatedTypes = new ArrayList();\r
+ checkArgument(context !== null, "Schema Context reference cannot be NULL.");\r
+ checkState(context.modules !== null, "Schema Context does not contain defined modules.");\r
schemaContext = context;\r
typeProvider = new TypeProviderImpl(context);\r
val Set<Module> modules = context.modules;\r
- genTypeBuilders = new HashMap();\r
- for (module : modules) {\r
-\r
- generatedTypes.addAll(allGroupingsToGenTypes(module));\r
-\r
- if (false == module.childNodes.isEmpty()) {\r
- generatedTypes.add(moduleToDataType(module));\r
- }\r
- generatedTypes.addAll(allTypeDefinitionsToGenTypes(module));\r
- generatedTypes.addAll(allContainersToGenTypes(module));\r
- generatedTypes.addAll(allListsToGenTypes(module));\r
- generatedTypes.addAll(allChoicesToGenTypes(module));\r
- generatedTypes.addAll(allRPCMethodsToGenType(module));\r
- generatedTypes.addAll(allNotificationsToGenType(module));\r
- generatedTypes.addAll(allIdentitiesToGenTypes(module, context));\r
- }\r
- for (module : modules) {\r
- generatedTypes.addAll(allAugmentsToGenTypes(module));\r
- \r
- }\r
- return generatedTypes;\r
+ return generateTypes(context, modules);\r
}\r
\r
/**\r
* if <code>context</code> contain no modules\r
*/\r
override generateTypes(SchemaContext context, Set<Module> modules) {\r
- checkArgument(context !== null,"Schema Context reference cannot be NULL.");\r
- checkState(context.modules !== null,"Schema Context does not contain defined modules.");\r
- checkArgument(modules !== null,"Set of Modules cannot be NULL.");\r
+ checkArgument(context !== null, "Schema Context reference cannot be NULL.");\r
+ checkState(context.modules !== null, "Schema Context does not contain defined modules.");\r
+ checkArgument(modules !== null, "Set of Modules cannot be NULL.");\r
\r
val List<Type> filteredGenTypes = new ArrayList();\r
+\r
schemaContext = context;\r
typeProvider = new TypeProviderImpl(context);\r
- val Set<Module> contextModules = context.modules;\r
+ val contextModules = ModuleDependencySort.sort(context.modules);\r
genTypeBuilders = new HashMap();\r
- \r
+\r
for (contextModule : contextModules) {\r
val List<Type> generatedTypes = new ArrayList();\r
-\r
+ generatedTypes.addAll(allTypeDefinitionsToGenTypes(contextModule));\r
generatedTypes.addAll(allGroupingsToGenTypes(contextModule));\r
- if (false == contextModule.childNodes.isEmpty()) {\r
+ if(false == contextModule.childNodes.isEmpty()) {\r
generatedTypes.add(moduleToDataType(contextModule));\r
}\r
- generatedTypes.addAll(allTypeDefinitionsToGenTypes(contextModule));\r
generatedTypes.addAll(allContainersToGenTypes(contextModule));\r
generatedTypes.addAll(allListsToGenTypes(contextModule));\r
generatedTypes.addAll(allChoicesToGenTypes(contextModule));\r
generatedTypes.addAll(allRPCMethodsToGenType(contextModule));\r
generatedTypes.addAll(allNotificationsToGenType(contextModule));\r
generatedTypes.addAll(allIdentitiesToGenTypes(contextModule, context));\r
- \r
- if (modules.contains(contextModule)) {\r
+\r
+ if(modules.contains(contextModule)) {\r
filteredGenTypes.addAll(generatedTypes);\r
}\r
}\r
for (contextModule : contextModules) {\r
val generatedTypes = (allAugmentsToGenTypes(contextModule));\r
- if (modules.contains(contextModule)) {\r
+ if(modules.contains(contextModule)) {\r
filteredGenTypes.addAll(generatedTypes);\r
}\r
- \r
+\r
}\r
return filteredGenTypes;\r
}\r
* </ul>\r
*\r
*/\r
- private def List<Type> allTypeDefinitionsToGenTypes( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ private def List<Type> allTypeDefinitionsToGenTypes(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
val Set<TypeDefinition<?>> typeDefinitions = module.typeDefinitions;\r
- checkState(typeDefinitions !== null,'''Type Definitions for module «module.name» cannot be NULL.''');\r
+ checkState(typeDefinitions !== null, '''Type Definitions for module «module.name» cannot be NULL.''');\r
\r
- \r
val List<Type> generatedTypes = new ArrayList();\r
- for ( TypeDefinition<?> typedef : typeDefinitions) {\r
- if (typedef !== null) {\r
+ for (TypeDefinition<?> typedef : typeDefinitions) {\r
+ if(typedef !== null) {\r
val type = (typeProvider as TypeProviderImpl).generatedTypeForExtendedDefinitionType(typedef, typedef);\r
- if ((type !== null) && !generatedTypes.contains(type)) {\r
+ if((type !== null) && !generatedTypes.contains(type)) {\r
generatedTypes.add(type);\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private def List<Type> allContainersToGenTypes( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ private def List<Type> allContainersToGenTypes(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
\r
- if (module.childNodes === null) {\r
- throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.name\r
- + " cannot be NULL.");\r
+ if(module.childNodes === null) {\r
+ throw new IllegalArgumentException(\r
+ "Reference to Set of Child Nodes in module " + module.name + " cannot be NULL.");\r
}\r
\r
val List<Type> generatedTypes = new ArrayList();\r
val List<ContainerSchemaNode> schemaContainers = it.allContainers();\r
val basePackageName = moduleNamespaceToPackageName(module);\r
for (container : schemaContainers) {\r
- if (!container.isAddedByUses()) {\r
+ if(!container.isAddedByUses()) {\r
generatedTypes.add(containerToGenType(basePackageName, container));\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private def List<Type> allListsToGenTypes( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ private def List<Type> allListsToGenTypes(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
\r
- if (module.childNodes === null) {\r
- throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.name\r
- + " cannot be NULL.");\r
+ if(module.childNodes === null) {\r
+ throw new IllegalArgumentException(\r
+ "Reference to Set of Child Nodes in module " + module.name + " cannot be NULL.");\r
}\r
\r
val List<Type> generatedTypes = new ArrayList();\r
val it = new DataNodeIterator(module);\r
val List<ListSchemaNode> schemaLists = it.allLists();\r
val basePackageName = moduleNamespaceToPackageName(module);\r
- if (schemaLists !== null) {\r
+ if(schemaLists !== null) {\r
for (list : schemaLists) {\r
- if (!list.isAddedByUses()) {\r
+ if(!list.isAddedByUses()) {\r
generatedTypes.addAll(listToGenType(basePackageName, list));\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private def List<GeneratedType> allChoicesToGenTypes( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ private def List<GeneratedType> allChoicesToGenTypes(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
\r
val it = new DataNodeIterator(module);\r
val choiceNodes = it.allChoices();\r
\r
val List<GeneratedType> generatedTypes = new ArrayList();\r
for (choice : choiceNodes) {\r
- if ((choice !== null) && !choice.isAddedByUses()) {\r
+ if((choice !== null) && !choice.isAddedByUses()) {\r
generatedTypes.addAll(choiceToGeneratedType(basePackageName, choice));\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private def List<Type> allAugmentsToGenTypes( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
- if (module.childNodes === null) {\r
- throw new IllegalArgumentException("Reference to Set of Augmentation Definitions in module "\r
- + module.name + " cannot be NULL.");\r
+ private def List<Type> allAugmentsToGenTypes(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
+ if(module.childNodes === null) {\r
+ throw new IllegalArgumentException(\r
+ "Reference to Set of Augmentation Definitions in module " + module.name + " cannot be NULL.");\r
}\r
\r
val List<Type> generatedTypes = new ArrayList();\r
* </ul>\r
*\r
*/\r
- private def List<AugmentationSchema> resolveAugmentations( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
- checkState(module.augmentations !== null,"Augmentations Set cannot be NULL.");\r
+ private def List<AugmentationSchema> resolveAugmentations(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
+ checkState(module.augmentations !== null, "Augmentations Set cannot be NULL.");\r
\r
val Set<AugmentationSchema> augmentations = module.augmentations;\r
val List<AugmentationSchema> sortedAugmentations = new ArrayList(augmentations);\r
- Collections.sort(sortedAugmentations, [augSchema1, augSchema2 |\r
-\r
- if (augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {\r
+ Collections.sort(sortedAugmentations,\r
+ [ augSchema1, augSchema2 |\r
+ if(augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {\r
return 1;\r
- } else if (augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {\r
+ } else if(augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {\r
return -1;\r
}\r
return 0;\r
- ]);\r
+ ]);\r
return sortedAugmentations;\r
}\r
\r
* if the module equals null\r
*\r
*/\r
- private def GeneratedType moduleToDataType( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ private def GeneratedType moduleToDataType(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
\r
val moduleDataTypeBuilder = moduleTypeBuilder(module, "Data");\r
addImplementedInterfaceFromUses(module, moduleDataTypeBuilder);\r
moduleDataTypeBuilder.addImplementsType(DATA_ROOT);\r
\r
val basePackageName = moduleNamespaceToPackageName(module);\r
- if (moduleDataTypeBuilder !== null) {\r
+ if(moduleDataTypeBuilder !== null) {\r
val Set<DataSchemaNode> dataNodes = module.childNodes;\r
resolveDataSchemaNodes(basePackageName, moduleDataTypeBuilder, dataNodes);\r
}\r
* </ul>\r
*\r
*/\r
- private def List<Type> allRPCMethodsToGenType( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ private def List<Type> allRPCMethodsToGenType(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
\r
- if (module.childNodes === null) {\r
- throw new IllegalArgumentException("Reference to Set of RPC Method Definitions in module "\r
- + module.name + " cannot be NULL.");\r
+ if(module.childNodes === null) {\r
+ throw new IllegalArgumentException(\r
+ "Reference to Set of RPC Method Definitions in module " + module.name + " cannot be NULL.");\r
}\r
\r
val basePackageName = moduleNamespaceToPackageName(module);\r
val Set<RpcDefinition> rpcDefinitions = module.rpcs;\r
\r
- if (rpcDefinitions.isEmpty()) {\r
+ if(rpcDefinitions.isEmpty()) {\r
return Collections.emptyList();\r
}\r
\r
val interfaceBuilder = moduleTypeBuilder(module, "Service");\r
interfaceBuilder.addImplementsType(Types.typeForClass(RpcService));\r
for (rpc : rpcDefinitions) {\r
- if (rpc !== null) {\r
+ if(rpc !== null) {\r
\r
val rpcName = parseToClassName(rpc.QName.localName);\r
val rpcMethodName = parseToValidParamName(rpcName);\r
val input = rpc.input;\r
val output = rpc.output;\r
\r
- if (input !== null) {\r
+ if(input !== null) {\r
rpcInOut.add(new DataNodeIterator(input));\r
val inType = addRawInterfaceDefinition(basePackageName, input, rpcName);\r
addImplementedInterfaceFromUses(input, inType);\r
}\r
\r
var Type outTypeInstance = VOID;\r
- if (output !== null) {\r
+ if(output !== null) {\r
rpcInOut.add(new DataNodeIterator(output));\r
val outType = addRawInterfaceDefinition(basePackageName, output, rpcName);\r
addImplementedInterfaceFromUses(output, outType);\r
method.setReturnType(Types.parameterizedTypeFor(FUTURE, rpcRes));\r
for (iter : rpcInOut) {\r
val List<ContainerSchemaNode> nContainers = iter.allContainers();\r
- if ((nContainers !== null) && !nContainers.isEmpty()) {\r
+ if((nContainers !== null) && !nContainers.isEmpty()) {\r
for (container : nContainers) {\r
- if (!container.isAddedByUses()) {\r
+ if(!container.isAddedByUses()) {\r
genRPCTypes.add(containerToGenType(basePackageName, container));\r
}\r
}\r
}\r
val List<ListSchemaNode> nLists = iter.allLists();\r
- if ((nLists !== null) && !nLists.isEmpty()) {\r
+ if((nLists !== null) && !nLists.isEmpty()) {\r
for (list : nLists) {\r
- if (!list.isAddedByUses()) {\r
+ if(!list.isAddedByUses()) {\r
genRPCTypes.addAll(listToGenType(basePackageName, list));\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private def List<Type> allNotificationsToGenType( Module module) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ private def List<Type> allNotificationsToGenType(Module module) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
\r
- checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ checkArgument(module.name !== null, "Module name cannot be NULL.");\r
\r
- if (module.childNodes === null) {\r
- throw new IllegalArgumentException("Reference to Set of Notification Definitions in module "\r
- + module.name + " cannot be NULL.");\r
+ if(module.childNodes === null) {\r
+ throw new IllegalArgumentException(\r
+ "Reference to Set of Notification Definitions in module " + module.name + " cannot be NULL.");\r
}\r
val notifications = module.notifications;\r
if(notifications.isEmpty()) return Collections.emptyList();\r
- \r
+\r
val listenerInterface = moduleTypeBuilder(module, "Listener");\r
listenerInterface.addImplementsType(BindingTypes.NOTIFICATION_LISTENER);\r
- \r
- \r
- \r
+\r
val basePackageName = moduleNamespaceToPackageName(module);\r
val List<Type> generatedTypes = new ArrayList();\r
- \r
- \r
- for ( notification : notifications) {\r
- if (notification !== null) {\r
+\r
+ for (notification : notifications) {\r
+ if(notification !== null) {\r
val iter = new DataNodeIterator(notification);\r
\r
// Containers\r
for (node : iter.allContainers()) {\r
- if (!node.isAddedByUses()) {\r
+ if(!node.isAddedByUses()) {\r
generatedTypes.add(containerToGenType(basePackageName, node));\r
}\r
}\r
+\r
// Lists\r
for (node : iter.allLists()) {\r
- if (!node.isAddedByUses()) {\r
+ if(!node.isAddedByUses()) {\r
generatedTypes.addAll(listToGenType(basePackageName, node));\r
}\r
}\r
- val notificationInterface = addDefaultInterfaceDefinition(basePackageName,\r
- notification);\r
+ val notificationInterface = addDefaultInterfaceDefinition(basePackageName, notification);\r
notificationInterface.addImplementsType(NOTIFICATION);\r
+\r
// Notification object\r
resolveDataSchemaNodes(basePackageName, notificationInterface, notification.childNodes);\r
- \r
- listenerInterface.addMethod("on"+notificationInterface.name) //\r
- .setAccessModifier(AccessModifier.PUBLIC)\r
- .addParameter(notificationInterface, "notification")\r
- .setReturnType(Types.VOID);\r
- \r
+\r
+ listenerInterface.addMethod("on" + notificationInterface.name) //\r
+ .setAccessModifier(AccessModifier.PUBLIC).addParameter(notificationInterface, "notification").\r
+ setReturnType(Types.VOID);\r
+\r
generatedTypes.add(notificationInterface.toInstance());\r
}\r
}\r
* (object of type <code>IdentitySchemaNode</code>\r
*\r
*/\r
- private def List<Type> allIdentitiesToGenTypes( Module module, SchemaContext context) {\r
+ private def List<Type> allIdentitiesToGenTypes(Module module, SchemaContext context) {\r
val List<Type> genTypes = new ArrayList();\r
\r
val Set<IdentitySchemaNode> schemaIdentities = module.identities;\r
\r
val basePackageName = moduleNamespaceToPackageName(module);\r
\r
- if (schemaIdentities !== null && !schemaIdentities.isEmpty()) {\r
+ if(schemaIdentities !== null && !schemaIdentities.isEmpty()) {\r
for (identity : schemaIdentities) {\r
genTypes.add(identityToGenType(basePackageName, identity, context));\r
}\r
*\r
*/\r
private def GeneratedType identityToGenType(String basePackageName, IdentitySchemaNode identity,\r
- SchemaContext context) {\r
- if (identity === null) {\r
+ SchemaContext context) {\r
+ if(identity === null) {\r
return null;\r
}\r
\r
val newType = new GeneratedTOBuilderImpl(packageName, genTypeName);\r
\r
val baseIdentity = identity.baseIdentity;\r
- if (baseIdentity !== null) {\r
+ if(baseIdentity !== null) {\r
val baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity);\r
\r
val returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule);\r
* (object of type <code>GroupingDefinition</code>)\r
*\r
*/\r
- private def List<Type> allGroupingsToGenTypes( Module module) {\r
- checkArgument(module !== null,"Module parameter can not be null");\r
+ private def List<Type> allGroupingsToGenTypes(Module module) {\r
+ checkArgument(module !== null, "Module parameter can not be null");\r
val List<Type> genTypes = new ArrayList();\r
val basePackageName = moduleNamespaceToPackageName(module);\r
val Set<GroupingDefinition> groupings = module.groupings;\r
- val List<GroupingDefinition> groupingsSortedByDependencies = GroupingDefinitionDependencySort.sort(groupings);\r
+ val List<GroupingDefinition> groupingsSortedByDependencies = new GroupingDefinitionDependencySort().sort(\r
+ groupings);\r
\r
for (grouping : groupingsSortedByDependencies) {\r
val genType = groupingToGenType(basePackageName, grouping);\r
* @return GeneratedType which is generated from grouping (object of type\r
* <code>GroupingDefinition</code>)\r
*/\r
- private def GeneratedType groupingToGenType( String basePackageName, GroupingDefinition grouping) {\r
- if (grouping === null) {\r
+ private def GeneratedType groupingToGenType(String basePackageName, GroupingDefinition grouping) {\r
+ if(grouping === null) {\r
return null;\r
}\r
\r
* @return EnumTypeDefinition if it is found inside\r
* <code>typeDefinition</code> or <code>null</code> in other case\r
*/\r
- private def EnumTypeDefinition enumTypeDefFromExtendedType( TypeDefinition<?> typeDefinition) {\r
- if (typeDefinition !== null) {\r
- if (typeDefinition.baseType instanceof EnumTypeDefinition) {\r
+ private def EnumTypeDefinition enumTypeDefFromExtendedType(TypeDefinition<?> typeDefinition) {\r
+ if(typeDefinition !== null) {\r
+ if(typeDefinition.baseType instanceof EnumTypeDefinition) {\r
return typeDefinition.baseType as EnumTypeDefinition;\r
- } else if (typeDefinition.baseType instanceof ExtendedType) {\r
+ } else if(typeDefinition.baseType instanceof ExtendedType) {\r
return enumTypeDefFromExtendedType(typeDefinition.baseType);\r
}\r
}\r
* @return enumeration builder which contais data from\r
* <code>enumTypeDef</code>\r
*/\r
- private def EnumBuilder resolveInnerEnumFromTypeDefinition( EnumTypeDefinition enumTypeDef, String enumName,\r
- GeneratedTypeBuilder typeBuilder) {\r
- if ((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null)\r
- && (enumTypeDef.QName.localName !== null)) {\r
+ private def EnumBuilder resolveInnerEnumFromTypeDefinition(EnumTypeDefinition enumTypeDef, String enumName,\r
+ GeneratedTypeBuilder typeBuilder) {\r
+ if((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null) &&\r
+ (enumTypeDef.QName.localName !== null)) {\r
\r
val enumerationName = parseToClassName(enumName);\r
val enumBuilder = typeBuilder.addEnumeration(enumerationName);\r
* @throws IllegalArgumentException\r
* if <code>module</code> equals null\r
*/\r
- private def GeneratedTypeBuilder moduleTypeBuilder( Module module, String postfix) {\r
- checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ private def GeneratedTypeBuilder moduleTypeBuilder(Module module, String postfix) {\r
+ checkArgument(module !== null, "Module reference cannot be NULL.");\r
val packageName = moduleNamespaceToPackageName(module);\r
val moduleName = parseToClassName(module.name) + postfix;\r
\r
* <li>if target path of <code>augSchema</code> equals null</li>\r
* </ul>\r
*/\r
- private def List<Type> augmentationToGenTypes( String augmentPackageName, AugmentationSchema augSchema) {\r
- checkArgument(augmentPackageName !== null,"Package Name cannot be NULL.");\r
- checkArgument(augSchema !== null,"Augmentation Schema cannot be NULL.");\r
- checkState(augSchema.targetPath !== null,"Augmentation Schema does not contain Target Path (Target Path is NULL).");\r
-\r
+ private def List<Type> augmentationToGenTypes(String augmentPackageName, AugmentationSchema augSchema) {\r
+ checkArgument(augmentPackageName !== null, "Package Name cannot be NULL.");\r
+ checkArgument(augSchema !== null, "Augmentation Schema cannot be NULL.");\r
+ checkState(augSchema.targetPath !== null,\r
+ "Augmentation Schema does not contain Target Path (Target Path is NULL).");\r
val List<Type> genTypes = new ArrayList();\r
\r
// EVERY augmented interface will extends Augmentation<T> interface\r
// and DataObject interface!!!\r
val targetPath = augSchema.targetPath;\r
val targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);\r
- val targetType = yangToJavaMapping.get(targetSchemaNode.path);\r
- if ((targetSchemaNode !== null) && (targetSchemaNode.QName !== null)\r
- && (targetSchemaNode.QName.localName !== null)) {\r
- \r
- val targetPackageName = targetType.packageName;\r
- val targetSchemaNodeName = targetType.name;\r
- \r
- \r
+ if(targetSchemaNode !== null) {\r
+ var targetType = yangToJavaMapping.get(targetSchemaNode.path);\r
+ if(targetType == null) {\r
+\r
+ // FIXME: augmentation should be added as last, all types should already be generated\r
+ // and have assigned Java Types,\r
+ val targetModule = findParentModule(schemaContext, targetSchemaNode);\r
+ val targetBasePackage = moduleNamespaceToPackageName(targetModule);\r
+ val typePackage = packageNameForGeneratedType(targetBasePackage, targetSchemaNode.getPath());\r
+ val targetSchemaNodeName = targetSchemaNode.getQName().getLocalName();\r
+ val typeName = parseToClassName(targetSchemaNodeName);\r
+ targetType = new ReferencedTypeImpl(typePackage, typeName);\r
+ }\r
val augChildNodes = augSchema.childNodes;\r
-\r
- if (!(targetSchemaNode instanceof ChoiceNode)) {\r
- val augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName,\r
- targetType, augSchema);\r
+ if(!(targetSchemaNode instanceof ChoiceNode)) {\r
+ val augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName, targetType, augSchema);\r
val augType = augTypeBuilder.toInstance();\r
genTypes.add(augType);\r
} else {\r
- val refChoiceType = new ReferencedTypeImpl(targetPackageName,\r
- parseToClassName(targetSchemaNodeName));\r
val choiceTarget = targetSchemaNode as ChoiceNode;\r
val choiceCaseNodes = choiceTarget.cases;\r
- genTypes.addAll(generateTypesFromAugmentedChoiceCases(augmentPackageName, refChoiceType,\r
- choiceCaseNodes));\r
+ genTypes.addAll(\r
+ generateTypesFromAugmentedChoiceCases(augmentPackageName, targetType, choiceCaseNodes));\r
}\r
genTypes.addAll(augmentationBodyToGenTypes(augmentPackageName, augChildNodes));\r
}\r
+ \r
return genTypes;\r
}\r
\r
* and uses of augment\r
* @return generated type builder for augment\r
*/\r
- private def GeneratedTypeBuilder addRawAugmentGenTypeDefinition( String augmentPackageName,\r
- Type targetTypeRef, AugmentationSchema augSchema) {\r
+ private def GeneratedTypeBuilder addRawAugmentGenTypeDefinition(String augmentPackageName, Type targetTypeRef,\r
+ AugmentationSchema augSchema) {\r
var Map<String, GeneratedTypeBuilder> augmentBuilders = genTypeBuilders.get(augmentPackageName);\r
- if (augmentBuilders === null) {\r
+ if(augmentBuilders === null) {\r
augmentBuilders = new HashMap();\r
genTypeBuilders.put(augmentPackageName, augmentBuilders);\r
}\r
val augIdentifier = getAugmentIdentifier(augSchema.unknownSchemaNodes);\r
\r
- val augTypeName = if (augIdentifier !== null ) { \r
- parseToClassName(augIdentifier)\r
- } else {\r
- augGenTypeName(augmentBuilders, targetTypeRef.name);\r
- }\r
+ val augTypeName = if(augIdentifier !== null) {\r
+ parseToClassName(augIdentifier)\r
+ } else {\r
+ augGenTypeName(augmentBuilders, targetTypeRef.name);\r
+ }\r
val Set<DataSchemaNode> augChildNodes = augSchema.childNodes;\r
\r
val augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName);\r
/**\r
*\r
* @param unknownSchemaNodes\r
- * @return\r
+ * @return nodeParameter of UnknownSchemaNode\r
*/\r
private def String getAugmentIdentifier(List<UnknownSchemaNode> unknownSchemaNodes) {\r
for (unknownSchemaNode : unknownSchemaNodes) {\r
val nodeType = unknownSchemaNode.nodeType;\r
- if (AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName)\r
- && YANG_EXT_NAMESPACE.equals(nodeType.namespace.toString())) {\r
+ if(AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName) &&\r
+ YANG_EXT_NAMESPACE.equals(nodeType.namespace.toString())) {\r
return unknownSchemaNode.nodeParameter;\r
}\r
}\r
* @return list of <code>Type</code> which represents container, list and\r
* choice subnodes of augment\r
*/\r
- private def List<Type> augmentationBodyToGenTypes( String augBasePackageName,\r
- Set<DataSchemaNode> augChildNodes) {\r
+ private def List<Type> augmentationBodyToGenTypes(String augBasePackageName, Set<DataSchemaNode> augChildNodes) {\r
val List<Type> genTypes = new ArrayList();\r
val List<DataNodeIterator> augSchemaIts = new ArrayList();\r
for (childNode : augChildNodes) {\r
- if (childNode instanceof DataNodeContainer) {\r
+ if(childNode instanceof DataNodeContainer) {\r
augSchemaIts.add(new DataNodeIterator(childNode as DataNodeContainer));\r
\r
- if (childNode instanceof ContainerSchemaNode) {\r
+ if(childNode instanceof ContainerSchemaNode) {\r
genTypes.add(containerToGenType(augBasePackageName, childNode as ContainerSchemaNode));\r
- } else if (childNode instanceof ListSchemaNode) {\r
+ } else if(childNode instanceof ListSchemaNode) {\r
genTypes.addAll(listToGenType(augBasePackageName, childNode as ListSchemaNode));\r
}\r
- } else if (childNode instanceof ChoiceNode) {\r
+ } else if(childNode instanceof ChoiceNode) {\r
val choice = childNode as ChoiceNode;\r
for (caseNode : choice.cases) {\r
augSchemaIts.add(new DataNodeIterator(caseNode));\r
val List<ListSchemaNode> augLists = it.allLists();\r
val List<ChoiceNode> augChoices = it.allChoices();\r
\r
- if (augContainers !== null) {\r
+ if(augContainers !== null) {\r
for (container : augContainers) {\r
genTypes.add(containerToGenType(augBasePackageName, container));\r
}\r
}\r
- if (augLists !== null) {\r
+ if(augLists !== null) {\r
for (list : augLists) {\r
genTypes.addAll(listToGenType(augBasePackageName, list));\r
}\r
}\r
- if (augChoices !== null) {\r
+ if(augChoices !== null) {\r
for (choice : augChoices) {\r
genTypes.addAll(choiceToGeneratedType(augBasePackageName, choice));\r
}\r
* string with name of augmented node\r
* @return string with unique name for augmentation builder\r
*/\r
- private def String augGenTypeName( Map<String, GeneratedTypeBuilder> builders, String genTypeName) {\r
+ private def String augGenTypeName(Map<String, GeneratedTypeBuilder> builders, String genTypeName) {\r
var index = 1;\r
- while ((builders !== null) && builders.containsKey(genTypeName + index)) {\r
+ while((builders !== null) && builders.containsKey(genTypeName + index)) {\r
index = index + 1;\r
}\r
return genTypeName + index;\r
* schema paths\r
* @return generated type for <code>containerNode</code>\r
*/\r
- private def GeneratedType containerToGenType( String basePackageName, ContainerSchemaNode containerNode) {\r
- if (containerNode === null) {\r
+ private def GeneratedType containerToGenType(String basePackageName, ContainerSchemaNode containerNode) {\r
+ if(containerNode === null) {\r
return null;\r
}\r
\r
* parameter. The getter methods (representing child nodes) could be\r
* added to it.\r
*/\r
- private def GeneratedTypeBuilder resolveDataSchemaNodes( String basePackageName,\r
- GeneratedTypeBuilder typeBuilder, Set<DataSchemaNode> schemaNodes) {\r
- if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
+ private def GeneratedTypeBuilder resolveDataSchemaNodes(String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ Set<DataSchemaNode> schemaNodes) {\r
+ if((schemaNodes !== null) && (typeBuilder !== null)) {\r
for (schemaNode : schemaNodes) {\r
- if (!schemaNode.isAugmenting() && !schemaNode.isAddedByUses()) {\r
+ if(!schemaNode.isAugmenting() && !schemaNode.isAddedByUses()) {\r
addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
}\r
- \r
+\r
}\r
}\r
return typeBuilder;\r
}\r
+ \r
+ private def GeneratedTypeBuilder resolveDataSchemaNodesAugmented(String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ Set<DataSchemaNode> schemaNodes) {\r
+ if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
+ for (schemaNode : schemaNodes) {\r
+ if (!schemaNode.isAddedByUses()) {\r
+ addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
+ }\r
+ }\r
+ }\r
+ return typeBuilder;\r
+ }\r
\r
/**\r
* Adds the methods to <code>typeBuilder</code> what represents subnodes of\r
* parameter <code>typeBuilder</code>. The getter method could be\r
* added to it.\r
*/\r
- private def GeneratedTypeBuilder augSchemaNodeToMethods( String basePackageName,\r
- GeneratedTypeBuilder typeBuilder, Set<DataSchemaNode> schemaNodes) {\r
- if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
+ private def GeneratedTypeBuilder augSchemaNodeToMethods(String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ Set<DataSchemaNode> schemaNodes) {\r
+ if((schemaNodes !== null) && (typeBuilder !== null)) {\r
for (schemaNode : schemaNodes) {\r
- if (schemaNode.isAugmenting()) {\r
- addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
- }\r
- }\r
- }\r
- return typeBuilder;\r
- }\r
+ if (!schemaNode.isAugmenting()) {\r
+ addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
+ }\r
+ }\r
+ }\r
+ return typeBuilder;\r
+ }\r
\r
/**\r
* Adds to <code>typeBuilder</code> a method which is derived from\r
* generated type builder to which is <code>schemaNode</code>\r
* added as a method.\r
*/\r
- private def void addSchemaNodeToBuilderAsMethod( String basePackageName, DataSchemaNode node,\r
- GeneratedTypeBuilder typeBuilder) {\r
- if (node !== null && typeBuilder !== null) {\r
- switch(node) {\r
- case node instanceof LeafSchemaNode: resolveLeafSchemaNodeAsMethod(typeBuilder, node as LeafSchemaNode)\r
- case node instanceof LeafListSchemaNode: resolveLeafListSchemaNode(typeBuilder, node as LeafListSchemaNode)\r
- case node instanceof ContainerSchemaNode: resolveContainerSchemaNode(basePackageName, typeBuilder, node as ContainerSchemaNode)\r
- case node instanceof ListSchemaNode: resolveListSchemaNode(basePackageName, typeBuilder, node as ListSchemaNode)\r
- case node instanceof ChoiceNode: resolveChoiceSchemaNode(basePackageName, typeBuilder, node as ChoiceNode)\r
+ private def void addSchemaNodeToBuilderAsMethod(String basePackageName, DataSchemaNode node,\r
+ GeneratedTypeBuilder typeBuilder) {\r
+ if(node !== null && typeBuilder !== null) {\r
+ switch (node) {\r
+ case node instanceof LeafSchemaNode:\r
+ resolveLeafSchemaNodeAsMethod(typeBuilder, node as LeafSchemaNode)\r
+ case node instanceof LeafListSchemaNode:\r
+ resolveLeafListSchemaNode(typeBuilder, node as LeafListSchemaNode)\r
+ case node instanceof ContainerSchemaNode:\r
+ resolveContainerSchemaNode(basePackageName, typeBuilder, node as ContainerSchemaNode)\r
+ case node instanceof ListSchemaNode:\r
+ resolveListSchemaNode(basePackageName, typeBuilder, node as ListSchemaNode)\r
+ case node instanceof ChoiceNode:\r
+ resolveChoiceSchemaNode(basePackageName, typeBuilder, node as ChoiceNode)\r
}\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private def void resolveChoiceSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
- ChoiceNode choiceNode) {\r
- checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
- checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
- checkArgument(choiceNode !== null,"Choice Schema Node cannot be NULL.");\r
+ private def void resolveChoiceSchemaNode(String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ ChoiceNode choiceNode) {\r
+ checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");\r
+ checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");\r
+ checkArgument(choiceNode !== null, "Choice Schema Node cannot be NULL.");\r
\r
val choiceName = choiceNode.QName.localName;\r
- if (choiceName !== null && !choiceNode.isAddedByUses()) {\r
+ if(choiceName !== null && !choiceNode.isAddedByUses()) {\r
val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);\r
val choiceType = addDefaultInterfaceDefinition(packageName, choiceNode);\r
constructGetter(typeBuilder, choiceName, choiceNode.description, choiceType);\r
* </ul>\r
*\r
*/\r
- private def List<GeneratedType> choiceToGeneratedType( String basePackageName, ChoiceNode choiceNode) {\r
- checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
- checkArgument(choiceNode !== null,"Choice Schema Node cannot be NULL.");\r
+ private def List<GeneratedType> choiceToGeneratedType(String basePackageName, ChoiceNode choiceNode) {\r
+ checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");\r
+ checkArgument(choiceNode !== null, "Choice Schema Node cannot be NULL.");\r
\r
val List<GeneratedType> generatedTypes = new ArrayList();\r
val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);\r
val choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode);\r
+\r
//choiceTypeBuilder.addImplementsType(DATA_OBJECT);\r
val choiceType = choiceTypeBuilder.toInstance();\r
\r
generatedTypes.add(choiceType);\r
val Set<ChoiceCaseNode> caseNodes = choiceNode.cases;\r
- if ((caseNodes !== null) && !caseNodes.isEmpty()) {\r
+ if((caseNodes !== null) && !caseNodes.isEmpty()) {\r
generatedTypes.addAll(generateTypesFromChoiceCases(basePackageName, choiceType, caseNodes));\r
}\r
return generatedTypes;\r
* </ul>\r
* *\r
*/\r
- private def List<GeneratedType> generateTypesFromChoiceCases( String basePackageName, Type refChoiceType,\r
- Set<ChoiceCaseNode> caseNodes) {\r
- checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
- checkArgument(refChoiceType !== null,"Referenced Choice Type cannot be NULL.");\r
- checkArgument(caseNodes !== null,"Set of Choice Case Nodes cannot be NULL.");\r
+ private def List<GeneratedType> generateTypesFromChoiceCases(String basePackageName, Type refChoiceType,\r
+ Set<ChoiceCaseNode> caseNodes) {\r
+ checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");\r
+ checkArgument(refChoiceType !== null, "Referenced Choice Type cannot be NULL.");\r
+ checkArgument(caseNodes !== null, "Set of Choice Case Nodes cannot be NULL.");\r
\r
val List<GeneratedType> generatedTypes = new ArrayList();\r
for (caseNode : caseNodes) {\r
- if (caseNode !== null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {\r
+ if(caseNode !== null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {\r
val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);\r
val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
caseTypeBuilder.addImplementsType(refChoiceType);\r
\r
val Set<DataSchemaNode> childNodes = caseNode.childNodes;\r
- if (childNodes !== null) {\r
+ if(childNodes !== null) {\r
resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);\r
}\r
generatedTypes.add(caseTypeBuilder.toInstance());\r
* <li>if <code>caseNodes</code> equals null</li>\r
* </ul>\r
*/\r
- private def List<GeneratedType> generateTypesFromAugmentedChoiceCases( String basePackageName,\r
- Type refChoiceType, Set<ChoiceCaseNode> caseNodes) {\r
- checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
- checkArgument(refChoiceType !== null,"Referenced Choice Type cannot be NULL.");\r
- checkArgument(caseNodes !== null,"Set of Choice Case Nodes cannot be NULL.");\r
+ private def List<GeneratedType> generateTypesFromAugmentedChoiceCases(String basePackageName, Type refChoiceType,\r
+ Set<ChoiceCaseNode> caseNodes) {\r
+ checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");\r
+ checkArgument(refChoiceType !== null, "Referenced Choice Type cannot be NULL.");\r
+ checkArgument(caseNodes !== null, "Set of Choice Case Nodes cannot be NULL.");\r
\r
val List<GeneratedType> generatedTypes = new ArrayList();\r
for (caseNode : caseNodes) {\r
- if (caseNode !== null && caseNode.isAugmenting()) {\r
+ if(caseNode !== null && caseNode.isAugmenting()) {\r
val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);\r
val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
caseTypeBuilder.addImplementsType(refChoiceType);\r
\r
val Set<DataSchemaNode> childNodes = caseNode.childNodes;\r
- if (childNodes !== null) {\r
- resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);\r
+ if(childNodes !== null) {\r
+ resolveDataSchemaNodesAugmented(basePackageName, caseTypeBuilder, childNodes);\r
}\r
generatedTypes.add(caseTypeBuilder.toInstance());\r
}\r
* <li>true - in other cases</li>\r
* </ul>\r
*/\r
- private def boolean resolveLeafSchemaNodeAsMethod( GeneratedTypeBuilder typeBuilder, LeafSchemaNode leaf) {\r
- if ((leaf !== null) && (typeBuilder !== null)) {\r
+ private def boolean resolveLeafSchemaNodeAsMethod(GeneratedTypeBuilder typeBuilder, LeafSchemaNode leaf) {\r
+ if((leaf !== null) && (typeBuilder !== null)) {\r
val leafName = leaf.QName.localName;\r
var String leafDesc = leaf.description;\r
- if (leafDesc === null) {\r
+ if(leafDesc === null) {\r
leafDesc = "";\r
}\r
\r
val parentModule = findParentModule(schemaContext, leaf);\r
- if (leafName !== null && !leaf.isAddedByUses()) {\r
+ if(leafName !== null && !leaf.isAddedByUses()) {\r
val TypeDefinition<?> typeDef = leaf.type;\r
\r
var Type returnType = null;\r
- if (typeDef instanceof EnumTypeDefinition) {\r
+ if(typeDef instanceof EnumTypeDefinition) {\r
returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
- val enumTypeDef = enumTypeDefFromExtendedType(typeDef);\r
- val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName,\r
- typeBuilder);\r
+ val enumTypeDef = typeDef as EnumTypeDefinition;\r
+ val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName, typeBuilder);\r
\r
- if (enumBuilder !== null) {\r
+ if(enumBuilder !== null) {\r
returnType = new ReferencedTypeImpl(enumBuilder.packageName, enumBuilder.name);\r
}\r
(typeProvider as TypeProviderImpl).putReferencedType(leaf.path, returnType);\r
- } else if (typeDef instanceof UnionType) {\r
+ } else if(typeDef instanceof UnionType) {\r
val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
- if (genTOBuilder !== null) {\r
+ if(genTOBuilder !== null) {\r
returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);\r
}\r
- } else if (typeDef instanceof BitsTypeDefinition) {\r
+ } else if(typeDef instanceof BitsTypeDefinition) {\r
val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
- if (genTOBuilder !== null) {\r
+ if(genTOBuilder !== null) {\r
returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);\r
}\r
} else {\r
returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
}\r
- if (returnType !== null) {\r
+ if(returnType !== null) {\r
constructGetter(typeBuilder, leafName, leafDesc, returnType);\r
return true;\r
}\r
* <li>true - other cases</li>\r
* </ul>\r
*/\r
- private def boolean resolveLeafSchemaNodeAsProperty( GeneratedTOBuilder toBuilder, LeafSchemaNode leaf,\r
- boolean isReadOnly) {\r
- if ((leaf !== null) && (toBuilder !== null)) {\r
+ private def boolean resolveLeafSchemaNodeAsProperty(GeneratedTOBuilder toBuilder, LeafSchemaNode leaf,\r
+ boolean isReadOnly) {\r
+ if((leaf !== null) && (toBuilder !== null)) {\r
val leafName = leaf.QName.localName;\r
var String leafDesc = leaf.description;\r
- if (leafDesc === null) {\r
+ if(leafDesc === null) {\r
leafDesc = "";\r
}\r
\r
- if (leafName !== null && !leaf.isAddedByUses()) {\r
+ if(leafName !== null) {\r
val TypeDefinition<?> typeDef = leaf.type;\r
\r
// TODO: properly resolve enum types\r
val returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
\r
- if (returnType !== null) {\r
+ if(returnType !== null) {\r
val propBuilder = toBuilder.addProperty(parseToClassName(leafName));\r
\r
propBuilder.setReadOnly(isReadOnly);\r
* <li>false - other cases</li>\r
* </ul>\r
*/\r
- private def boolean resolveLeafListSchemaNode( GeneratedTypeBuilder typeBuilder, LeafListSchemaNode node) {\r
- if ((node !== null) && (typeBuilder !== null)) {\r
+ private def boolean resolveLeafListSchemaNode(GeneratedTypeBuilder typeBuilder, LeafListSchemaNode node) {\r
+ if((node !== null) && (typeBuilder !== null)) {\r
val nodeName = node.QName.localName;\r
var String nodeDesc = node.description;\r
- if (nodeDesc === null) {\r
+ if(nodeDesc === null) {\r
nodeDesc = "";\r
}\r
\r
- if (nodeName !== null && !node.isAddedByUses()) {\r
+ if(nodeName !== null && !node.isAddedByUses()) {\r
val TypeDefinition<?> type = node.type;\r
val listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type, node));\r
\r
* <li>true - other cases</li>\r
* </ul>\r
*/\r
- private def boolean resolveContainerSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
- ContainerSchemaNode containerNode) {\r
- if ((containerNode !== null) && (typeBuilder !== null)) {\r
+ private def boolean resolveContainerSchemaNode(String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ ContainerSchemaNode containerNode) {\r
+ if((containerNode !== null) && (typeBuilder !== null)) {\r
val nodeName = containerNode.QName.localName;\r
\r
- if (nodeName !== null && !containerNode.isAddedByUses()) {\r
+ if(nodeName !== null && !containerNode.isAddedByUses()) {\r
val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);\r
\r
val rawGenType = addDefaultInterfaceDefinition(packageName, containerNode);\r
* <li>true - other cases</li>\r
* </ul>\r
*/\r
- private def boolean resolveListSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
- ListSchemaNode listNode) {\r
- if ((listNode !== null) && (typeBuilder !== null)) {\r
+ private def boolean resolveListSchemaNode(String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ ListSchemaNode listNode) {\r
+ if((listNode !== null) && (typeBuilder !== null)) {\r
val listName = listNode.QName.localName;\r
\r
- if (listName !== null && !listNode.isAddedByUses()) {\r
+ if(listName !== null && !listNode.isAddedByUses()) {\r
val packageName = packageNameForGeneratedType(basePackageName, listNode.path);\r
val rawGenType = addDefaultInterfaceDefinition(packageName, listNode);\r
constructGetter(typeBuilder, listName, listNode.description, Types.listTypeFor(rawGenType));\r
* schema node for which is created generated type builder\r
* @return generated type builder <code>schemaNode</code>\r
*/\r
- private def GeneratedTypeBuilder addDefaultInterfaceDefinition( String packageName, SchemaNode schemaNode) {\r
+ private def GeneratedTypeBuilder addDefaultInterfaceDefinition(String packageName, SchemaNode schemaNode) {\r
val builder = addRawInterfaceDefinition(packageName, schemaNode, "");\r
builder.addImplementsType(DATA_OBJECT);\r
- if (!(schemaNode instanceof GroupingDefinition)) {\r
+ if(!(schemaNode instanceof GroupingDefinition)) {\r
builder.addImplementsType(augmentable(builder));\r
}\r
\r
- if (schemaNode instanceof DataNodeContainer) {\r
- addImplementedInterfaceFromUses( schemaNode as DataNodeContainer, builder);\r
+ if(schemaNode instanceof DataNodeContainer) {\r
+ addImplementedInterfaceFromUses(schemaNode as DataNodeContainer, builder);\r
}\r
\r
return builder;\r
* schema node which provide data about the schema node name\r
* @return generated type builder for <code>schemaNode</code>\r
*/\r
- private def GeneratedTypeBuilder addRawInterfaceDefinition( String packageName, SchemaNode schemaNode) {\r
+ private def GeneratedTypeBuilder addRawInterfaceDefinition(String packageName, SchemaNode schemaNode) {\r
return addRawInterfaceDefinition(packageName, schemaNode, "");\r
}\r
\r
* </ul>\r
*\r
*/\r
- private def GeneratedTypeBuilder addRawInterfaceDefinition( String packageName, SchemaNode schemaNode,\r
- String prefix) {\r
- checkArgument(schemaNode !== null,"Data Schema Node cannot be NULL.");\r
- checkArgument(packageName !== null,"Package Name for Generated Type cannot be NULL.");\r
- checkArgument(schemaNode.QName !== null,"QName for Data Schema Node cannot be NULL.");\r
+ private def GeneratedTypeBuilder addRawInterfaceDefinition(String packageName, SchemaNode schemaNode,\r
+ String prefix) {\r
+ checkArgument(schemaNode !== null, "Data Schema Node cannot be NULL.");\r
+ checkArgument(packageName !== null, "Package Name for Generated Type cannot be NULL.");\r
+ checkArgument(schemaNode.QName !== null, "QName for Data Schema Node cannot be NULL.");\r
val schemaNodeName = schemaNode.QName.localName;\r
- checkArgument(schemaNodeName !== null,"Local Name of QName for Data Schema Node cannot be NULL.");\r
+ checkArgument(schemaNodeName !== null, "Local Name of QName for Data Schema Node cannot be NULL.");\r
\r
var String genTypeName;\r
- if (prefix === null) {\r
+ if(prefix === null) {\r
genTypeName = parseToClassName(schemaNodeName);\r
} else {\r
genTypeName = prefix + parseToClassName(schemaNodeName);\r
}\r
+\r
//FIXME: Validation of name conflict\r
val newType = new GeneratedTypeBuilderImpl(packageName, genTypeName);\r
- yangToJavaMapping.put(schemaNode.path,newType);\r
- if (!genTypeBuilders.containsKey(packageName)) {\r
+ yangToJavaMapping.put(schemaNode.path, newType);\r
+ if(!genTypeBuilders.containsKey(packageName)) {\r
val Map<String, GeneratedTypeBuilder> builders = new HashMap();\r
builders.put(genTypeName, newType);\r
genTypeBuilders.put(packageName, builders);\r
} else {\r
val Map<String, GeneratedTypeBuilder> builders = genTypeBuilders.get(packageName);\r
- if (!builders.containsKey(genTypeName)) {\r
+ if(!builders.containsKey(genTypeName)) {\r
builders.put(genTypeName, newType);\r
}\r
}\r
* @return string with the name of the getter method for\r
* <code>methodName</code> in JAVA method format\r
*/\r
- private def String getterMethodName( String methodName,Type returnType) {\r
+ private def String getterMethodName(String methodName, Type returnType) {\r
val method = new StringBuilder();\r
if(BOOLEAN.equals(returnType)) {\r
method.append("is");\r
* @return method signature builder which represents the getter method of\r
* <code>interfaceBuilder</code>\r
*/\r
- private def MethodSignatureBuilder constructGetter( GeneratedTypeBuilder interfaceBuilder,\r
- String schemaNodeName, String comment, Type returnType) {\r
+ private def MethodSignatureBuilder constructGetter(GeneratedTypeBuilder interfaceBuilder, String schemaNodeName,\r
+ String comment, Type returnType) {\r
\r
- val getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName,returnType));\r
+ val getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName, returnType));\r
\r
getMethod.setComment(comment);\r
getMethod.setReturnType(returnType);\r
return getMethod;\r
}\r
\r
- private def listToGenType( String basePackageName, ListSchemaNode list) {\r
- checkArgument(basePackageName !== null,"Package Name for Generated Type cannot be NULL.");\r
- checkArgument(list !== null,"List Schema Node cannot be NULL.");\r
+ private def listToGenType(String basePackageName, ListSchemaNode list) {\r
+ checkArgument(basePackageName !== null, "Package Name for Generated Type cannot be NULL.");\r
+ checkArgument(list !== null, "List Schema Node cannot be NULL.");\r
\r
val packageName = packageNameForGeneratedType(basePackageName, list.path);\r
+\r
// val typeBuilder =\r
// resolveListTypeBuilder(packageName, list);\r
val typeBuilder = addDefaultInterfaceDefinition(packageName, list);\r
val List<String> listKeys = listKeys(list);\r
val genTOBuilder = resolveListKeyTOBuilder(packageName, list);\r
\r
- if (genTOBuilder !== null) {\r
+ if(genTOBuilder !== null) {\r
val identifierMarker = IDENTIFIER.parameterizedTypeFor(typeBuilder);\r
val identifiableMarker = IDENTIFIABLE.parameterizedTypeFor(genTOBuilder);\r
genTOBuilder.addImplementsType(identifierMarker);\r
val schemaNodes = list.childNodes;\r
\r
for (schemaNode : schemaNodes) {\r
- if (!schemaNode.isAugmenting()) {\r
+ if(!schemaNode.isAugmenting()) {\r
addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, genTOBuilder, listKeys);\r
}\r
}\r
* <li>if <code>typeBuilder</code> equals null</li>\r
* </ul>\r
*/\r
- private def void addSchemaNodeToListBuilders( String basePackageName, DataSchemaNode schemaNode,\r
- GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder, List<String> listKeys) {\r
- checkArgument(schemaNode !== null,"Data Schema Node cannot be NULL.");\r
+ private def void addSchemaNodeToListBuilders(String basePackageName, DataSchemaNode schemaNode,\r
+ GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder, List<String> listKeys) {\r
+ checkArgument(schemaNode !== null, "Data Schema Node cannot be NULL.");\r
\r
- checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
+ checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");\r
\r
- if (schemaNode instanceof LeafSchemaNode) {\r
+ if(schemaNode instanceof LeafSchemaNode) {\r
val leaf = schemaNode as LeafSchemaNode;\r
val leafName = leaf.QName.localName;\r
- if (!listKeys.contains(leafName)) {\r
+ if(!listKeys.contains(leafName)) {\r
resolveLeafSchemaNodeAsMethod(typeBuilder, leaf);\r
} else {\r
resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, true);\r
}\r
- } else if (schemaNode instanceof LeafListSchemaNode) {\r
- resolveLeafListSchemaNode(typeBuilder, schemaNode as LeafListSchemaNode);\r
- } else if (schemaNode instanceof ContainerSchemaNode) {\r
+ } else if(schemaNode instanceof LeafListSchemaNode) {\r
+ resolveLeafListSchemaNode(typeBuilder, schemaNode as LeafListSchemaNode);\r
+ } else if(schemaNode instanceof ContainerSchemaNode) {\r
resolveContainerSchemaNode(basePackageName, typeBuilder, schemaNode as ContainerSchemaNode);\r
- } else if (schemaNode instanceof ListSchemaNode) {\r
+ } else if(schemaNode instanceof ChoiceNode) {\r
+ resolveChoiceSchemaNode(basePackageName,typeBuilder,schemaNode as ChoiceNode);\r
+ } else if(schemaNode instanceof ListSchemaNode) {\r
resolveListSchemaNode(basePackageName, typeBuilder, schemaNode as ListSchemaNode);\r
}\r
}\r
\r
- private def typeBuildersToGenTypes( GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {\r
+ private def typeBuildersToGenTypes(GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {\r
val List<Type> genTypes = new ArrayList();\r
- checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
+ checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");\r
\r
- if (genTOBuilder !== null) {\r
+ if(genTOBuilder !== null) {\r
val genTO = genTOBuilder.toInstance();\r
constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", genTO);\r
genTypes.add(genTO);\r
* <code>list</code> contains no keys then the empty list is\r
* returned.\r
*/\r
- private def listKeys( ListSchemaNode list) {\r
+ private def listKeys(ListSchemaNode list) {\r
val List<String> listKeys = new ArrayList();\r
\r
- if (list.keyDefinition !== null) {\r
+ if(list.keyDefinition !== null) {\r
val keyDefinitions = list.keyDefinition;\r
for (keyDefinition : keyDefinitions) {\r
listKeys.add(keyDefinition.localName);\r
* <code>list</code> or null if <code>list</code> is null or list of\r
* key definitions is null or empty.\r
*/\r
- private def GeneratedTOBuilder resolveListKeyTOBuilder( String packageName, ListSchemaNode list) {\r
+ private def GeneratedTOBuilder resolveListKeyTOBuilder(String packageName, ListSchemaNode list) {\r
var GeneratedTOBuilder genTOBuilder = null;\r
- if ((list.keyDefinition !== null) && (!list.keyDefinition.isEmpty())) {\r
- if (list !== null) {\r
+ if((list.keyDefinition !== null) && (!list.keyDefinition.isEmpty())) {\r
+ if(list !== null) {\r
val listName = list.QName.localName + "Key";\r
- genTOBuilder = schemaNodeToTransferObjectBuilder(packageName, listName);\r
+ val String genTOName = parseToClassName(listName);\r
+ genTOBuilder = new GeneratedTOBuilderImpl(packageName, genTOName);\r
}\r
}\r
return genTOBuilder;\r
* @return generated TO builder for <code>typeDef</code>\r
*/\r
private def GeneratedTOBuilder addTOToTypeBuilder(TypeDefinition<?> typeDef, GeneratedTypeBuilder typeBuilder,\r
- String leafName, LeafSchemaNode leaf, Module parentModule) {\r
+ String leafName, LeafSchemaNode leaf, Module parentModule) {\r
val classNameFromLeaf = parseToClassName(leafName);\r
val List<GeneratedTOBuilder> genTOBuilders = new ArrayList();\r
val packageName = typeBuilder.fullyQualifiedName;\r
- if (typeDef instanceof UnionTypeDefinition) {\r
- genTOBuilders.addAll((typeProvider as TypeProviderImpl).provideGeneratedTOBuildersForUnionTypeDef(\r
- packageName, typeDef, classNameFromLeaf, leaf));\r
- } else if (typeDef instanceof BitsTypeDefinition) {\r
- genTOBuilders.add(((typeProvider as TypeProviderImpl) ).provideGeneratedTOBuilderForBitsTypeDefinition(\r
- packageName, typeDef, classNameFromLeaf));\r
+ if(typeDef instanceof UnionTypeDefinition) {\r
+ genTOBuilders.addAll(\r
+ (typeProvider as TypeProviderImpl).\r
+ provideGeneratedTOBuildersForUnionTypeDef(packageName, (typeDef as UnionTypeDefinition),\r
+ classNameFromLeaf, leaf));\r
+ } else if(typeDef instanceof BitsTypeDefinition) {\r
+ genTOBuilders.add(\r
+ ((typeProvider as TypeProviderImpl) ).\r
+ provideGeneratedTOBuilderForBitsTypeDefinition(packageName, typeDef, classNameFromLeaf));\r
}\r
- if (genTOBuilders !== null && !genTOBuilders.isEmpty()) {\r
+ if(genTOBuilders !== null && !genTOBuilders.isEmpty()) {\r
for (genTOBuilder : genTOBuilders) {\r
typeBuilder.addEnclosingTransferObject(genTOBuilder);\r
}\r
* <code>dataNodeContainer</code>\r
* @return generated type builder with all implemented types\r
*/\r
- private def addImplementedInterfaceFromUses( DataNodeContainer dataNodeContainer,\r
- GeneratedTypeBuilder builder) {\r
+ private def addImplementedInterfaceFromUses(DataNodeContainer dataNodeContainer, GeneratedTypeBuilder builder) {\r
for (usesNode : dataNodeContainer.uses) {\r
- if (usesNode.groupingPath !== null) {\r
+ if(usesNode.groupingPath !== null) {\r
val genType = allGroupings.get(usesNode.groupingPath);\r
- if (genType === null) {\r
- throw new IllegalStateException("Grouping " + usesNode.groupingPath + "is not resolved for "\r
- + builder.name);\r
+ if(genType === null) {\r
+ throw new IllegalStateException(\r
+ "Grouping " + usesNode.groupingPath + "is not resolved for " + builder.name);\r
}\r
builder.addImplementsType(genType);\r
}\r
Code Review / mdsal.git / blobdiff