X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding2%2Fmdsal-binding2-generator-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fjavav2%2Fgenerator%2Fimpl%2FGenHelperUtil.java;h=fa67281bdf2721b283e196da5230a331ae2cfe79;hb=f02f575e17221e644aa3b6d27005aaf86ebe2f24;hp=e091d43a69fedeeb1662c57a91a3359c8195c355;hpb=141e3def6accb5c75feed87d98cfa29acfcd8d61;p=mdsal.git diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java index e091d43a69..fa67281bdf 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java @@ -11,57 +11,76 @@ package org.opendaylight.mdsal.binding.javav2.generator.impl; import static com.google.common.base.Preconditions.checkArgument; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.addTOToTypeBuilder; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.annotateDeprecatedIfNecessary; -import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.augGenTypeName; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.constructGetter; -import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.createDescription; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.createReturnTypeForUnion; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.getAugmentIdentifier; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.isInnerType; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.qNameConstant; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.resolveInnerEnumFromTypeDefinition; import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.resolveListKeyTOBuilder; +import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.resolveListKeyTypeBuilder; import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil.computeDefaultSUID; import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil.encodeAngleBrackets; import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil.packageNameForGeneratedType; +import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.IDENTIFIABLE; +import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.IDENTIFIER; import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.NOTIFICATION; import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.parameterizedTypeFor; +import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.wildcardTypeFor; +import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNode; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext; import org.opendaylight.mdsal.binding.javav2.generator.spi.TypeProvider; import org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil; import org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes; import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifier; import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer; +import org.opendaylight.mdsal.binding.javav2.generator.util.ReferencedTypeImpl; +import org.opendaylight.mdsal.binding.javav2.generator.util.TypeComments; import org.opendaylight.mdsal.binding.javav2.generator.util.Types; import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl; +import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.mdsal.binding.javav2.generator.yang.types.GroupingDefinitionDependencySort; import org.opendaylight.mdsal.binding.javav2.generator.yang.types.TypeProviderImpl; import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.YangSourceDefinition; import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.EnumBuilder; import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedPropertyBuilder; import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.spec.base.BaseIdentity; import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode; import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingNamespaceType; import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable; import org.opendaylight.mdsal.binding.javav2.util.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; +import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -76,6 +95,7 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; +import org.opendaylight.yangtools.yang.model.util.SchemaNodeUtils; /** * Helper util class used for generation of types in Binding spec v2. @@ -92,8 +112,8 @@ final class GenHelperUtil { * * @param module * Module object from which builder will be created - * @param genCtx - * @param verboseClassComments + * @param genCtx generated context + * @param verboseClassComments verbosity switch * * @return GeneratedTypeBuilder which is internal * representation of the module @@ -103,12 +123,18 @@ final class GenHelperUtil { static GeneratedTypeBuilder moduleToDataType(final Module module, final Map genCtx, final boolean verboseClassComments) { Preconditions.checkArgument(module != null, "Module reference cannot be NULL."); - final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder(module, "Data", verboseClassComments); + final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder(module, "Data", verboseClassComments, + genCtx.get(module)); addImplementedInterfaceFromUses(module, moduleDataTypeBuilder, genCtx); moduleDataTypeBuilder.addImplementsType(BindingTypes.TREE_ROOT); - moduleDataTypeBuilder.addComment(module.getDescription()); - moduleDataTypeBuilder.setDescription(createDescription(module, verboseClassComments)); - moduleDataTypeBuilder.setReference(module.getReference()); + + if (verboseClassComments) { + moduleDataTypeBuilder.setYangSourceDefinition(YangSourceDefinition.of(module)); + TypeComments.description(module).ifPresent(moduleDataTypeBuilder::addComment); + module.getDescription().ifPresent(moduleDataTypeBuilder::setDescription); + module.getReference().ifPresent(moduleDataTypeBuilder::setReference); + } + return moduleDataTypeBuilder; } @@ -121,24 +147,27 @@ final class GenHelperUtil { * @param postfix * string which is added to the module class name representation * as suffix - * @param verboseClassComments + * @param verboseClassComments verbosity switch * @return instance of GeneratedTypeBuilder which represents * module. * @throws IllegalArgumentException * if module is null */ static GeneratedTypeBuilder moduleTypeBuilder(final Module module, final String postfix, final boolean - verboseClassComments) { + verboseClassComments, final ModuleContext context) { Preconditions.checkArgument(module != null, "Module reference cannot be NULL."); final String packageName = BindingMapping.getRootPackageName(module); // underscore used as separator for distinction of module name parts final String moduleName = new StringBuilder(module.getName()).append('_').append(postfix).toString(); - final GeneratedTypeBuilderImpl moduleBuilder = new GeneratedTypeBuilderImpl(packageName, moduleName); - moduleBuilder.setDescription(createDescription(module, verboseClassComments)); - moduleBuilder.setReference(module.getReference()); + final GeneratedTypeBuilderImpl moduleBuilder = new GeneratedTypeBuilderImpl(packageName, moduleName, context); + if (verboseClassComments) { + moduleBuilder.setYangSourceDefinition(YangSourceDefinition.of(module)); + TypeComments.description(module).ifPresent(moduleBuilder::addComment); + module.getDescription().ifPresent(moduleBuilder::setDescription); + module.getReference().ifPresent(moduleBuilder::setReference); + } moduleBuilder.setModuleName(moduleName); - return moduleBuilder; } @@ -182,6 +211,16 @@ final class GenHelperUtil { return null; } + static GeneratedTOBuilder findIdentityByQname(final QName qname, final Map genCtx) { + for (final ModuleContext ctx : genCtx.values()) { + final GeneratedTOBuilder result = ctx.getIdentities().get(qname); + if (result != null) { + return result; + } + } + return null; + } + /** * Adds the methods to typeBuilder which represent subnodes of * node for which typeBuilder was created. @@ -212,38 +251,137 @@ final class GenHelperUtil { final Iterable schemaNodes, final Map genCtx, final SchemaContext schemaContext, final boolean verboseClassComments, final Map> genTypeBuilders, - final TypeProvider typeProvider) { + final TypeProvider typeProvider, final BindingNamespaceType namespaceType) { if (schemaNodes != null && parent != null) { for (final DataSchemaNode schemaNode : schemaNodes) { - if (!schemaNode.isAugmenting() && !schemaNode.isAddedByUses()) { + if (resolveDataSchemaNodesCheck(module, schemaContext, schemaNode)) { addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, parent, childOf, module, genCtx, - schemaContext, verboseClassComments, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); } } } return parent; } - static GeneratedTypeBuilder addDefaultInterfaceDefinition(final String packageName, final SchemaNode + static boolean resolveDataSchemaNodesCheck(final Module module, final SchemaContext schemaContext, + final DataSchemaNode schemaNode) { + if (!schemaNode.isAugmenting()) { + return true; + } + + final QName qname = schemaNode.getPath().getLastComponent(); + final Module originalModule = schemaContext.findModule(qname.getModule()).get(); + return module.equals(originalModule); + } + + static GeneratedTypeBuilder addDefaultInterfaceDefinition(final String basePackageName, final SchemaNode schemaNode, final Module module, final Map genCtx, final SchemaContext schemaContext, final boolean verboseClassComments, final Map> genTypeBuilders, - final TypeProvider typeProvider) { - return addDefaultInterfaceDefinition(packageName, schemaNode, null, module, genCtx, schemaContext, - verboseClassComments, genTypeBuilders, typeProvider); + final TypeProvider typeProvider, final BindingNamespaceType namespaceType) { + return addDefaultInterfaceDefinition(basePackageName, schemaNode, null, module, genCtx, schemaContext, + verboseClassComments, genTypeBuilders, typeProvider , namespaceType); } - static Map processUsesAugments(final SchemaContext schemaContext, final - DataNodeContainer node, final Module module, Map genCtx, - final Map> genTypeBuilders, - final boolean verboseClassComments, final TypeProvider typeProvider) { - final String basePackageName = BindingMapping.getRootPackageName(module); - for (final UsesNode usesNode : node.getUses()) { - for (final AugmentationSchema augment : usesNode.getAugmentations()) { - genCtx = AugmentToGenType.usesAugmentationToGenTypes(schemaContext, basePackageName, augment, module, - usesNode, node, genCtx, genTypeBuilders, verboseClassComments, typeProvider); - genCtx = processUsesAugments(schemaContext, augment, module, genCtx, genTypeBuilders, - verboseClassComments, typeProvider); + private static QName createQNameFromSuperNode(final Module module, final Object node, final SchemaNode superChildNode) { + QName childNodeQName = null; + if (node instanceof Module) { + childNodeQName = QName.create(((Module) node).getQNameModule(), superChildNode.getQName().getLocalName()); + } else if (node instanceof SchemaNode) { + childNodeQName = QName.create(((SchemaNode) node).getQName(), superChildNode.getQName().getLocalName()); + } else if (node instanceof AugmentationSchemaNode) { + childNodeQName = QName.create(module.getQNameModule(), superChildNode.getQName().getLocalName()); + } else { + throw new IllegalArgumentException("Not support node type:" + node); + } + + return childNodeQName; + } + + private static void addUsesImplements(final SchemaNode superNode, final Module superModule, + final Object node, final Module module, final SchemaContext schemaContext, + final Map genCtx, final BindingNamespaceType namespaceType) { + if (superNode instanceof DataNodeContainer) { + for (DataSchemaNode superChildNode : ((DataNodeContainer) superNode).getChildNodes()) { + if (superChildNode instanceof DataNodeContainer || superChildNode instanceof ChoiceSchemaNode) { + final QName childQName = createQNameFromSuperNode(module, node, superChildNode); + DataSchemaNode childNode = ((DataNodeContainer) node).getDataChildByName(childQName); + Preconditions.checkNotNull(childNode, "%s->%s", node, childQName); + + final GeneratedTypeBuilder type = genCtx.get(module).getChildNode(childNode.getPath()); + final GeneratedTypeBuilder superType = genCtx.get(superModule).getChildNode(superChildNode.getPath()); + + Preconditions.checkNotNull(type, "%s->%s", module, childNode.getPath()); + Preconditions.checkNotNull(superType, "%s->%s", superModule, superChildNode.getPath()); + type.addImplementsType(superType); + if (superChildNode instanceof ListSchemaNode + && !((ListSchemaNode) superChildNode).getKeyDefinition().isEmpty()) { + if (namespaceType.equals(BindingNamespaceType.Grouping)) { + genCtx.get(module).getKeyType(childNode.getPath()) + .addImplementsType(genCtx.get(superModule).getKeyType(superChildNode.getPath())); + } else if (namespaceType.equals(BindingNamespaceType.Data)) { + genCtx.get(module).getKeyGenTO(childNode.getPath()) + .addImplementsType(genCtx.get(superModule).getKeyType(superChildNode.getPath())); + } + } + addUsesImplements(superChildNode, superModule, childNode, module, schemaContext, genCtx, namespaceType); + } + } + } else if (superNode instanceof ChoiceSchemaNode) { + for (CaseSchemaNode superCaseNode : ((ChoiceSchemaNode) superNode).getCases().values()) { + final QName childQName = createQNameFromSuperNode(module, node, superCaseNode); + CaseSchemaNode caseNode = ((ChoiceSchemaNode) node).getCaseNodeByName(childQName); + Preconditions.checkNotNull(caseNode, "%s->%s", node, childQName); + + final GeneratedTypeBuilder type = genCtx.get(module).getCase(caseNode.getPath()); + final GeneratedTypeBuilder superType = genCtx.get(superModule).getCase(superCaseNode.getPath()); + Preconditions.checkNotNull(type, "%s->%s", module, caseNode.getPath()); + Preconditions.checkNotNull(superType, "%s->%s", superModule, superCaseNode.getPath()); + type.addImplementsType(superType); + addUsesImplements(superCaseNode, superModule, caseNode, module, schemaContext, genCtx, namespaceType); + } + } else { + throw new IllegalArgumentException("Not support super node :" + superNode); + } + } + + private static GroupingDefinition findGroupingNodeFromUses(final Module module, final SchemaContext schemaContext, + final Object parentNode, final UsesNode usesNode) { + SchemaNode groupingNode; + if (parentNode instanceof Module) { + final Module superModule = schemaContext.findModule( + usesNode.getGroupingPath().getLastComponent().getModule()).get(); + groupingNode = superModule.getGroupings() + .stream().filter(grouping -> grouping.getPath().equals(usesNode.getGroupingPath())) + .findFirst().orElse(null); + } else { + //FIXME: Schema path is not unique for Yang 1.1, findDataSchemaNode always does search from data node first. + final Iterable prefixedPath = usesNode.getGroupingPath().getPathFromRoot(); + final QName current = prefixedPath.iterator().next(); + final Module targetModule = schemaContext.findModule(current.getModule()).orElse(null); + Preconditions.checkArgument(targetModule != null, "Cannot find target module for %s and %s.", + current.getNamespace(), current.getRevision()); + groupingNode = targetModule.getGroupings().stream() + .filter(grouping -> grouping.getPath().equals(usesNode.getGroupingPath())) + .collect(Collectors.toList()).get(0); + if (groupingNode == null) { + groupingNode = SchemaContextUtil.findDataSchemaNode(schemaContext, usesNode.getGroupingPath()); + } + } + + Preconditions.checkNotNull(groupingNode, "%s->%s", module, usesNode.getGroupingPath()); + Preconditions.checkState(groupingNode instanceof GroupingDefinition, "%s->%s", module, + usesNode.getGroupingPath()); + return (GroupingDefinition) groupingNode; + } + + static Map processUsesImplements(final Object node, final Module module, + final SchemaContext schemaContext, final Map genCtx, final BindingNamespaceType namespaceType) { + if (node instanceof DataNodeContainer) { + for (final UsesNode usesNode : ((DataNodeContainer) node).getUses()) { + final GroupingDefinition grouping = findGroupingNodeFromUses(module, schemaContext, node, usesNode); + final Module superModule = SchemaContextUtil.findParentModule(schemaContext, grouping); + addUsesImplements(grouping, superModule, node, module, schemaContext, genCtx, namespaceType); } } return genCtx; @@ -269,56 +407,60 @@ final class GenHelperUtil { return null; } - /** - * Returns a generated type builder for an augmentation. - * - * The name of the type builder is equal to the name of augmented node with - * serial number as suffix. - * - * @param module - * current module - * @param augmentPackageName - * string with contains the package name to which the augment - * belongs - * @param basePackageName - * string with the package name to which the augmented node - * belongs - * @param targetTypeRef - * target type - * @param augSchema - * augmentation schema which contains data about the child nodes - * and uses of augment - * @return generated type builder for augment in genCtx - */ - static Map addRawAugmentGenTypeDefinition(final Module module, final String augmentPackageName, - final String basePackageName, final Type targetTypeRef, final AugmentationSchema augSchema, - final Map> genTypeBuilders, final Map genCtx, final SchemaContext schemaContext, final boolean verboseClassComments, final - TypeProvider typeProvider) { - - Map augmentBuilders = genTypeBuilders.computeIfAbsent(augmentPackageName, k -> new HashMap<>()); - String augIdentifier = getAugmentIdentifier(augSchema.getUnknownSchemaNodes()); + static Map addRawAugmentGenTypeDefinition(final Module module, + final String augmentPackageName, final Type targetTypeRef, final SchemaNode targetNode, + final List schemaPathAugmentListEntry, + final Map> genTypeBuilders, + final Map genCtx, final SchemaContext schemaContext, + final boolean verboseClassComments, final TypeProvider typeProvider, + final BindingNamespaceType namespaceType) { + + //pick augmentation grouped by augmentation target, there is always at least one + final AugmentationSchemaNode augSchema = schemaPathAugmentListEntry.get(0); + + Map augmentBuilders = genTypeBuilders.computeIfAbsent( + augmentPackageName, k -> new HashMap<>()); + + //this requires valid semantics in YANG model + String augIdentifier = null; + for (AugmentationSchemaNode aug : schemaPathAugmentListEntry) { + // FIXME: when there're multiple augment identifiers for augmentations of same target, + // it would pick the first identifier. + augIdentifier = getAugmentIdentifier(aug.getUnknownSchemaNodes()); + break; + } if (augIdentifier == null) { - augIdentifier = augGenTypeName(augmentBuilders, targetTypeRef.getName()); + augIdentifier = new StringBuilder(module.getName()) + .append('_').append(targetNode.getQName().getLocalName()).toString(); } - GeneratedTypeBuilder augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augIdentifier); + GeneratedTypeBuilderImpl augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augIdentifier, + true, false, genCtx.get(module)); augTypeBuilder.addImplementsType(BindingTypes.TREE_NODE); + augTypeBuilder.addImplementsType(parameterizedTypeFor(BindingTypes.INSTANTIABLE, augTypeBuilder)); augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef)); + augTypeBuilder.setBasePackageName(BindingMapping.getRootPackageName(module)); + augTypeBuilder.setWithBuilder(true); annotateDeprecatedIfNecessary(augSchema.getStatus(), augTypeBuilder); - augTypeBuilder = addImplementedInterfaceFromUses(augSchema, augTypeBuilder, genCtx); - augTypeBuilder = augSchemaNodeToMethods(module, basePackageName, augTypeBuilder, augTypeBuilder, augSchema - .getChildNodes(), genCtx, schemaContext, verboseClassComments, typeProvider, genTypeBuilders); + //produces getters for augTypeBuilder eventually + for (AugmentationSchemaNode aug : schemaPathAugmentListEntry) { + //apply all uses + addImplementedInterfaceFromUses(aug, augTypeBuilder, genCtx); + augSchemaNodeToMethods(module, BindingMapping.getRootPackageName(module), augTypeBuilder, augTypeBuilder, + aug.getChildNodes(), genCtx, schemaContext, verboseClassComments, typeProvider, genTypeBuilders, + namespaceType); + } + augmentBuilders.put(augTypeBuilder.getName(), augTypeBuilder); if(!augSchema.getChildNodes().isEmpty()) { - genCtx.get(module).addTypeToAugmentation(augTypeBuilder, augSchema); - + genCtx.get(module).addTargetToAugmentation(augTypeBuilder, augSchema.getTargetPath()); } genCtx.get(module).addAugmentType(augTypeBuilder); + genCtx.get(module).addTypeToAugmentations(augTypeBuilder, schemaPathAugmentListEntry); return genCtx; } @@ -348,12 +490,12 @@ final class GenHelperUtil { final GeneratedTypeBuilder typeBuilder, final GeneratedTypeBuilder childOf, final Iterable schemaNodes, final Map genCtx, final SchemaContext schemaContext, final boolean verboseClassComments, final TypeProvider typeProvider, final Map> genTypeBuilders) { + GeneratedTypeBuilder>> genTypeBuilders, final BindingNamespaceType namespaceType) { if (schemaNodes != null && typeBuilder != null) { for (final DataSchemaNode schemaNode : schemaNodes) { if (!schemaNode.isAugmenting()) { addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder, childOf, module, genCtx, - schemaContext, verboseClassComments, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); } } } @@ -374,9 +516,8 @@ final class GenHelperUtil { * DataNodeContainer} it can also implement nodes which are specified in * uses. * - * @param packageName - * string with the name of the package to which - * schemaNode belongs. + * @param basePackageName + * string contains the module package name * @param schemaNode * schema node for which is created generated type builder * @param parent @@ -384,28 +525,30 @@ final class GenHelperUtil { * @param schemaContext schema context * @return generated type builder schemaNode */ - static GeneratedTypeBuilder addDefaultInterfaceDefinition(final String packageName, final SchemaNode + private static GeneratedTypeBuilder addDefaultInterfaceDefinition(final String basePackageName, final SchemaNode schemaNode, final Type parent, final Module module, final Map genCtx, final SchemaContext schemaContext, final boolean verboseClassComments, final Map> genTypeBuilders, final TypeProvider typeProvider) { + GeneratedTypeBuilder>> genTypeBuilders, final TypeProvider typeProvider, final BindingNamespaceType namespaceType) { - GeneratedTypeBuilder it = addRawInterfaceDefinition(packageName, schemaNode, schemaContext, "", - verboseClassComments, genTypeBuilders); - if (parent == null) { - it.addImplementsType(BindingTypes.TREE_NODE); - } else { - if (parent instanceof ListSchemaNode) { - it.addImplementsType(parameterizedTypeFor(BindingTypes.TREE_CHILD_NODE, parent, parameterizedTypeFor - (BindingTypes.IDENTIFIABLE_ITEM, parent))); + GeneratedTypeBuilder it = addRawInterfaceDefinition(basePackageName, schemaNode, schemaContext, "", "", + verboseClassComments, genTypeBuilders, namespaceType, genCtx.get(module)); + if (namespaceType.equals(BindingNamespaceType.Data)) { + if (parent == null) { + it.addImplementsType(BindingTypes.TREE_NODE); } else { - it.addImplementsType(parameterizedTypeFor(BindingTypes.TREE_CHILD_NODE, parent, parameterizedTypeFor - (BindingTypes.ITEM, parent))); + if (!(schemaNode instanceof ListSchemaNode) || + ((ListSchemaNode) schemaNode).getKeyDefinition().isEmpty()) { + it.addImplementsType(parameterizedTypeFor(BindingTypes.TREE_CHILD_NODE, parent, parameterizedTypeFor + (BindingTypes.ITEM, it))); + } it.addImplementsType(parameterizedTypeFor(BindingTypes.INSTANTIABLE, it)); } - } - if (!(schemaNode instanceof GroupingDefinition)) { - it.addImplementsType(BindingTypes.augmentable(it)); + if (!(schemaNode instanceof GroupingDefinition)) { + it.addImplementsType(BindingTypes.augmentable(it)); + } + } else { + it.addImplementsType(BindingTypes.TREE_NODE); } if (schemaNode instanceof DataNodeContainer) { @@ -417,25 +560,22 @@ final class GenHelperUtil { return it; } - static GeneratedTypeBuilder resolveNotification(final GeneratedTypeBuilder listenerInterface, String + static GeneratedTypeBuilder resolveNotification(final GeneratedTypeBuilder listenerInterface, final String parentName, final String basePackageName, final NotificationDefinition notification, final Module module, - final SchemaContext schemaContext, final boolean verboseClassComments, Map> - genTypeBuilders, TypeProvider typeProvider, Map genCtx) { - - processUsesAugments(schemaContext, notification, module, genCtx, genTypeBuilders, - verboseClassComments, typeProvider); - + final SchemaContext schemaContext, final boolean verboseClassComments, final Map> + genTypeBuilders, final TypeProvider typeProvider, final Map genCtx) { final GeneratedTypeBuilder notificationInterface = addDefaultInterfaceDefinition (basePackageName, notification, null, module, genCtx, schemaContext, - verboseClassComments, genTypeBuilders, typeProvider); + verboseClassComments, genTypeBuilders, typeProvider, BindingNamespaceType.Data); annotateDeprecatedIfNecessary(notification.getStatus(), notificationInterface); notificationInterface.addImplementsType(NOTIFICATION); + notificationInterface.addImplementsType(parameterizedTypeFor(BindingTypes.INSTANTIABLE, notificationInterface)); genCtx.get(module).addChildNodeType(notification, notificationInterface); // Notification object resolveDataSchemaNodes(module, basePackageName, notificationInterface, notificationInterface, notification.getChildNodes(), genCtx, schemaContext, - verboseClassComments, genTypeBuilders, typeProvider); + verboseClassComments, genTypeBuilders, typeProvider, BindingNamespaceType.Data); //in case of tied notification, incorporate parent's localName final StringBuilder sb = new StringBuilder("on_"); @@ -446,7 +586,7 @@ final class GenHelperUtil { listenerInterface.addMethod(JavaIdentifierNormalizer.normalizeSpecificIdentifier(sb.toString(), JavaIdentifier.METHOD)) .setAccessModifier(AccessModifier.PUBLIC).addParameter(notificationInterface, "notification") - .setComment(encodeAngleBrackets(notification.getDescription())).setReturnType(Types.VOID); + .setComment(encodeAngleBrackets(notification.getDescription().orElse(null))).setReturnType(Types.VOID); return listenerInterface; } @@ -458,9 +598,8 @@ final class GenHelperUtil { * {@link BindingGeneratorImpl#genTypeBuilders genTypeBuilders}. If it isn't * found it is created and added to genTypeBuilders. * - * @param packageName - * string with the package name to which returning generated type - * builder belongs + * @param basePackageName + * string contains the module package name * @param schemaNode * schema node which provide data about the schema node name * @param schemaContext schema context @@ -476,12 +615,13 @@ final class GenHelperUtil { * * */ - static GeneratedTypeBuilder addRawInterfaceDefinition(final String packageName, final SchemaNode schemaNode, - final SchemaContext schemaContext, final String prefix, final boolean verboseClassComments, - final Map> genTypeBuilders) { + static GeneratedTypeBuilder addRawInterfaceDefinition(final String basePackageName, final SchemaNode schemaNode, + final SchemaContext schemaContext, final String prefix, final String suffix, + final boolean verboseClassComments, final Map> genTypeBuilders, + final BindingNamespaceType namespaceType, final ModuleContext context) { Preconditions.checkArgument(schemaNode != null, "Data Schema Node cannot be NULL."); - Preconditions.checkArgument(packageName != null, "Package Name for Generated Type cannot be NULL."); + Preconditions.checkArgument(basePackageName != null, "Base package Name for Generated Type cannot be NULL."); String schemaNodeName = schemaNode.getQName().getLocalName(); Preconditions.checkArgument(schemaNodeName != null, "Local Name of QName for Data Schema Node cannot be NULL."); @@ -490,14 +630,25 @@ final class GenHelperUtil { schemaNodeName = new StringBuilder(prefix).append('_').append(schemaNodeName).toString(); } - final GeneratedTypeBuilderImpl newType = new GeneratedTypeBuilderImpl(packageName, schemaNodeName); + if (suffix != null && !suffix.isEmpty()) { + // underscore used as separator for distinction of class name parts + schemaNodeName = new StringBuilder(schemaNodeName).append('_').append(suffix).toString(); + } + + final String packageName = packageNameForGeneratedType(basePackageName, schemaNode.getPath(), namespaceType); + final GeneratedTypeBuilderImpl newType = new GeneratedTypeBuilderImpl(packageName, schemaNodeName, context); final Module module = SchemaContextUtil.findParentModule(schemaContext, schemaNode); qNameConstant(newType, BindingMapping.QNAME_STATIC_FIELD_NAME, schemaNode.getQName()); - newType.addComment(schemaNode.getDescription()); - newType.setDescription(createDescription(schemaNode, newType.getFullyQualifiedName(), schemaContext, verboseClassComments)); - newType.setReference(schemaNode.getReference()); + if (verboseClassComments) { + newType.setYangSourceDefinition(YangSourceDefinition.of(module, schemaNode)); + TypeComments.description(schemaNode).ifPresent(newType::addComment); + schemaNode.getDescription().ifPresent(newType::setDescription); + schemaNode.getReference().ifPresent(newType::setReference); + } newType.setSchemaPath((List) schemaNode.getPath().getPathFromRoot()); newType.setModuleName(module.getName()); + newType.setBasePackageName(BindingMapping.getRootPackageName(module)); + newType.setWithBuilder(AuxiliaryGenUtils.hasBuilderClass(schemaNode, namespaceType)); if (!genTypeBuilders.containsKey(packageName)) { final Map builders = new HashMap<>(); @@ -516,78 +667,169 @@ final class GenHelperUtil { private static void addSchemaNodeToBuilderAsMethod(final String basePackageName, final DataSchemaNode node, final GeneratedTypeBuilder typeBuilder, final GeneratedTypeBuilder childOf, final Module module, final Map genCtx, final SchemaContext schemaContext, final boolean verboseClassComments, - final Map> genTypeBuilders, final TypeProvider typeProvider) { - //TODO: implement rest of schema nodes GTO building + final Map> genTypeBuilders, final TypeProvider typeProvider, + final BindingNamespaceType namespaceType) { + if (node != null && typeBuilder != null) { if (node instanceof ContainerSchemaNode) { containerToGenType(module, basePackageName, typeBuilder, childOf, (ContainerSchemaNode) node, - schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); + } else if (node instanceof LeafListSchemaNode) { + resolveLeafListSchemaNode(schemaContext, typeBuilder, (LeafListSchemaNode) node, module, + typeProvider, genCtx, verboseClassComments); } else if (node instanceof LeafSchemaNode) { - resolveLeafSchemaNodeAsMethod(schemaContext, typeBuilder, genCtx, (LeafSchemaNode) node, module, - typeProvider); + resolveLeafSchemaNodeAsMethod("", schemaContext, typeBuilder, genCtx, (LeafSchemaNode) node, module, + typeProvider, verboseClassComments); } else if (node instanceof ListSchemaNode) { listToGenType(module, basePackageName, typeBuilder, childOf, (ListSchemaNode) node, schemaContext, - verboseClassComments, genCtx, genTypeBuilders, typeProvider); + verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); + } else if (node instanceof ChoiceSchemaNode) { + choiceToGenType(module, schemaContext, verboseClassComments, basePackageName, typeBuilder, + (ChoiceSchemaNode) node, genTypeBuilders, genCtx, typeProvider, namespaceType); + } else if (node instanceof AnyXmlSchemaNode || node instanceof AnyDataSchemaNode) { + resolveAnyNodeAsMethod(schemaContext, typeBuilder, genCtx, node, module, typeProvider); } } + } + /** + * Converts choiceNode to the list of generated types for + * choice and its cases. + * + * The package names for choice and for its cases are created as + * concatenation of the module package (basePackageName) and + * names of all parents node. + * + * @param module + * current module + * @param basePackageName + * string with the module package name + * @param parent + * parent type + * @param choiceNode + * choice node which is mapped to generated type. Also child + * nodes - cases are mapped to generated types. + * @throws IllegalArgumentException + *
    + *
  • if basePackageName is null
    • + *
  • if choiceNode is null
    • + *
+ */ + private static void choiceToGenType(final Module module, final SchemaContext schemaContext, final boolean + verboseClasssComments, final String basePackageName, final GeneratedTypeBuilder parent, final + ChoiceSchemaNode choiceNode, final Map> genTypeBuilders, + final Map genCtx, final TypeProvider typeProvider, final BindingNamespaceType namespaceType) { + checkArgument(basePackageName != null, "Base Package Name cannot be NULL."); + checkArgument(choiceNode != null, "Choice Schema Node cannot be NULL."); + + final GeneratedTypeBuilder choiceTypeBuilder = addRawInterfaceDefinition(basePackageName, choiceNode, + schemaContext, "", "", verboseClasssComments, genTypeBuilders, namespaceType, genCtx.get(module)); + constructGetter(parent, choiceNode.getQName().getLocalName(), + choiceNode.getDescription().orElse(null), choiceTypeBuilder, choiceNode.getStatus()); + if (namespaceType.equals(BindingNamespaceType.Data)) { + choiceTypeBuilder.addImplementsType(parameterizedTypeFor(BindingTypes.INSTANTIABLE, choiceTypeBuilder)); + } + annotateDeprecatedIfNecessary(choiceNode.getStatus(), choiceTypeBuilder); + genCtx.get(module).addChildNodeType(choiceNode, choiceTypeBuilder); + generateTypesFromChoiceCases(module, schemaContext, genCtx, basePackageName, choiceTypeBuilder.toInstance(), + choiceNode, verboseClasssComments, typeProvider, genTypeBuilders, namespaceType); } private static void containerToGenType(final Module module, final String basePackageName, final GeneratedTypeBuilder parent, final GeneratedTypeBuilder childOf, final ContainerSchemaNode node, final SchemaContext schemaContext, final boolean verboseClassComments, final Map genCtx, - final Map> genTypeBuilders, final TypeProvider typeProvider) { + final Map> genTypeBuilders, final TypeProvider typeProvider, + final BindingNamespaceType namespaceType) { final GeneratedTypeBuilder genType = processDataSchemaNode(module, basePackageName, childOf, node, - schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); if (genType != null) { - constructGetter(parent, node.getQName().getLocalName(), node.getDescription(), genType, node.getStatus()); + StringBuilder getterName = new StringBuilder(node.getQName().getLocalName()); + constructGetter(parent, getterName.toString(), node.getDescription().orElse(null), genType, node.getStatus()); resolveDataSchemaNodes(module, basePackageName, genType, genType, node.getChildNodes(), genCtx, - schemaContext, verboseClassComments, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); + processUsesImplements(node, module, schemaContext, genCtx, namespaceType); } } private static void listToGenType(final Module module, final String basePackageName, final GeneratedTypeBuilder parent, final GeneratedTypeBuilder childOf, final ListSchemaNode node, final SchemaContext schemaContext, final boolean verboseClassComments, final Map genCtx, - final Map> genTypeBuilders, final TypeProvider typeProvider) { + final Map> genTypeBuilders, final TypeProvider typeProvider, + final BindingNamespaceType namespaceType) { + final GeneratedTypeBuilder genType = processDataSchemaNode(module, basePackageName, childOf, node, - schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); if (genType != null) { final String nodeName = node.getQName().getLocalName(); - constructGetter(parent, nodeName, node.getDescription(), - Types.listTypeFor(genType), node.getStatus()); + + Type getterReturnType = Types.listTypeFor(genType); + if (namespaceType.equals(BindingNamespaceType.Grouping)) { + getterReturnType = Types.listTypeFor(wildcardTypeFor(genType.getPackageName(), genType.getName(), + true, true, null)); + } + constructGetter(parent, nodeName, node.getDescription().orElse(null), getterReturnType, node.getStatus()); + final List listKeys = node.getKeyDefinition(); final String packageName = new StringBuilder(packageNameForGeneratedType(basePackageName, node.getPath(), BindingNamespaceType.Key)).append('.').append(nodeName).toString(); + //FIXME: Is it neccessary to generate interface of key and implemented by class? + if (namespaceType.equals(BindingNamespaceType.Grouping)) { + final GeneratedTypeBuilder genTypeBuilder = resolveListKeyTypeBuilder(packageName, node, genCtx.get(module)); + for (final DataSchemaNode schemaNode : node.getChildNodes()) { + if (resolveDataSchemaNodesCheck(module, schemaContext, schemaNode)) { + addSchemaNodeToListTypeBuilders(nodeName, basePackageName, schemaNode, genType, genTypeBuilder, listKeys, + module, typeProvider, schemaContext, genCtx, genTypeBuilders, verboseClassComments, namespaceType); + } + } + if (genTypeBuilder != null) { + typeBuildersToGenTypes(module, genType, genTypeBuilder.toInstance(), genCtx, namespaceType); + genCtx.get(module).addKeyType(node.getPath(), genTypeBuilder); + } + processUsesImplements(node, module, schemaContext, genCtx, namespaceType); + } else { + final GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, node, genCtx.get(module)); + if (genTOBuilder != null) { + final Type identifiableMarker = Types.parameterizedTypeFor(IDENTIFIABLE, genTOBuilder); + genTOBuilder.addImplementsType(IDENTIFIER); + genType.addImplementsType(identifiableMarker); + genType.addImplementsType(parameterizedTypeFor(BindingTypes.TREE_CHILD_NODE, parent, parameterizedTypeFor + (BindingTypes.IDENTIFIABLE_ITEM, genType, genTOBuilder))); - final GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, node); + } - for (final DataSchemaNode schemaNode : node.getChildNodes()) { - if (!schemaNode.isAugmenting()) { - addSchemaNodeToListBuilders(nodeName, basePackageName, schemaNode, genType, genTOBuilder, listKeys, - module, typeProvider, schemaContext, genCtx, genTypeBuilders, verboseClassComments); + for (final DataSchemaNode schemaNode : node.getChildNodes()) { + if (resolveDataSchemaNodesCheck(module, schemaContext, schemaNode)) { + addSchemaNodeToListBuilders(nodeName, basePackageName, schemaNode, genType, genTOBuilder, listKeys, + module, typeProvider, schemaContext, genCtx, genTypeBuilders, verboseClassComments, namespaceType); + } } - } + processUsesImplements(node, module, schemaContext, genCtx, namespaceType); - // serialVersionUID - if (genTOBuilder != null) { - final GeneratedPropertyBuilder prop = new GeneratedPropertyBuilderImpl("serialVersionUID"); - prop.setValue(Long.toString(computeDefaultSUID(genTOBuilder))); - genTOBuilder.setSUID(prop); + // serialVersionUID + if (genTOBuilder != null) { + final GeneratedPropertyBuilder prop = new GeneratedPropertyBuilderImpl("serialVersionUID"); + prop.setValue(Long.toString(computeDefaultSUID(genTOBuilder))); + genTOBuilder.setSUID(prop); + typeBuildersToGenTypes(module, genType, genTOBuilder.toInstance(), genCtx, namespaceType); + genCtx.get(module).addGeneratedTOBuilder(node.getPath(), genTOBuilder); + } } - - typeBuildersToGenTypes(module, genType, genTOBuilder, genCtx); } } private static void typeBuildersToGenTypes(final Module module, final GeneratedTypeBuilder typeBuilder, - final GeneratedTOBuilder genTOBuilder, final Map genCtx) { + final Type keyType, final Map genCtx, + final BindingNamespaceType namespaceType) { checkArgument(typeBuilder != null, "Generated Type Builder cannot be NULL."); - if (genTOBuilder != null) { - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); - constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", genTO, Status.CURRENT); - genCtx.get(module).addGeneratedTOBuilder(genTOBuilder); + if (keyType != null) { + Type returnKeyType = keyType; + if (namespaceType.equals(BindingNamespaceType.Grouping)) { + returnKeyType = wildcardTypeFor(keyType.getPackageName(), keyType.getName(), + true, true, null); + } + constructGetter(typeBuilder, "identifier", "Returns Primary Key of Yang List Type", returnKeyType, Status.CURRENT); + } } @@ -610,10 +852,10 @@ final class GenHelperUtil { *
  • true - in other cases
    • * */ - private static Type resolveLeafSchemaNodeAsMethod(final SchemaContext schemaContext, final GeneratedTypeBuilder - typeBuilder, final Map genCtx, final LeafSchemaNode leaf, final Module module, - final TypeProvider typeProvider) { - if (leaf == null || typeBuilder == null || leaf.isAddedByUses()) { + private static Type resolveLeafSchemaNodeAsMethod(final String nodeName, final SchemaContext schemaContext, + final GeneratedTypeBuilder typeBuilder, final Map genCtx, final LeafSchemaNode leaf, + final Module module, final TypeProvider typeProvider, final boolean verboseClassComments) { + if (leaf == null || typeBuilder == null) { return null; } @@ -626,9 +868,27 @@ final class GenHelperUtil { Type returnType = null; final TypeDefinition typeDef = leaf.getType(); - if (isInnerType(leaf, typeDef)) { + + if (leaf.isAddedByUses()) { + Preconditions.checkState(leaf instanceof DerivableSchemaNode); + if (isInnerType(leaf, typeDef)) { + final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); + returnType = typeProvider.javaTypeForSchemaDefinitionType(getBaseOrDeclaredType(typeDef), leaf, + restrictions, genCtx.get(module)); + } else { + if (typeDef.getBaseType() == null && (typeDef instanceof EnumTypeDefinition + || typeDef instanceof UnionTypeDefinition || typeDef instanceof BitsTypeDefinition)) { + LeafSchemaNode originalLeaf = (LeafSchemaNode) ((DerivableSchemaNode) leaf).getOriginal().orElse(null); + Preconditions.checkNotNull(originalLeaf); + returnType = genCtx.get(findParentModule(schemaContext, originalLeaf)).getInnerType(typeDef.getPath()); + } else { + final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, restrictions, genCtx.get(module)); + } + } + } else if (isInnerType(leaf, typeDef)) { if (typeDef instanceof EnumTypeDefinition) { - returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf); + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, genCtx.get(module)); final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) typeDef; final EnumBuilder enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leaf.getQName(), genCtx, typeBuilder, module); @@ -638,14 +898,15 @@ final class GenHelperUtil { ((TypeProviderImpl) typeProvider).putReferencedType(leaf.getPath(), returnType); } else if (typeDef instanceof UnionTypeDefinition) { final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leaf, parentModule, - typeProvider, schemaContext); + typeProvider, schemaContext, genCtx.get(module), genCtx); if (genTOBuilder != null) { //TODO: https://bugs.opendaylight.org/show_bug.cgi?id=2289 - returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule, typeProvider); + returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule, + typeProvider, verboseClassComments); } } else if (typeDef instanceof BitsTypeDefinition) { final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leaf, parentModule, - typeProvider, schemaContext); + typeProvider, schemaContext, genCtx.get(module), genCtx); if (genTOBuilder != null) { returnType = genTOBuilder.toInstance(); } @@ -656,11 +917,11 @@ final class GenHelperUtil { // and apply restrictions from leaf type final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); returnType = typeProvider.javaTypeForSchemaDefinitionType(getBaseOrDeclaredType(typeDef), leaf, - restrictions); + restrictions, genCtx.get(module)); } } else { final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); - returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, restrictions); + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, restrictions, genCtx.get(module)); } if (returnType == null) { @@ -671,13 +932,190 @@ final class GenHelperUtil { ((TypeProviderImpl) typeProvider).putReferencedType(leaf.getPath(), returnType); } - String leafDesc = leaf.getDescription(); - if (leafDesc == null) { - leafDesc = ""; + final String leafGetterName; + if ("key".equals(leafName.toLowerCase())) { + StringBuilder sb = new StringBuilder(leafName) + .append('_').append("RESERVED_WORD"); + leafGetterName = sb.toString(); + } else { + leafGetterName = leafName; + } + constructGetter(typeBuilder, leafGetterName, leaf.getDescription().orElse(""), returnType, leaf.getStatus()); + return returnType; + } + + /** + * Converts node leaf list schema node to getter method of + * typeBuilder. + * + * @param typeBuilder + * generated type builder to which is node added as + * getter method + * @param node + * leaf list schema node which is added to + * typeBuilder as getter method + * @param module module + * @param typeProvider type provider instance + * @param genCtx actual generated context + * @return boolean value + *
      + *
    • true - if node, typeBuilder, + * nodeName equal null or node is added by uses
      • + *
    • false - other cases
      • + *
    + */ + private static boolean resolveLeafListSchemaNode(final SchemaContext schemaContext, final GeneratedTypeBuilder + typeBuilder, final LeafListSchemaNode node, final Module module, final TypeProvider typeProvider, + final Map genCtx, final boolean verboseClassComments) { + if (node == null || typeBuilder == null) { + return false; } - constructGetter(typeBuilder, leafName, leafDesc, returnType, leaf.getStatus()); - genCtx.get(module).addChildNodeType(leaf, typeBuilder); + final QName nodeName = node.getQName(); + + final TypeDefinition typeDef = node.getType(); + final Module parentModule = findParentModule(schemaContext, node); + + Type returnType = null; + if (typeDef.getBaseType() == null) { + if (typeDef instanceof EnumTypeDefinition) { + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, genCtx.get(module)); + final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) typeDef; + final EnumBuilder enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, nodeName, + genCtx, typeBuilder, module); + returnType = new ReferencedTypeImpl(enumBuilder.getPackageName(), enumBuilder.getName(), true, + null); + ((TypeProviderImpl) typeProvider).putReferencedType(node.getPath(), returnType); + } else if (typeDef instanceof UnionTypeDefinition) { + final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule, + typeProvider, schemaContext, genCtx.get(module), genCtx); + if (genTOBuilder != null) { + returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule, + typeProvider, verboseClassComments); + } + } else if (typeDef instanceof BitsTypeDefinition) { + final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule, + typeProvider, schemaContext, genCtx.get(module), genCtx); + returnType = genTOBuilder.toInstance(); + } else { + final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions, genCtx.get(module)); + } + } else { + final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions, genCtx.get(module)); + } + + final ParameterizedType listType = Types.listTypeFor(returnType); + constructGetter(typeBuilder, nodeName.getLocalName(), node.getDescription().orElse(null), listType, node.getStatus()); + return true; + } + + /** + * Converts caseNodes set to list of corresponding generated + * types. + * + * For every case which isn't added through augment or uses is + * created generated type builder. The package names for the builder is + * created as concatenation of the module package ( + * basePackageName) and names of all parents nodes of the + * concrete case. There is also relation "implements type" + * between every case builder and choice type + * + * @param module + * current module + * @param schemaContext + * current schema context + * @param genCtx + * actual generated context + * @param basePackageName + * string with the module package name + * @param refChoiceType + * type which represents superior case + * @param choiceNode + * choice case node which is mapped to generated type + * @param verboseClassComments + * Javadoc verbosity switch + * @throws IllegalArgumentException + *
      + *
    • if basePackageName equals null
      • + *
    • if refChoiceType equals null
      • + *
    • if caseNodes equals null
      • + *
    + */ + private static void generateTypesFromChoiceCases(final Module module, final SchemaContext schemaContext, + final Map genCtx, final String basePackageName, final Type refChoiceType, + final ChoiceSchemaNode choiceNode, final boolean verboseClassComments, final TypeProvider typeProvider, + final Map> genTypeBuilders, final BindingNamespaceType namespaceType) { + checkArgument(basePackageName != null, "Base Package Name cannot be NULL."); + checkArgument(refChoiceType != null, "Referenced Choice Type cannot be NULL."); + checkArgument(choiceNode != null, "ChoiceNode cannot be NULL."); + + for (final CaseSchemaNode caseNode : choiceNode.getCases().values()) { + if (caseNode != null && resolveDataSchemaNodesCheck(module, schemaContext, caseNode)) { + final GeneratedTypeBuilder caseTypeBuilder = addDefaultInterfaceDefinition(basePackageName, caseNode, + module, genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); + caseTypeBuilder.addImplementsType(refChoiceType); + caseTypeBuilder.setParentTypeForBuilder(refChoiceType); + annotateDeprecatedIfNecessary(caseNode.getStatus(), caseTypeBuilder); + genCtx.get(module).addCaseType(caseNode.getPath(), caseTypeBuilder); + genCtx.get(module).addChoiceToCaseMapping(refChoiceType, caseTypeBuilder, caseNode); + final Iterable caseChildNodes = caseNode.getChildNodes(); + if (caseChildNodes != null) { + final SchemaPath choiceNodeParentPath = choiceNode.getPath().getParent(); + + if (!Iterables.isEmpty(choiceNodeParentPath.getPathFromRoot())) { + SchemaNode parent = findDataSchemaNode(schemaContext, choiceNodeParentPath); + + if (parent instanceof AugmentationSchemaNode) { + final AugmentationSchemaNode augSchema = (AugmentationSchemaNode) parent; + final SchemaPath targetPath = augSchema.getTargetPath(); + SchemaNode targetSchemaNode = findDataSchemaNode(schemaContext, targetPath); + if (targetSchemaNode instanceof DataSchemaNode + && ((DataSchemaNode) targetSchemaNode).isAddedByUses()) { + if (targetSchemaNode instanceof DerivableSchemaNode) { + targetSchemaNode = ((DerivableSchemaNode) targetSchemaNode).getOriginal().orElse(null); + } + if (targetSchemaNode == null) { + throw new IllegalStateException( + "Failed to find target node from grouping for augmentation " + augSchema + + " in module " + module.getName()); + } + } + parent = targetSchemaNode; + } + + Preconditions.checkState(parent != null, "Could not find Choice node parent %s", + choiceNodeParentPath); + GeneratedTypeBuilder childOfType = findChildNodeByPath(parent.getPath(), genCtx); + if (childOfType == null) { + childOfType = findGroupingByPath(parent.getPath(), genCtx); + } + resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType, caseChildNodes, + genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); + } else { + final GeneratedTypeBuilder moduleType = genCtx.get(module).getModuleNode(); + Preconditions.checkNotNull(moduleType, "Module type can not be null."); + resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, moduleType, caseChildNodes, + genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); + } + processUsesImplements(caseNode, module, schemaContext, genCtx, namespaceType); + } + } + } + } + + private static Type resolveAnyNodeAsMethod(final SchemaContext schemaContext, final GeneratedTypeBuilder + typeBuilder, final Map genCtx, final DataSchemaNode node, final Module module, + final TypeProvider typeProvider) { + + final String anyName = node.getQName().getLocalName(); + if (anyName == null) { + return null; + } + + Type returnType = Types.DOCUMENT; + constructGetter(typeBuilder, anyName, node.getDescription().orElse(""), returnType, node.getStatus()); return returnType; } @@ -721,78 +1159,130 @@ final class GenHelperUtil { final DataSchemaNode schemaNode, final GeneratedTypeBuilder typeBuilder, final GeneratedTOBuilder genTOBuilder, final List listKeys, final Module module, final TypeProvider typeProvider, final SchemaContext schemaContext, final Map genCtx, - final Map> genTypeBuilders, final boolean verboseClassComments) { + final Map> genTypeBuilders, final boolean verboseClassComments, + final BindingNamespaceType namespaceType) { checkArgument(schemaNode != null, "Data Schema Node cannot be NULL."); checkArgument(typeBuilder != null, "Generated Type Builder cannot be NULL."); if (schemaNode instanceof LeafSchemaNode) { final LeafSchemaNode leaf = (LeafSchemaNode) schemaNode; final QName leafQName = leaf.getQName(); - final String leafName = leafQName.getLocalName(); - String leafPckgName = basePackageName; - boolean isKeyPart = false; + + final Type type = resolveLeafSchemaNodeAsMethod(nodeName, schemaContext, typeBuilder, genCtx, leaf, module, + typeProvider, verboseClassComments); if (listKeys.contains(leafQName)) { - leafPckgName = new StringBuilder(leafPckgName).append('.').append(BindingNamespaceType.Key).append('.') - .append(nodeName).toString(); - isKeyPart = true; - } else { - leafPckgName = new StringBuilder(leafPckgName).append('.').append(BindingNamespaceType.Data).append('.') - .append(nodeName).toString(); + if (type == null) { + resolveLeafSchemaNodeAsProperty(nodeName, schemaContext, typeProvider, genCtx, genTOBuilder, leaf, true, + module); + } else { + AuxiliaryGenUtils.resolveLeafSchemaNodeAsProperty(nodeName, genTOBuilder, leaf, type, true); + } } + } else { + if (schemaNode instanceof LeafListSchemaNode) { + resolveLeafListSchemaNode(schemaContext, typeBuilder, (LeafListSchemaNode) schemaNode, module, + typeProvider, genCtx, verboseClassComments); + } else if (schemaNode instanceof ContainerSchemaNode) { + containerToGenType(module, basePackageName, typeBuilder, typeBuilder, (ContainerSchemaNode) schemaNode, + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); + } else if (schemaNode instanceof ListSchemaNode) { + listToGenType(module, basePackageName, typeBuilder, typeBuilder, (ListSchemaNode) schemaNode, + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); + } else if (schemaNode instanceof ChoiceSchemaNode) { + choiceToGenType(module, schemaContext, verboseClassComments, basePackageName, typeBuilder, + (ChoiceSchemaNode) schemaNode, genTypeBuilders, genCtx, typeProvider, namespaceType); + } + } + } - final String leafGTOName = new StringBuilder(nodeName).append('_').append(leafName).toString(); - final GeneratedTypeBuilder leafGTp = new GeneratedTypeBuilderImpl(leafPckgName, leafGTOName); - resolveLeafSchemaNodeAsMethod(schemaContext, leafGTp, genCtx, leaf, module, - typeProvider); - - constructGetter(typeBuilder, leafGTOName, schemaNode.getDescription(), leafGTp, Status.CURRENT); + private static void addSchemaNodeToListTypeBuilders(final String nodeName, final String basePackageName, + final DataSchemaNode schemaNode, final GeneratedTypeBuilder typeBuilder, + final GeneratedTypeBuilder genTypeBuilder, final List listKeys, final Module module, + final TypeProvider typeProvider, final SchemaContext schemaContext, final Map genCtx, + final Map> genTypeBuilders, final boolean verboseClassComments, + final BindingNamespaceType namespaceType) { + checkArgument(schemaNode != null, "Data Schema Node cannot be NULL."); + checkArgument(typeBuilder != null, "Generated Type Builder cannot be NULL."); - if (isKeyPart) { - AuxiliaryGenUtils.resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, leafGTp, true); + if (schemaNode instanceof LeafSchemaNode) { + final LeafSchemaNode leaf = (LeafSchemaNode) schemaNode; + final QName leafQName = leaf.getQName(); + final Type type = resolveLeafSchemaNodeAsMethod(nodeName, schemaContext, typeBuilder, genCtx, leaf, module, + typeProvider, verboseClassComments); + if (listKeys.contains(leafQName)) { + resolveLeafSchemaNodeAsMethod(nodeName, schemaContext, genTypeBuilder, genCtx, leaf, module, + typeProvider, verboseClassComments); } - } else if (!schemaNode.isAddedByUses()) { - //TODO: implement leaf list to generated type - //TODO: implement choice to generated type - if (schemaNode instanceof ContainerSchemaNode) { + } else { + if (schemaNode instanceof LeafListSchemaNode) { + resolveLeafListSchemaNode(schemaContext, typeBuilder, (LeafListSchemaNode) schemaNode, module, + typeProvider, genCtx, verboseClassComments); + } else if (schemaNode instanceof ContainerSchemaNode) { containerToGenType(module, basePackageName, typeBuilder, typeBuilder, (ContainerSchemaNode) schemaNode, - schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); } else if (schemaNode instanceof ListSchemaNode) { listToGenType(module, basePackageName, typeBuilder, typeBuilder, (ListSchemaNode) schemaNode, - schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider); + schemaContext, verboseClassComments, genCtx, genTypeBuilders, typeProvider, namespaceType); + } else if (schemaNode instanceof ChoiceSchemaNode) { + choiceToGenType(module, schemaContext, verboseClassComments, basePackageName, typeBuilder, + (ChoiceSchemaNode) schemaNode, genTypeBuilders, genCtx, typeProvider, namespaceType); } } } + private static boolean resolveLeafSchemaNodeAsProperty(final String nodeName, final SchemaContext schemaContext, final TypeProvider + typeProvider, final Map genCtx, final GeneratedTOBuilder + toBuilder, final LeafSchemaNode leaf, final boolean isReadOnly, final Module module) { + + if (leaf != null && toBuilder != null) { + Type returnType; + final TypeDefinition typeDef = leaf.getType(); + if (typeDef instanceof UnionTypeDefinition) { + // GeneratedType for this type definition should be already + // created + final QName qname = typeDef.getQName(); + final Module unionModule = schemaContext.findModule(qname.getModule()).get(); + final ModuleContext mc = genCtx.get(unionModule); + returnType = mc.getTypedefs().get(typeDef.getPath()); + } else if (typeDef instanceof EnumTypeDefinition && typeDef.getBaseType() == null) { + // Annonymous enumeration (already generated, since it is inherited via uses). + LeafSchemaNode originalLeaf = (LeafSchemaNode) SchemaNodeUtils.getRootOriginalIfPossible(leaf); + QName qname = originalLeaf.getQName(); + final Module enumModule = schemaContext.findModule(qname.getModule()).orElse(null); + returnType = genCtx.get(enumModule).getInnerType(originalLeaf.getType().getPath()); + } else { + returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, genCtx.get(module)); + } + return AuxiliaryGenUtils.resolveLeafSchemaNodeAsProperty(nodeName, toBuilder, leaf, returnType, isReadOnly); + } + return false; + } + private static TypeDefinition getBaseOrDeclaredType(final TypeDefinition typeDef) { final TypeDefinition baseType = typeDef.getBaseType(); - return (baseType != null && baseType.getBaseType() != null) ? baseType : typeDef; + return baseType != null && baseType.getBaseType() != null ? baseType : typeDef; } @SuppressWarnings({ "rawtypes", "unchecked" }) private static GeneratedTypeBuilder processDataSchemaNode(final Module module, final String basePackageName, final GeneratedTypeBuilder childOf, final DataSchemaNode node, final SchemaContext schemaContext, - final boolean verboseClassComments, Map genCtx, final Map> genTypeBuilders, final TypeProvider typeProvider) { + final boolean verboseClassComments, final Map genCtx, final Map> genTypeBuilders, final TypeProvider typeProvider, final BindingNamespaceType namespaceType) { - if (node.isAugmenting() || node.isAddedByUses()) { - return null; - } - final String packageName = packageNameForGeneratedType(basePackageName, node.getPath(), BindingNamespaceType.Data); - final GeneratedTypeBuilder genType = addDefaultInterfaceDefinition(packageName, node, childOf, module, - genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider); - genType.addComment(node.getDescription()); + final GeneratedTypeBuilder genType = addDefaultInterfaceDefinition(basePackageName, node, childOf, module, + genCtx, schemaContext, verboseClassComments, genTypeBuilders, typeProvider, namespaceType); annotateDeprecatedIfNecessary(node.getStatus(), genType); - genType.setDescription(createDescription(node, genType.getFullyQualifiedName(), schemaContext, verboseClassComments)); genType.setModuleName(module.getName()); - genType.setReference(node.getReference()); + if (verboseClassComments) { + genType.setYangSourceDefinition(YangSourceDefinition.of(module, node)); + TypeComments.description(node).ifPresent(genType::addComment); + node.getDescription().ifPresent(genType::setDescription); + node.getReference().ifPresent(genType::setReference); + } genType.setSchemaPath((List) node.getPath().getPathFromRoot()); genType.setParentTypeForBuilder(childOf); if (node instanceof DataNodeContainer) { genCtx.get(module).addChildNodeType(node, genType); - genCtx = groupingsToGenTypes(module, ((DataNodeContainer) node).getGroupings(), genCtx, schemaContext, - verboseClassComments, genTypeBuilders, typeProvider); - processUsesAugments(schemaContext, (DataNodeContainer) node, module, genCtx, genTypeBuilders, - verboseClassComments, typeProvider); } return genType; } @@ -822,7 +1312,7 @@ final class GenHelperUtil { */ static Map groupingsToGenTypes(final Module module, final Collection groupings, Map genCtx, final SchemaContext schemaContext, final boolean - verboseClassComments, Map> genTypeBuilders, final TypeProvider typeProvider) { + verboseClassComments, final Map> genTypeBuilders, final TypeProvider typeProvider) { final String basePackageName = BindingMapping.getRootPackageName(module); final List groupingsSortedByDependencies = new GroupingDefinitionDependencySort() .sort(groupings); @@ -860,18 +1350,92 @@ final class GenHelperUtil { */ private static Map groupingToGenType(final String basePackageName, final GroupingDefinition grouping, final Module module, Map genCtx, final SchemaContext schemaContext, final boolean - verboseClassComments, Map> genTypeBuilders, final TypeProvider typeProvider) { - final String packageName = packageNameForGeneratedType(basePackageName, grouping.getPath(), BindingNamespaceType.Grouping); - final GeneratedTypeBuilder genType = addDefaultInterfaceDefinition(packageName, grouping, module, genCtx, - schemaContext, verboseClassComments, genTypeBuilders, typeProvider); + verboseClassComments, final Map> genTypeBuilders, final TypeProvider typeProvider) { + final GeneratedTypeBuilder genType = addDefaultInterfaceDefinition(basePackageName, grouping, module, genCtx, + schemaContext, verboseClassComments, genTypeBuilders, typeProvider, BindingNamespaceType.Grouping); annotateDeprecatedIfNecessary(grouping.getStatus(), genType); - genCtx.get(module).addGroupingType(grouping.getPath(), genType); + genCtx.get(module).addGroupingType(grouping, genType); resolveDataSchemaNodes(module, basePackageName, genType, genType, grouping.getChildNodes(), genCtx, - schemaContext, verboseClassComments, genTypeBuilders, typeProvider); - genCtx = groupingsToGenTypes(module, grouping.getGroupings(), genCtx, schemaContext, verboseClassComments, - genTypeBuilders, typeProvider); - genCtx = processUsesAugments(schemaContext, grouping, module, genCtx, genTypeBuilders, verboseClassComments, - typeProvider); + schemaContext, verboseClassComments, genTypeBuilders, typeProvider, BindingNamespaceType.Grouping); + genCtx = processUsesImplements(grouping, module, schemaContext, genCtx, BindingNamespaceType.Grouping); return genCtx; } + + /** + * //TODO: add information about multiple base identities in YANG 1.1 + * Converts the identity object to GeneratedType. Firstly it is + * created transport object builder. If identity contains base identity then + * reference to base identity is added to superior identity as its extend. + * If identity doesn't contain base identity then only reference to abstract + * class {@link org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode + * BaseIdentity} is added + * + * @param module + * current module + * @param basePackageName + * string contains the module package name + * @param identity + * IdentitySchemaNode which contains data about identity + * @param schemaContext + * SchemaContext which is used to get package and name + * information about base of identity + * @param genCtx generated context + * @return returns generated context + */ + static Map identityToGenType(final Module module, final String basePackageName, + final IdentitySchemaNode identity, final SchemaContext schemaContext, final Map genCtx, + final boolean verboseClassComments) { + + resolveIdentitySchemaNode(basePackageName, schemaContext, identity, module, verboseClassComments, genCtx); + return genCtx; + } + + private static GeneratedTOBuilder resolveIdentitySchemaNode(final String basePackageName, final SchemaContext schemaContext, + final IdentitySchemaNode identity, final Module module, final boolean verboseClassComments, + final Map genCtx) { + Preconditions.checkNotNull(identity,"Identity can not be null!"); + + //check first if identity has been resolved as base identity of some other one + GeneratedTOBuilder newType = findIdentityByQname(identity.getQName(), genCtx); + if (newType == null) { + final Module parentModule = SchemaContextUtil.findParentModule(schemaContext, identity); + Preconditions.checkState(module.equals(parentModule), + "If the type is null ,it must be in the same module, otherwise it must has been" + + "resolved by an imported module."); + + final String packageName = BindingGeneratorUtil.packageNameForGeneratedType(basePackageName, identity.getPath(), + BindingNamespaceType.Identity); + newType = new GeneratedTOBuilderImpl(packageName, identity.getQName().getLocalName(), true, false, + genCtx.get(module)); + + final Set baseIdentities = identity.getBaseIdentities(); + if (baseIdentities.size() == 0) { + //no base - abstract + final GeneratedTOBuilderImpl gto = new GeneratedTOBuilderImpl(BaseIdentity.class.getPackage().getName(), + BaseIdentity.class.getSimpleName(), genCtx.get(module)); + newType.setExtendsType(gto.toInstance()); + } else { + //one base - inheritance + final IdentitySchemaNode baseIdentity = baseIdentities.iterator().next(); + GeneratedTOBuilder baseType = resolveIdentitySchemaNode(basePackageName, schemaContext, + baseIdentity, module, verboseClassComments, genCtx); + newType.setExtendsType(baseType.toInstance()); + } + + newType.setAbstract(true); + + if (verboseClassComments) { + newType.setYangSourceDefinition(YangSourceDefinition.of(module)); + TypeComments.description(module).ifPresent(newType::addComment); + module.getDescription().ifPresent(newType::setDescription); + module.getReference().ifPresent(newType::setReference); + } + newType.setSchemaPath((List) identity.getPath().getPathFromRoot()); + + qNameConstant(newType, BindingMapping.QNAME_STATIC_FIELD_NAME, identity.getQName()); + + genCtx.get(module).addIdentityType(identity.getQName(), newType); + } + return newType; + } }