X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fbinding-generator-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fgenerator%2Fimpl%2FBindingGeneratorImpl.java;h=ec57cb4a3ca73185fe428bd25ccae4b6e0d7d60f;hp=a903ef15811daeb7197c4ef7a80ca612c30520e4;hb=52df0e555243605003ee090150cf61b53c097563;hpb=b571c5f3e6e9b2dcf2cff2314537c7b1c61533b4 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java index a903ef1581..ec57cb4a3c 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java @@ -7,30 +7,65 @@ */ package org.opendaylight.controller.sal.binding.generator.impl; +import static org.opendaylight.controller.binding.generator.util.BindingGeneratorUtil.*; +import static org.opendaylight.controller.yang.model.util.SchemaContextUtil.findDataSchemaNode; +import static org.opendaylight.controller.yang.model.util.SchemaContextUtil.findParentModule; + +import java.util.concurrent.Future; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + 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.GeneratedTOBuilderImpl; import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; import org.opendaylight.controller.sal.binding.generator.spi.TypeProvider; import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; import org.opendaylight.controller.sal.binding.model.api.GeneratedType; import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.*; +import org.opendaylight.controller.sal.binding.model.api.type.builder.EnumBuilder; +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.sal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.controller.sal.binding.yang.types.TypeProviderImpl; +import org.opendaylight.controller.yang.binding.Notification; import org.opendaylight.controller.yang.common.QName; -import org.opendaylight.controller.yang.model.api.*; +import org.opendaylight.controller.yang.common.RpcResult; +import org.opendaylight.controller.yang.model.api.AugmentationSchema; +import org.opendaylight.controller.yang.model.api.ChoiceCaseNode; +import org.opendaylight.controller.yang.model.api.ChoiceNode; +import org.opendaylight.controller.yang.model.api.ContainerSchemaNode; +import org.opendaylight.controller.yang.model.api.DataNodeContainer; +import org.opendaylight.controller.yang.model.api.DataSchemaNode; +import org.opendaylight.controller.yang.model.api.GroupingDefinition; +import org.opendaylight.controller.yang.model.api.IdentitySchemaNode; +import org.opendaylight.controller.yang.model.api.LeafListSchemaNode; +import org.opendaylight.controller.yang.model.api.LeafSchemaNode; +import org.opendaylight.controller.yang.model.api.ListSchemaNode; +import org.opendaylight.controller.yang.model.api.Module; +import org.opendaylight.controller.yang.model.api.NotificationDefinition; +import org.opendaylight.controller.yang.model.api.RpcDefinition; +import org.opendaylight.controller.yang.model.api.SchemaContext; +import org.opendaylight.controller.yang.model.api.SchemaNode; +import org.opendaylight.controller.yang.model.api.SchemaPath; +import org.opendaylight.controller.yang.model.api.TypeDefinition; +import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition; 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.util.DataNodeIterator; import org.opendaylight.controller.yang.model.util.ExtendedType; +import org.opendaylight.controller.yang.model.util.SchemaContextUtil; +import org.opendaylight.controller.yang.model.util.UnionType; -import java.util.*; - -import static org.opendaylight.controller.binding.generator.util.BindingGeneratorUtil.*; -import static org.opendaylight.controller.yang.model.util.SchemaContextUtil.findDataSchemaNode; -import static org.opendaylight.controller.yang.model.util.SchemaContextUtil.findParentModule; - -public class BindingGeneratorImpl implements BindingGenerator { +public final class BindingGeneratorImpl implements BindingGenerator { private Map> genTypeBuilders; private TypeProvider typeProvider; @@ -43,69 +78,187 @@ public class BindingGeneratorImpl implements BindingGenerator { @Override public List generateTypes(final SchemaContext context) { if (context == null) { - throw new IllegalArgumentException("Schema Context reference cannot be NULL"); + throw new IllegalArgumentException("Schema Context reference cannot be NULL!"); } if (context.getModules() == null) { throw new IllegalStateException("Schema Context does not contain defined modules!"); } - final List genTypes = new ArrayList<>(); + final List generatedTypes = new ArrayList<>(); schemaContext = context; typeProvider = new TypeProviderImpl(context); final Set modules = context.getModules(); genTypeBuilders = new HashMap<>(); for (final Module module : modules) { - final DataNodeIterator moduleIterator = new DataNodeIterator( - module); - - final List sortedAugmentations = provideSortedAugmentations(module); - final List schemaContainers = moduleIterator - .allContainers(); - final List schemaLists = moduleIterator - .allLists(); - - final String basePackageName = moduleNamespaceToPackageName(module); - if ((schemaContainers != null) - && !schemaContainers.isEmpty()) { - for (final ContainerSchemaNode container : schemaContainers) { - genTypes.add(containerToGenType(basePackageName, - container)); - } - } - if ((schemaLists != null) && !schemaLists.isEmpty()) { - for (final ListSchemaNode list : schemaLists) { - genTypes.addAll(listToGenType(basePackageName, list)); - } + generatedTypes.add(moduleToDataType(module)); + generatedTypes.addAll(allTypeDefinitionsToGenTypes(module)); + generatedTypes.addAll(allContainersToGenTypes(module)); + generatedTypes.addAll(allListsToGenTypes(module)); + generatedTypes.addAll(allChoicesToGenTypes(module)); + generatedTypes.addAll(allAugmentsToGenTypes(module)); + generatedTypes.addAll(allRPCMethodsToGenType(module)); + generatedTypes.addAll(allNotificationsToGenType(module)); + generatedTypes.addAll(allIdentitiesToGenTypes(module, context)); + generatedTypes.addAll(allGroupingsToGenTypes(module)); + } + return generatedTypes; + } + + @Override + public List generateTypes(final SchemaContext context, final Set modules) { + if (context == null) { + throw new IllegalArgumentException("Schema Context reference cannot be NULL!"); + } + if (context.getModules() == null) { + throw new IllegalStateException("Schema Context does not contain defined modules!"); + } + if (modules == null) { + throw new IllegalArgumentException("Sef of Modules cannot be NULL!"); + } + + final List filteredGenTypes = new ArrayList<>(); + schemaContext = context; + typeProvider = new TypeProviderImpl(context); + final Set contextModules = context.getModules(); + genTypeBuilders = new HashMap<>(); + for (final Module contextModule : contextModules) { + final List generatedTypes = new ArrayList<>(); + + generatedTypes.add(moduleToDataType(contextModule)); + generatedTypes.addAll(allTypeDefinitionsToGenTypes(contextModule)); + generatedTypes.addAll(allContainersToGenTypes(contextModule)); + generatedTypes.addAll(allListsToGenTypes(contextModule)); + generatedTypes.addAll(allChoicesToGenTypes(contextModule)); + generatedTypes.addAll(allAugmentsToGenTypes(contextModule)); + generatedTypes.addAll(allRPCMethodsToGenType(contextModule)); + generatedTypes.addAll(allNotificationsToGenType(contextModule)); + generatedTypes.addAll(allIdentitiesToGenTypes(contextModule, context)); + generatedTypes.addAll(allGroupingsToGenTypes(contextModule)); + + if (modules.contains(contextModule)) { + filteredGenTypes.addAll(generatedTypes); } + } + return filteredGenTypes; + } + + private List allTypeDefinitionsToGenTypes(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + if (module.getTypeDefinitions() == null) { + throw new IllegalArgumentException("Type Definitions for module " + module.getName() + " cannot be NULL!"); + } - if ((sortedAugmentations != null) - && !sortedAugmentations.isEmpty()) { - for (final AugmentationSchema augment : sortedAugmentations) { - genTypes.addAll(augmentationToGenTypes(basePackageName, augment)); + final Set> typeDefinitions = module.getTypeDefinitions(); + final List generatedTypes = new ArrayList<>(); + for (final TypeDefinition typedef : typeDefinitions) { + if (typedef != null) { + final Type type = ((TypeProviderImpl) typeProvider).generatedTypeForExtendedDefinitionType(typedef); + if ((type != null) && !generatedTypes.contains(type)) { + generatedTypes.add(type); } } + } + return generatedTypes; + } - final GeneratedType genDataType = moduleToDataType(basePackageName, module); - final List genRpcType = rpcMethodsToGenType(basePackageName, module); - final List genNotifyType = notifycationsToGenType(basePackageName, module); + private List allContainersToGenTypes(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } - if (genDataType != null) { - genTypes.add(genDataType); - } - if (genRpcType != null) { - genTypes.addAll(genRpcType); + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + + if (module.getChildNodes() == null) { + throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.getName() + + " cannot be NULL!"); + } + + final List generatedTypes = new ArrayList<>(); + final DataNodeIterator it = new DataNodeIterator(module); + final List schemaContainers = it.allContainers(); + final String basePackageName = moduleNamespaceToPackageName(module); + for (final ContainerSchemaNode container : schemaContainers) { + generatedTypes.add(containerToGenType(basePackageName, container)); + } + return generatedTypes; + } + + private List allListsToGenTypes(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } + + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + + if (module.getChildNodes() == null) { + throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.getName() + + " cannot be NULL!"); + } + + final List generatedTypes = new ArrayList<>(); + final DataNodeIterator it = new DataNodeIterator(module); + final List schemaLists = it.allLists(); + final String basePackageName = moduleNamespaceToPackageName(module); + if (schemaLists != null) { + for (final ListSchemaNode list : schemaLists) { + generatedTypes.addAll(listToGenType(basePackageName, list)); } - if (genNotifyType != null) { - genTypes.addAll(genNotifyType); + } + return generatedTypes; + } + + private List allChoicesToGenTypes(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + + final DataNodeIterator it = new DataNodeIterator(module); + final List choiceNodes = it.allChoices(); + final String basePackageName = moduleNamespaceToPackageName(module); + + final List generatedTypes = new ArrayList<>(); + for (final ChoiceNode choice : choiceNodes) { + if (choice != null) { + generatedTypes.addAll(choiceToGeneratedType(basePackageName, choice)); } } - genTypes.addAll(((TypeProviderImpl) typeProvider) - .getGeneratedTypeDefs()); + return generatedTypes; + } - return genTypes; + private List allAugmentsToGenTypes(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + if (module.getChildNodes() == null) { + throw new IllegalArgumentException("Reference to Set of Augmentation Definitions in module " + + module.getName() + " cannot be NULL!"); + } + + final List generatedTypes = new ArrayList<>(); + final String basePackageName = moduleNamespaceToPackageName(module); + final List augmentations = resolveAugmentations(module); + for (final AugmentationSchema augment : augmentations) { + generatedTypes.addAll(augmentationToGenTypes(basePackageName, augment)); + } + return generatedTypes; } - private List provideSortedAugmentations(final Module module) { + private List resolveAugmentations(final Module module) { if (module == null) { throw new IllegalArgumentException("Module reference cannot be NULL!"); } @@ -113,43 +266,34 @@ public class BindingGeneratorImpl implements BindingGenerator { throw new IllegalStateException("Augmentations Set cannot be NULL!"); } - final Set augmentations = module - .getAugmentations(); - final List sortedAugmentations = new ArrayList<>( - augmentations); - Collections.sort(sortedAugmentations, - new Comparator() { - - @Override - public int compare( - AugmentationSchema augSchema1, - AugmentationSchema augSchema2) { - - if (augSchema1.getTargetPath().getPath() - .size() > augSchema2 - .getTargetPath().getPath().size()) { - return 1; - } else if (augSchema1.getTargetPath() - .getPath().size() < augSchema2 - .getTargetPath().getPath().size()) { - return -1; - } - return 0; + final Set augmentations = module.getAugmentations(); + final List sortedAugmentations = new ArrayList<>(augmentations); + Collections.sort(sortedAugmentations, new Comparator() { - } - }); + @Override + public int compare(AugmentationSchema augSchema1, AugmentationSchema augSchema2) { + + if (augSchema1.getTargetPath().getPath().size() > augSchema2.getTargetPath().getPath().size()) { + return 1; + } else if (augSchema1.getTargetPath().getPath().size() < augSchema2.getTargetPath().getPath().size()) { + return -1; + } + return 0; + + } + }); return sortedAugmentations; } - private GeneratedType moduleToDataType(final String basePackageName, final Module module) { + private GeneratedType moduleToDataType(final Module module) { if (module == null) { throw new IllegalArgumentException("Module reference cannot be NULL!"); } - final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder( - module, "Data"); + final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder(module, "Data"); + final String basePackageName = moduleNamespaceToPackageName(module); if (moduleDataTypeBuilder != null) { final Set dataNodes = module.getChildNodes(); resolveDataSchemaNodes(basePackageName, moduleDataTypeBuilder, dataNodes); @@ -157,21 +301,187 @@ public class BindingGeneratorImpl implements BindingGenerator { return moduleDataTypeBuilder.toInstance(); } - private boolean isDerivedFromEnumerationType( - final TypeDefinition typeDefinition) { - if (typeDefinition != null) { - if (typeDefinition.getBaseType() instanceof EnumTypeDefinition) { - return true; - } else if (typeDefinition.getBaseType() instanceof ExtendedType) { - return isDerivedFromEnumerationType(typeDefinition - .getBaseType()); + private List allRPCMethodsToGenType(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } + + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + + if (module.getChildNodes() == null) { + throw new IllegalArgumentException("Reference to Set of RPC Method Definitions in module " + + module.getName() + " cannot be NULL!"); + } + + final String basePackageName = moduleNamespaceToPackageName(module); + final Set rpcDefinitions = module.getRpcs(); + final List genRPCTypes = new ArrayList<>(); + final GeneratedTypeBuilder interfaceBuilder = moduleTypeBuilder(module, "Service"); + final Type future = Types.typeForClass(Future.class); + for (final RpcDefinition rpc : rpcDefinitions) { + if (rpc != null) { + + String rpcName = parseToClassName(rpc.getQName().getLocalName()); + String rpcMethodName = parseToValidParamName(rpcName); + MethodSignatureBuilder method = interfaceBuilder.addMethod(rpcMethodName); + + final List rpcInOut = new ArrayList<>(); + + ContainerSchemaNode input = rpc.getInput(); + ContainerSchemaNode output = rpc.getOutput(); + + if (input != null) { + rpcInOut.add(new DataNodeIterator(input)); + GeneratedTypeBuilder inType = addRawInterfaceDefinition(basePackageName, input, rpcName); + resolveDataSchemaNodes(basePackageName, inType, input.getChildNodes()); + Type inTypeInstance = inType.toInstance(); + genRPCTypes.add(inTypeInstance); + method.addParameter(inTypeInstance, "input"); + } + + Type outTypeInstance = Types.typeForClass(Void.class); + if (output != null) { + rpcInOut.add(new DataNodeIterator(output)); + + GeneratedTypeBuilder outType = addRawInterfaceDefinition(basePackageName, output, rpcName); + resolveDataSchemaNodes(basePackageName, outType, output.getChildNodes()); + outTypeInstance = outType.toInstance(); + genRPCTypes.add(outTypeInstance); + + } + + final Type rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult.class), outTypeInstance); + method.setReturnType(Types.parameterizedTypeFor(future, rpcRes)); + for (DataNodeIterator it : rpcInOut) { + List nContainers = it.allContainers(); + if ((nContainers != null) && !nContainers.isEmpty()) { + for (final ContainerSchemaNode container : nContainers) { + genRPCTypes.add(containerToGenType(basePackageName, container)); + } + } + List nLists = it.allLists(); + if ((nLists != null) && !nLists.isEmpty()) { + for (final ListSchemaNode list : nLists) { + genRPCTypes.addAll(listToGenType(basePackageName, list)); + } + } + } } } - return false; + genRPCTypes.add(interfaceBuilder.toInstance()); + return genRPCTypes; + } + + private List allNotificationsToGenType(final Module module) { + if (module == null) { + throw new IllegalArgumentException("Module reference cannot be NULL!"); + } + + if (module.getName() == null) { + throw new IllegalArgumentException("Module name cannot be NULL!"); + } + + if (module.getChildNodes() == null) { + throw new IllegalArgumentException("Reference to Set of Notification Definitions in module " + + module.getName() + " cannot be NULL!"); + } + + final String basePackageName = moduleNamespaceToPackageName(module); + final List genNotifyTypes = new ArrayList<>(); + final Set notifications = module.getNotifications(); + + for (final NotificationDefinition notification : notifications) { + if (notification != null) { + DataNodeIterator it = new DataNodeIterator(notification); + + // Containers + for (ContainerSchemaNode node : it.allContainers()) { + genNotifyTypes.add(containerToGenType(basePackageName, node)); + } + // Lists + for (ListSchemaNode node : it.allLists()) { + genNotifyTypes.addAll(listToGenType(basePackageName, node)); + } + final GeneratedTypeBuilder notificationTypeBuilder = addDefaultInterfaceDefinition(basePackageName, + notification); + notificationTypeBuilder.addImplementsType(Types.typeForClass(Notification.class)); + // Notification object + resolveDataSchemaNodes(basePackageName, notificationTypeBuilder, notification.getChildNodes()); + genNotifyTypes.add(notificationTypeBuilder.toInstance()); + } + } + return genNotifyTypes; + } + + private List allIdentitiesToGenTypes(final Module module, final SchemaContext context) { + List genTypes = new ArrayList<>(); + + final Set schemaIdentities = module.getIdentities(); + + final String basePackageName = moduleNamespaceToPackageName(module); + + if (schemaIdentities != null && !schemaIdentities.isEmpty()) { + for (final IdentitySchemaNode identity : schemaIdentities) { + genTypes.add(identityToGenType(basePackageName, identity, context)); + } + } + return genTypes; + } + + private GeneratedType identityToGenType(final String basePackageName, final IdentitySchemaNode identity, + final SchemaContext context) { + if (identity == null) { + return null; + } + + final String packageName = packageNameForGeneratedType(basePackageName, identity.getPath()); + final String genTypeName = parseToClassName(identity.getQName().getLocalName()); + final GeneratedTOBuilderImpl newType = new GeneratedTOBuilderImpl(packageName, genTypeName); + + IdentitySchemaNode baseIdentity = identity.getBaseIdentity(); + if (baseIdentity != null) { + Module baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity); + + final String returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule); + final String returnTypeName = parseToClassName(baseIdentity.getQName().getLocalName()); + + GeneratedTransferObject gto = new GeneratedTOBuilderImpl(returnTypePkgName, returnTypeName).toInstance(); + newType.setExtendsType(gto); + } else { + newType.setExtendsType(Types.getBaseIdentityTO()); + } + newType.setAbstract(true); + return newType.toInstance(); + } + + private List allGroupingsToGenTypes(final Module module) { + final List genTypes = new ArrayList<>(); + final String basePackageName = moduleNamespaceToPackageName(module); + final Set groupings = module.getGroupings(); + if (groupings != null && !groupings.isEmpty()) { + for (final GroupingDefinition grouping : groupings) { + genTypes.add(groupingToGenType(basePackageName, grouping)); + } + } + return genTypes; } - private EnumTypeDefinition enumTypeDefFromExtendedType( - final TypeDefinition typeDefinition) { + private GeneratedType groupingToGenType(final String basePackageName, GroupingDefinition grouping) { + if (grouping == null) { + return null; + } + + final String packageName = packageNameForGeneratedType(basePackageName, grouping.getPath()); + final Set schemaNodes = grouping.getChildNodes(); + final GeneratedTypeBuilder typeBuilder = addDefaultInterfaceDefinition(packageName, grouping); + + resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes); + return typeBuilder.toInstance(); + } + + private EnumTypeDefinition enumTypeDefFromExtendedType(final TypeDefinition typeDefinition) { if (typeDefinition != null) { if (typeDefinition.getBaseType() instanceof EnumTypeDefinition) { return (EnumTypeDefinition) typeDefinition.getBaseType(); @@ -182,16 +492,13 @@ public class BindingGeneratorImpl implements BindingGenerator { return null; } - private EnumBuilder resolveEnumFromTypeDefinition( - final EnumTypeDefinition enumTypeDef, final String enumName, + private EnumBuilder resolveInnerEnumFromTypeDefinition(final EnumTypeDefinition enumTypeDef, final String enumName, final GeneratedTypeBuilder typeBuilder) { - if ((enumTypeDef != null) && (typeBuilder != null) - && (enumTypeDef.getQName() != null) + if ((enumTypeDef != null) && (typeBuilder != null) && (enumTypeDef.getQName() != null) && (enumTypeDef.getQName().getLocalName() != null)) { final String enumerationName = parseToClassName(enumName); - final EnumBuilder enumBuilder = typeBuilder - .addEnumeration(enumerationName); + final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumerationName); if (enumBuilder != null) { final List enums = enumTypeDef.getValues(); @@ -199,8 +506,7 @@ public class BindingGeneratorImpl implements BindingGenerator { 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) { @@ -217,100 +523,26 @@ public class BindingGeneratorImpl implements BindingGenerator { return null; } - private GeneratedTypeBuilder moduleTypeBuilder(final Module module, - final String postfix) { + private GeneratedTypeBuilder moduleTypeBuilder(final Module module, final String postfix) { if (module == null) { throw new IllegalArgumentException("Module reference cannot be NULL!"); } String packageName = moduleNamespaceToPackageName(module); - final String moduleName = parseToClassName(module.getName()) - + postfix; + final String moduleName = parseToClassName(module.getName()) + postfix; return new GeneratedTypeBuilderImpl(packageName, moduleName); } - private List rpcMethodsToGenType(final String basePackageName, final Module module) { - if (module == null) { - throw new IllegalArgumentException("Module reference cannot be NULL!"); - } - - final Set rpcDefinitions = module.getRpcs(); - final List rpcTypes = new ArrayList<>(); - - if ((rpcDefinitions != null) && !rpcDefinitions.isEmpty()) { - for (final RpcDefinition rpc : rpcDefinitions) { - if (rpc != null) { - final List rpcInOut = new ArrayList<>(); - rpcInOut.add(new DataNodeIterator(rpc.getInput())); - rpcInOut.add(new DataNodeIterator(rpc.getOutput())); - - for (DataNodeIterator it : rpcInOut) { - List nContainers = it.allContainers(); - if ((nContainers != null) && !nContainers.isEmpty()) { - for (final ContainerSchemaNode container : nContainers) { - rpcTypes.add(containerToGenType(basePackageName, container)); - } - } - } - } - } - } - return rpcTypes; - } - - private List notifycationsToGenType(final String basePackageName, final Module module) { - if (module == null) { - throw new IllegalArgumentException("Module reference cannot be NULL!"); - } - final List notificationTypes = new ArrayList<>(); - final Set notifications = module - .getNotifications(); - - if ((notifications != null) && !notifications.isEmpty()) { - for (final NotificationDefinition notification : notifications) { - if (notification != null) { - final List notifyChildren = new ArrayList<>(); - - for (DataSchemaNode childNode : notification.getChildNodes()) { - if (childNode instanceof DataNodeContainer) { - notifyChildren.add(new DataNodeIterator((DataNodeContainer) childNode)); - } - } - - for (DataNodeIterator it : notifyChildren) { - List nContainers = it.allContainers(); - List nLists = it.allLists(); - if ((nContainers != null) && !nContainers.isEmpty()) { - for (final ContainerSchemaNode container : nContainers) { - notificationTypes.add(containerToGenType(basePackageName, container)); - } - } - if ((nLists != null) && !nLists.isEmpty()) { - for (final ListSchemaNode list : nLists) { - - notificationTypes.addAll(listToGenType(basePackageName, list)); - } - } - } - } - } - } - return notificationTypes; - } - - private List augmentationToGenTypes(final String augmentPackageName, - final AugmentationSchema augSchema) { + private List augmentationToGenTypes(final String augmentPackageName, final AugmentationSchema augSchema) { if (augmentPackageName == null) { throw new IllegalArgumentException("Package Name cannot be NULL!"); } if (augSchema == null) { - throw new IllegalArgumentException( - "Augmentation Schema cannot be NULL!"); + throw new IllegalArgumentException("Augmentation Schema cannot be NULL!"); } if (augSchema.getTargetPath() == null) { - throw new IllegalStateException( - "Augmentation Schema does not contain Target Path (Target Path is NULL)."); + throw new IllegalStateException("Augmentation Schema does not contain Target Path (Target Path is NULL)."); } final List genTypes = new ArrayList<>(); @@ -318,40 +550,49 @@ public class BindingGeneratorImpl implements BindingGenerator { // EVERY augmented interface will extends Augmentation interface // and DataObject interface!!! final SchemaPath targetPath = augSchema.getTargetPath(); - final DataSchemaNode targetSchemaNode = findDataSchemaNode(schemaContext, - targetPath); - if ((targetSchemaNode != null) && - (targetSchemaNode.getQName() != null) && - (targetSchemaNode.getQName().getLocalName() != null)) { - final Module targetModule = findParentModule(schemaContext, - targetSchemaNode); - + final DataSchemaNode targetSchemaNode = findDataSchemaNode(schemaContext, targetPath); + if ((targetSchemaNode != null) && (targetSchemaNode.getQName() != null) + && (targetSchemaNode.getQName().getLocalName() != null)) { + final Module targetModule = findParentModule(schemaContext, targetSchemaNode); final String targetBasePackage = moduleNamespaceToPackageName(targetModule); - final String targetPackageName = packageNameForGeneratedType(targetBasePackage, - targetSchemaNode.getPath()); - + final String targetPackageName = packageNameForGeneratedType(targetBasePackage, targetSchemaNode.getPath()); final String targetSchemaNodeName = targetSchemaNode.getQName().getLocalName(); - final Set augChildNodes = augSchema - .getChildNodes(); - final GeneratedTypeBuilder augTypeBuilder = addRawAugmentGenTypeDefinition( - augmentPackageName, targetPackageName, targetSchemaNodeName, augSchema); - if (augTypeBuilder != null) { - genTypes.add(augTypeBuilder.toInstance()); + final Set augChildNodes = augSchema.getChildNodes(); + + if (!(targetSchemaNode instanceof ChoiceNode)) { + final GeneratedTypeBuilder augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName, + targetPackageName, targetSchemaNodeName, augSchema); + final GeneratedType augType = augTypeBuilder.toInstance(); + genTypes.add(augType); + } else { + final Type refChoiceType = new ReferencedTypeImpl(targetPackageName, + parseToClassName(targetSchemaNodeName)); + final ChoiceNode choiceTarget = (ChoiceNode) targetSchemaNode; + final Set choiceCaseNodes = choiceTarget.getCases(); + genTypes.addAll(augmentCasesToGenTypes(augmentPackageName, refChoiceType, choiceCaseNodes)); } - genTypes.addAll(augmentationBodyToGenTypes(augmentPackageName, - augChildNodes)); + genTypes.addAll(augmentationBodyToGenTypes(augmentPackageName, augChildNodes)); + } + return genTypes; + } + private List augmentCasesToGenTypes(final String augmentPackageName, final Type refChoiceType, + final Set choiceCaseNodes) { + if (augmentPackageName == null) { + throw new IllegalArgumentException("Augment Package Name string cannot be NULL!"); + } + if (choiceCaseNodes == null) { + throw new IllegalArgumentException("Set of Choice Case Nodes cannot be NULL!"); } + final List genTypes = generateTypesFromAugmentedChoiceCases(augmentPackageName, refChoiceType, + choiceCaseNodes); return genTypes; } - private GeneratedTypeBuilder addRawAugmentGenTypeDefinition( - final String augmentPackageName, final String targetPackageName, - final String targetSchemaNodeName, - final AugmentationSchema augSchema) { + private GeneratedTypeBuilder addRawAugmentGenTypeDefinition(final String augmentPackageName, + final String targetPackageName, final String targetSchemaNodeName, final AugmentationSchema augSchema) { final String targetTypeName = parseToClassName(targetSchemaNodeName); - Map augmentBuilders = genTypeBuilders - .get(augmentPackageName); + Map augmentBuilders = genTypeBuilders.get(augmentPackageName); if (augmentBuilders == null) { augmentBuilders = new HashMap<>(); genTypeBuilders.put(augmentPackageName, augmentBuilders); @@ -359,15 +600,12 @@ public class BindingGeneratorImpl implements BindingGenerator { final String augTypeName = augGenTypeName(augmentBuilders, targetTypeName); final Type targetTypeRef = new ReferencedTypeImpl(targetPackageName, targetTypeName); - final Set augChildNodes = augSchema - .getChildNodes(); + final Set augChildNodes = augSchema.getChildNodes(); - final GeneratedTypeBuilder augTypeBuilder = new GeneratedTypeBuilderImpl( - augmentPackageName, augTypeName); + final GeneratedTypeBuilder augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName); augTypeBuilder.addImplementsType(Types.DATA_OBJECT); - augTypeBuilder.addImplementsType(Types - .augmentationTypeFor(targetTypeRef)); + augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef)); augSchemaNodeToMethods(augmentPackageName, augTypeBuilder, augChildNodes); augmentBuilders.put(augTypeName, augTypeBuilder); @@ -375,47 +613,52 @@ public class BindingGeneratorImpl implements BindingGenerator { } private List augmentationBodyToGenTypes(final String augBasePackageName, - final Set augChildNodes) { + final Set augChildNodes) { final List genTypes = new ArrayList<>(); final List augSchemaIts = new ArrayList<>(); for (final DataSchemaNode childNode : augChildNodes) { if (childNode instanceof DataNodeContainer) { - augSchemaIts.add(new DataNodeIterator( - (DataNodeContainer) childNode)); + augSchemaIts.add(new DataNodeIterator((DataNodeContainer) childNode)); if (childNode instanceof ContainerSchemaNode) { - genTypes.add(containerToGenType(augBasePackageName, - (ContainerSchemaNode) childNode)); + genTypes.add(containerToGenType(augBasePackageName, (ContainerSchemaNode) childNode)); } else if (childNode instanceof ListSchemaNode) { - genTypes.addAll(listToGenType(augBasePackageName, - (ListSchemaNode) childNode)); + genTypes.addAll(listToGenType(augBasePackageName, (ListSchemaNode) childNode)); } + } else if (childNode instanceof ChoiceNode) { + final ChoiceNode choice = (ChoiceNode) childNode; + for (final ChoiceCaseNode caseNode : choice.getCases()) { + augSchemaIts.add(new DataNodeIterator(caseNode)); + } + genTypes.addAll(choiceToGeneratedType(augBasePackageName, (ChoiceNode) childNode)); } } for (final DataNodeIterator it : augSchemaIts) { final List augContainers = it.allContainers(); final List augLists = it.allLists(); + final List augChoices = it.allChoices(); - if ((augContainers != null) && !augContainers.isEmpty()) { + if (augContainers != null) { for (final ContainerSchemaNode container : augContainers) { genTypes.add(containerToGenType(augBasePackageName, container)); } } - if ((augLists != null) && !augLists.isEmpty()) { + if (augLists != null) { for (final ListSchemaNode list : augLists) { -// final String listPackageName = packageNameForAugmentedType( -// augBasePackageName, list.getPath()); genTypes.addAll(listToGenType(augBasePackageName, list)); } } + if (augChoices != null) { + for (final ChoiceNode choice : augChoices) { + genTypes.addAll(choiceToGeneratedType(augBasePackageName, choice)); + } + } } return genTypes; } - private String augGenTypeName( - final Map builders, - final String genTypeName) { + private String augGenTypeName(final Map builders, final String genTypeName) { String augTypeName = genTypeName; int index = 1; @@ -426,27 +669,21 @@ public class BindingGeneratorImpl implements BindingGenerator { return augTypeName; } - private GeneratedType containerToGenType(final String basePackageName, - ContainerSchemaNode containerNode) { + private GeneratedType containerToGenType(final String basePackageName, ContainerSchemaNode containerNode) { if (containerNode == null) { return null; } - final String packageName = packageNameForGeneratedType( - basePackageName, containerNode.getPath()); + final String packageName = packageNameForGeneratedType(basePackageName, containerNode.getPath()); final Set schemaNodes = containerNode.getChildNodes(); - final GeneratedTypeBuilder typeBuilder = addRawInterfaceDefinition( - packageName, containerNode); + final GeneratedTypeBuilder typeBuilder = addDefaultInterfaceDefinition(packageName, containerNode); resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes); return typeBuilder.toInstance(); } - private GeneratedTypeBuilder resolveDataSchemaNodes( - final String basePackageName, - final GeneratedTypeBuilder typeBuilder, - final Set schemaNodes) { - + private GeneratedTypeBuilder resolveDataSchemaNodes(final String basePackageName, + final GeneratedTypeBuilder typeBuilder, final Set schemaNodes) { if ((schemaNodes != null) && (typeBuilder != null)) { for (final DataSchemaNode schemaNode : schemaNodes) { if (schemaNode.isAugmenting()) { @@ -458,11 +695,8 @@ public class BindingGeneratorImpl implements BindingGenerator { return typeBuilder; } - private GeneratedTypeBuilder augSchemaNodeToMethods( - final String basePackageName, - final GeneratedTypeBuilder typeBuilder, - final Set schemaNodes) { - + private GeneratedTypeBuilder augSchemaNodeToMethods(final String basePackageName, + final GeneratedTypeBuilder typeBuilder, final Set schemaNodes) { if ((schemaNodes != null) && (typeBuilder != null)) { for (final DataSchemaNode schemaNode : schemaNodes) { if (schemaNode.isAugmenting()) { @@ -473,29 +707,126 @@ public class BindingGeneratorImpl implements BindingGenerator { return typeBuilder; } - private void addSchemaNodeToBuilderAsMethod( - final String basePackageName, - final DataSchemaNode schemaNode, + private void addSchemaNodeToBuilderAsMethod(final String basePackageName, final DataSchemaNode schemaNode, final GeneratedTypeBuilder typeBuilder) { if (schemaNode != null && typeBuilder != null) { if (schemaNode instanceof LeafSchemaNode) { - resolveLeafSchemaNodeAsMethod(typeBuilder, - (LeafSchemaNode) schemaNode); + resolveLeafSchemaNodeAsMethod(typeBuilder, (LeafSchemaNode) schemaNode); } else if (schemaNode instanceof LeafListSchemaNode) { - resolveLeafListSchemaNode(typeBuilder, - (LeafListSchemaNode) schemaNode); + resolveLeafListSchemaNode(typeBuilder, (LeafListSchemaNode) schemaNode); } else if (schemaNode instanceof ContainerSchemaNode) { - resolveContainerSchemaNode(basePackageName, typeBuilder, - (ContainerSchemaNode) schemaNode); + resolveContainerSchemaNode(basePackageName, typeBuilder, (ContainerSchemaNode) schemaNode); } else if (schemaNode instanceof ListSchemaNode) { - resolveListSchemaNode(basePackageName, typeBuilder, - (ListSchemaNode) schemaNode); + resolveListSchemaNode(basePackageName, typeBuilder, (ListSchemaNode) schemaNode); + } else if (schemaNode instanceof ChoiceNode) { + resolveChoiceSchemaNode(basePackageName, typeBuilder, (ChoiceNode) schemaNode); } } } - private boolean resolveLeafSchemaNodeAsMethod( - final GeneratedTypeBuilder typeBuilder, final LeafSchemaNode leaf) { + private void resolveChoiceSchemaNode(final String basePackageName, final GeneratedTypeBuilder typeBuilder, + final ChoiceNode choiceNode) { + if (basePackageName == null) { + throw new IllegalArgumentException("Base Package Name cannot be NULL!"); + } + if (typeBuilder == null) { + throw new IllegalArgumentException("Generated Type Builder cannot be NULL!"); + } + if (choiceNode == null) { + throw new IllegalArgumentException("Choice Schema Node cannot be NULL!"); + } + + final String choiceName = choiceNode.getQName().getLocalName(); + if (choiceName != null) { + final String packageName = packageNameForGeneratedType(basePackageName, choiceNode.getPath()); + final GeneratedTypeBuilder choiceType = addDefaultInterfaceDefinition(packageName, choiceNode); + constructGetter(typeBuilder, choiceName, choiceNode.getDescription(), choiceType); + } + } + + private List choiceToGeneratedType(final String basePackageName, final ChoiceNode choiceNode) { + if (basePackageName == null) { + throw new IllegalArgumentException("Base Package Name cannot be NULL!"); + } + if (choiceNode == null) { + throw new IllegalArgumentException("Choice Schema Node cannot be NULL!"); + } + + final List generatedTypes = new ArrayList<>(); + final String packageName = packageNameForGeneratedType(basePackageName, choiceNode.getPath()); + final GeneratedTypeBuilder choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode); + choiceTypeBuilder.addImplementsType(Types.DATA_OBJECT); + final GeneratedType choiceType = choiceTypeBuilder.toInstance(); + + generatedTypes.add(choiceType); + final Set caseNodes = choiceNode.getCases(); + if ((caseNodes != null) && !caseNodes.isEmpty()) { + generatedTypes.addAll(generateTypesFromChoiceCases(basePackageName, choiceType, caseNodes)); + } + return generatedTypes; + } + + private List generateTypesFromChoiceCases(final String basePackageName, final Type refChoiceType, + final Set caseNodes) { + if (basePackageName == null) { + throw new IllegalArgumentException("Base Package Name cannot be NULL!"); + } + if (refChoiceType == null) { + throw new IllegalArgumentException("Referenced Choice Type cannot be NULL!"); + } + if (caseNodes == null) { + throw new IllegalArgumentException("Set of Choice Case Nodes cannot be NULL!"); + } + + final List generatedTypes = new ArrayList<>(); + for (final ChoiceCaseNode caseNode : caseNodes) { + if (caseNode != null && !caseNode.isAddedByUses()) { + final String packageName = packageNameForGeneratedType(basePackageName, caseNode.getPath()); + final GeneratedTypeBuilder caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode); + caseTypeBuilder.addImplementsType(refChoiceType); + + final Set childNodes = caseNode.getChildNodes(); + if (childNodes != null) { + resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes); + } + generatedTypes.add(caseTypeBuilder.toInstance()); + } + } + + return generatedTypes; + } + + private List generateTypesFromAugmentedChoiceCases(final String basePackageName, + final Type refChoiceType, final Set caseNodes) { + if (basePackageName == null) { + throw new IllegalArgumentException("Base Package Name cannot be NULL!"); + } + if (refChoiceType == null) { + throw new IllegalArgumentException("Referenced Choice Type cannot be NULL!"); + } + if (caseNodes == null) { + throw new IllegalArgumentException("Set of Choice Case Nodes cannot be NULL!"); + } + + final List generatedTypes = new ArrayList<>(); + for (final ChoiceCaseNode caseNode : caseNodes) { + if (caseNode != null && caseNode.isAugmenting()) { + final String packageName = packageNameForGeneratedType(basePackageName, caseNode.getPath()); + final GeneratedTypeBuilder caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode); + caseTypeBuilder.addImplementsType(refChoiceType); + + final Set childNodes = caseNode.getChildNodes(); + if (childNodes != null) { + resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes); + } + generatedTypes.add(caseTypeBuilder.toInstance()); + } + } + + return generatedTypes; + } + + private boolean resolveLeafSchemaNodeAsMethod(final GeneratedTypeBuilder typeBuilder, final LeafSchemaNode leaf) { if ((leaf != null) && (typeBuilder != null)) { final String leafName = leaf.getQName().getLocalName(); String leafDesc = leaf.getDescription(); @@ -507,32 +838,31 @@ public class BindingGeneratorImpl implements BindingGenerator { final TypeDefinition typeDef = leaf.getType(); Type returnType = null; - if (!(typeDef instanceof EnumTypeDefinition) - && !isDerivedFromEnumerationType(typeDef)) { - returnType = typeProvider - .javaTypeForSchemaDefinitionType(typeDef); - } else { - if (isImported(leaf.getPath(), typeDef.getPath())) { - // TODO: resolving of imported enums as references to - // GeneratedTypeData interface - } else { - final EnumTypeDefinition enumTypeDef = enumTypeDefFromExtendedType(typeDef); - final EnumBuilder enumBuilder = resolveEnumFromTypeDefinition( - enumTypeDef, leafName, typeBuilder); - - if (enumBuilder != null) { - returnType = new ReferencedTypeImpl( - enumBuilder.getPackageName(), - enumBuilder.getName()); - } + if (typeDef instanceof EnumTypeDefinition) { + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef); + final EnumTypeDefinition enumTypeDef = enumTypeDefFromExtendedType(typeDef); + final EnumBuilder enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName, + typeBuilder); + + if (enumBuilder != null) { + returnType = new ReferencedTypeImpl(enumBuilder.getPackageName(), enumBuilder.getName()); + } + ((TypeProviderImpl) typeProvider).putReferencedType(leaf.getPath(), returnType); + } else if (typeDef instanceof UnionType) { + GeneratedTOBuilder genTOBuilder = addEnclosedTOToTypeBuilder(typeDef, typeBuilder, leafName); + if (genTOBuilder != null) { + returnType = new ReferencedTypeImpl(genTOBuilder.getPackageName(), genTOBuilder.getName()); } + } else if (typeDef instanceof BitsTypeDefinition) { + GeneratedTOBuilder genTOBuilder = addEnclosedTOToTypeBuilder(typeDef, typeBuilder, leafName); + if (genTOBuilder != null) { + returnType = new ReferencedTypeImpl(genTOBuilder.getPackageName(), genTOBuilder.getName()); + } + } else { + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef); } - if (returnType != null) { constructGetter(typeBuilder, leafName, leafDesc, returnType); - if (!leaf.isConfiguration()) { - constructSetter(typeBuilder, leafName, leafDesc, returnType); - } return true; } } @@ -540,28 +870,7 @@ public class BindingGeneratorImpl implements BindingGenerator { return false; } - private boolean isImported(final SchemaPath leafPath, - final SchemaPath typeDefPath) { - if ((leafPath != null) && (leafPath.getPath() != null) - && (typeDefPath != null) && (typeDefPath.getPath() != null)) { - - final QName leafPathQName = leafPath.getPath().get(0); - final QName typePathQName = typeDefPath.getPath().get(0); - - if ((leafPathQName != null) - && (leafPathQName.getNamespace() != null) - && (typePathQName != null) - && (typePathQName.getNamespace() != null)) { - - return !leafPathQName.getNamespace().equals( - typePathQName.getNamespace()); - } - } - return false; - } - - private boolean resolveLeafSchemaNodeAsProperty( - final GeneratedTOBuilder toBuilder, final LeafSchemaNode leaf, + private boolean resolveLeafSchemaNodeAsProperty(final GeneratedTOBuilder toBuilder, final LeafSchemaNode leaf, boolean isReadOnly) { if ((leaf != null) && (toBuilder != null)) { final String leafName = leaf.getQName().getLocalName(); @@ -574,16 +883,14 @@ public class BindingGeneratorImpl implements BindingGenerator { final TypeDefinition typeDef = leaf.getType(); // TODO: properly resolve enum types - final Type returnType = typeProvider - .javaTypeForSchemaDefinitionType(typeDef); + final Type returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef); if (returnType != null) { - final GeneratedPropertyBuilder propBuilder = toBuilder - .addProperty(parseToClassName(leafName)); + final GeneratedPropertyBuilder propBuilder = toBuilder.addProperty(parseToClassName(leafName)); propBuilder.setReadOnly(isReadOnly); - propBuilder.addReturnType(returnType); - propBuilder.addComment(leafDesc); + propBuilder.setReturnType(returnType); + propBuilder.setComment(leafDesc); toBuilder.addEqualsIdentity(propBuilder); toBuilder.addHashIdentity(propBuilder); @@ -596,9 +903,7 @@ public class BindingGeneratorImpl implements BindingGenerator { return false; } - private boolean resolveLeafListSchemaNode( - final GeneratedTypeBuilder typeBuilder, - final LeafListSchemaNode node) { + private boolean resolveLeafListSchemaNode(final GeneratedTypeBuilder typeBuilder, final LeafListSchemaNode node) { if ((node != null) && (typeBuilder != null)) { final String nodeName = node.getQName().getLocalName(); String nodeDesc = node.getDescription(); @@ -608,32 +913,25 @@ public class BindingGeneratorImpl implements BindingGenerator { if (nodeName != null) { final TypeDefinition type = node.getType(); - final Type listType = Types.listTypeFor(typeProvider - .javaTypeForSchemaDefinitionType(type)); + final Type listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type)); constructGetter(typeBuilder, nodeName, nodeDesc, listType); - if (!node.isConfiguration()) { - constructSetter(typeBuilder, nodeName, nodeDesc, listType); - } return true; } } return false; } - private boolean resolveContainerSchemaNode(final String basePackageName, - final GeneratedTypeBuilder typeBuilder, - final ContainerSchemaNode containerNode) { + private boolean resolveContainerSchemaNode(final String basePackageName, final GeneratedTypeBuilder typeBuilder, + final ContainerSchemaNode containerNode) { if ((containerNode != null) && (typeBuilder != null)) { final String nodeName = containerNode.getQName().getLocalName(); if (nodeName != null) { - final String packageName = packageNameForGeneratedType( - basePackageName, containerNode.getPath()); + final String packageName = packageNameForGeneratedType(basePackageName, containerNode.getPath()); - final GeneratedTypeBuilder rawGenType = addRawInterfaceDefinition( - packageName, containerNode); - constructGetter(typeBuilder, nodeName, "", rawGenType); + final GeneratedTypeBuilder rawGenType = addDefaultInterfaceDefinition(packageName, containerNode); + constructGetter(typeBuilder, nodeName, containerNode.getDescription(), rawGenType); return true; } @@ -641,59 +939,83 @@ public class BindingGeneratorImpl implements BindingGenerator { return false; } - private boolean resolveListSchemaNode(final String basePackageName, - final GeneratedTypeBuilder typeBuilder, - final ListSchemaNode schemaNode) { + private boolean resolveListSchemaNode(final String basePackageName, final GeneratedTypeBuilder typeBuilder, + final ListSchemaNode schemaNode) { if ((schemaNode != null) && (typeBuilder != null)) { final String listName = schemaNode.getQName().getLocalName(); if (listName != null) { - final String packageName = packageNameForGeneratedType( - basePackageName, schemaNode.getPath()); - final GeneratedTypeBuilder rawGenType = addRawInterfaceDefinition( - packageName, schemaNode); - constructGetter(typeBuilder, listName, "", - Types.listTypeFor(rawGenType)); - if (!schemaNode.isConfiguration()) { - constructSetter(typeBuilder, listName, "", - Types.listTypeFor(rawGenType)); - } + final String packageName = packageNameForGeneratedType(basePackageName, schemaNode.getPath()); + final GeneratedTypeBuilder rawGenType = addDefaultInterfaceDefinition(packageName, schemaNode); + constructGetter(typeBuilder, listName, schemaNode.getDescription(), Types.listTypeFor(rawGenType)); return true; } } return false; } - private GeneratedTypeBuilder addRawInterfaceDefinition( - final String packageName, final DataSchemaNode schemaNode) { + /** + * Method instantiates new Generated Type Builder and sets the implements + * definitions of Data Object and Augmentable. + * + * @param packageName + * Generated Type Package Name + * @param schemaNode + * Schema Node definition + * @return Generated Type Builder instance for Schema Node definition + */ + private GeneratedTypeBuilder addDefaultInterfaceDefinition(final String packageName, final SchemaNode schemaNode) { + final GeneratedTypeBuilder builder = addRawInterfaceDefinition(packageName, schemaNode, ""); + builder.addImplementsType(Types.DATA_OBJECT); + builder.addImplementsType(Types.augmentableTypeFor(builder)); + return builder; + } + + /** + * + * @param packageName + * @param schemaNode + * @return + */ + private GeneratedTypeBuilder addRawInterfaceDefinition(final String packageName, final SchemaNode schemaNode) { + return addRawInterfaceDefinition(packageName, schemaNode, ""); + } + + private GeneratedTypeBuilder addRawInterfaceDefinition(final String packageName, final SchemaNode schemaNode, + final String prefix) { if (schemaNode == null) { - return null; + throw new IllegalArgumentException("Data Schema Node cannot be NULL!"); + } + if (packageName == null) { + throw new IllegalArgumentException("Package Name for Generated Type cannot be NULL!"); + } + if (schemaNode.getQName() == null) { + throw new IllegalArgumentException("QName for Data Schema Node cannot be NULL!"); } - final String schemaNodeName = schemaNode.getQName().getLocalName(); + if (schemaNodeName == null) { + throw new IllegalArgumentException("Local Name of QName for Data Schema Node cannot be NULL!"); + } - if ((packageName != null) && (schemaNodeName != null)) { - final String genTypeName = parseToClassName(schemaNodeName); - final GeneratedTypeBuilder newType = new GeneratedTypeBuilderImpl( - packageName, genTypeName); - - newType.addImplementsType(Types.DATA_OBJECT); - newType.addImplementsType(Types.augmentableTypeFor(newType)); + final String genTypeName; + if (prefix == null) { + genTypeName = parseToClassName(schemaNodeName); + } else { + genTypeName = prefix + parseToClassName(schemaNodeName); + } - if (!genTypeBuilders.containsKey(packageName)) { - final Map builders = new HashMap<>(); + final GeneratedTypeBuilder newType = new GeneratedTypeBuilderImpl(packageName, genTypeName); + if (!genTypeBuilders.containsKey(packageName)) { + final Map builders = new HashMap<>(); + builders.put(genTypeName, newType); + genTypeBuilders.put(packageName, builders); + } else { + final Map builders = genTypeBuilders.get(packageName); + if (!builders.containsKey(genTypeName)) { builders.put(genTypeName, newType); - genTypeBuilders.put(packageName, builders); - } else { - final Map builders = genTypeBuilders - .get(packageName); - if (!builders.containsKey(genTypeName)) { - builders.put(genTypeName, newType); - } } - return newType; } - return null; + return newType; } private String getterMethodName(final String methodName) { @@ -710,53 +1032,39 @@ public class BindingGeneratorImpl implements BindingGenerator { return method.toString(); } - private MethodSignatureBuilder constructGetter( - final GeneratedTypeBuilder interfaceBuilder, - final String schemaNodeName, final String comment, - final Type returnType) { - final MethodSignatureBuilder getMethod = interfaceBuilder - .addMethod(getterMethodName(schemaNodeName)); + private MethodSignatureBuilder constructGetter(final GeneratedTypeBuilder interfaceBuilder, + final String schemaNodeName, final String comment, final Type returnType) { + final MethodSignatureBuilder getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName)); - getMethod.addComment(comment); - getMethod.addReturnType(returnType); + getMethod.setComment(comment); + getMethod.setReturnType(returnType); return getMethod; } - private MethodSignatureBuilder constructSetter( - final GeneratedTypeBuilder interfaceBuilder, - final String schemaNodeName, final String comment, - final Type parameterType) { - final MethodSignatureBuilder setMethod = interfaceBuilder - .addMethod(setterMethodName(schemaNodeName)); + private MethodSignatureBuilder constructSetter(final GeneratedTypeBuilder interfaceBuilder, + final String schemaNodeName, final String comment, final Type parameterType) { + final MethodSignatureBuilder setMethod = interfaceBuilder.addMethod(setterMethodName(schemaNodeName)); - setMethod.addComment(comment); - setMethod.addParameter(parameterType, - parseToValidParamName(schemaNodeName)); - setMethod.addReturnType(Types.voidType()); + setMethod.setComment(comment); + setMethod.addParameter(parameterType, parseToValidParamName(schemaNodeName)); + setMethod.setReturnType(Types.voidType()); return setMethod; } - - private List listToGenType(final String basePackageName, - final ListSchemaNode list) { + private List listToGenType(final String basePackageName, final ListSchemaNode list) { if (basePackageName == null) { - throw new IllegalArgumentException( - "Package Name for Generated Type cannot be NULL!"); + throw new IllegalArgumentException("Package Name for Generated Type cannot be NULL!"); } if (list == null) { - throw new IllegalArgumentException( - "List Schema Node cannot be NULL!"); + throw new IllegalArgumentException("List Schema Node cannot be NULL!"); } - final String packageName = packageNameForGeneratedType( - basePackageName, list.getPath()); - final GeneratedTypeBuilder typeBuilder = resolveListTypeBuilder( - packageName, list); + final String packageName = packageNameForGeneratedType(basePackageName, list.getPath()); + final GeneratedTypeBuilder typeBuilder = resolveListTypeBuilder(packageName, list); final List listKeys = listKeys(list); - GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, - list, listKeys); + GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, list, listKeys); final Set schemaNodes = list.getChildNodes(); @@ -764,42 +1072,19 @@ public class BindingGeneratorImpl implements BindingGenerator { if (schemaNode.isAugmenting()) { continue; } - addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, - genTOBuilder, listKeys); - } - -// if (list.isAugmenting()) { -// for (final DataSchemaNode schemaNode : schemaNodes) { -// if (schemaNode.isAugmenting()) { -// addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, -// genTOBuilder, listKeys); -// } -// } -// } else { -// for (final DataSchemaNode schemaNode : schemaNodes) { -// if (schemaNode.isAugmenting()) { -// continue; -// } -// addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, -// genTOBuilder, listKeys); -// } -// } + addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, genTOBuilder, listKeys); + } return typeBuildersToGenTypes(typeBuilder, genTOBuilder); } - private void addSchemaNodeToListBuilders(final String basePackageName, - final DataSchemaNode schemaNode, - final GeneratedTypeBuilder typeBuilder, - final GeneratedTOBuilder genTOBuilder, - final List listKeys) { + private void addSchemaNodeToListBuilders(final String basePackageName, final DataSchemaNode schemaNode, + final GeneratedTypeBuilder typeBuilder, final GeneratedTOBuilder genTOBuilder, final List listKeys) { if (schemaNode == null) { - throw new IllegalArgumentException( - "Data Schema Node cannot be NULL!"); + throw new IllegalArgumentException("Data Schema Node cannot be NULL!"); } if (typeBuilder == null) { - throw new IllegalArgumentException( - "Generated Type Builder cannot be NULL!"); + throw new IllegalArgumentException("Generated Type Builder cannot be NULL!"); } if (schemaNode instanceof LeafSchemaNode) { @@ -810,30 +1095,23 @@ public class BindingGeneratorImpl implements BindingGenerator { resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, true); } } else if (schemaNode instanceof LeafListSchemaNode) { - resolveLeafListSchemaNode(typeBuilder, - (LeafListSchemaNode) schemaNode); + resolveLeafListSchemaNode(typeBuilder, (LeafListSchemaNode) schemaNode); } else if (schemaNode instanceof ContainerSchemaNode) { - resolveContainerSchemaNode(basePackageName, typeBuilder, - (ContainerSchemaNode) schemaNode); + resolveContainerSchemaNode(basePackageName, typeBuilder, (ContainerSchemaNode) schemaNode); } else if (schemaNode instanceof ListSchemaNode) { resolveListSchemaNode(basePackageName, typeBuilder, (ListSchemaNode) schemaNode); } - } - private List typeBuildersToGenTypes( - final GeneratedTypeBuilder typeBuilder, - GeneratedTOBuilder genTOBuilder) { + private List typeBuildersToGenTypes(final GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) { final List genTypes = new ArrayList<>(); if (typeBuilder == null) { - throw new IllegalArgumentException( - "Generated Type Builder cannot be NULL!"); + throw new IllegalArgumentException("Generated Type Builder cannot be NULL!"); } if (genTOBuilder != null) { final GeneratedTransferObject genTO = genTOBuilder.toInstance(); - constructGetter(typeBuilder, genTO.getName(), - "Returns Primary Key of Yang List Type", genTO); + constructGetter(typeBuilder, genTO.getName(), "Returns Primary Key of Yang List Type", genTO); genTypes.add(genTO); } genTypes.add(typeBuilder.toInstance()); @@ -844,14 +1122,12 @@ public class BindingGeneratorImpl implements BindingGenerator { * @param list * @return */ - private GeneratedTOBuilder resolveListKey(final String packageName, - final ListSchemaNode list) { + private GeneratedTOBuilder resolveListKey(final String packageName, final ListSchemaNode list) { final String listName = list.getQName().getLocalName() + "Key"; return schemaNodeToTransferObjectBuilder(packageName, list, listName); } - private boolean isPartOfListKey(final LeafSchemaNode leaf, - final List keys) { + private boolean isPartOfListKey(final LeafSchemaNode leaf, final List keys) { if ((leaf != null) && (keys != null) && (leaf.getQName() != null)) { final String leafName = leaf.getQName().getLocalName(); if (keys.contains(leafName)) { @@ -874,15 +1150,12 @@ public class BindingGeneratorImpl implements BindingGenerator { return listKeys; } - private GeneratedTypeBuilder resolveListTypeBuilder( - final String packageName, final ListSchemaNode list) { + private GeneratedTypeBuilder resolveListTypeBuilder(final String packageName, final ListSchemaNode list) { if (packageName == null) { - throw new IllegalArgumentException( - "Package Name for Generated Type cannot be NULL!"); + throw new IllegalArgumentException("Package Name for Generated Type cannot be NULL!"); } if (list == null) { - throw new IllegalArgumentException( - "List Schema Node cannot be NULL!"); + throw new IllegalArgumentException("List Schema Node cannot be NULL!"); } final String schemaNodeName = list.getQName().getLocalName(); @@ -894,19 +1167,37 @@ public class BindingGeneratorImpl implements BindingGenerator { typeBuilder = builders.get(genTypeName); } if (typeBuilder == null) { - typeBuilder = addRawInterfaceDefinition(packageName, list); + typeBuilder = addDefaultInterfaceDefinition(packageName, list); } return typeBuilder; } - private GeneratedTOBuilder resolveListKeyTOBuilder( - final String packageName, final ListSchemaNode list, + private GeneratedTOBuilder resolveListKeyTOBuilder(final String packageName, final ListSchemaNode list, final List listKeys) { GeneratedTOBuilder genTOBuilder = null; if (listKeys.size() > 0) { genTOBuilder = resolveListKey(packageName, list); } - return genTOBuilder; } + + private GeneratedTOBuilder addEnclosedTOToTypeBuilder(TypeDefinition typeDef, GeneratedTypeBuilder typeBuilder, + String leafName) { + String className = parseToClassName(leafName); + GeneratedTOBuilder genTOBuilder = null; + if (typeDef instanceof UnionType) { + genTOBuilder = ((TypeProviderImpl) typeProvider).addUnionGeneratedTypeDefinition( + typeBuilder.getPackageName(), typeDef, className); + } else if (typeDef instanceof BitsTypeDefinition) { + genTOBuilder = ((TypeProviderImpl) typeProvider).bitsTypedefToTransferObject(typeBuilder.getPackageName(), + typeDef, className); + } + if (genTOBuilder != null) { + typeBuilder.addEnclosingTransferObject(genTOBuilder); + return genTOBuilder; + } + return null; + + } + }