/*
- * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2017 Pantheon Technologies s.r.o. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.mdsal.binding.javav2.generator.impl;
+package org.opendaylight.mdsal.binding.javav2.generator.context;
import com.google.common.annotations.Beta;
+import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
private final BiMap<Type,ChoiceCaseNode> caseTypeToSchema = HashBiMap.create();
private final Map<SchemaPath, Type> innerTypes = new HashMap<>();
private final Map<SchemaPath,GeneratedTypeBuilder> keyTypes = new HashMap<>();
+ //map is getting manipulated based on unique YANG module namespace rule
+ private final ListMultimap<String, String> packagesMap = Multimaps.synchronizedListMultimap
+ (ArrayListMultimap.create());
- List<Type> getGeneratedTypes() {
+ public List<Type> getGeneratedTypes() {
final List<Type> result = new ArrayList<>();
if (this.moduleNode != null) {
return Collections.unmodifiableMap(this.typeToSchema);
}
- protected void addTypeToSchema(final Type type, final TypeDefinition<?> typedef) {
+ public void addTypeToSchema(final Type type, final TypeDefinition<?> typedef) {
this.typeToSchema.put(type, typedef);
}
* @param path
* @param enumBuilder
*/
- void addInnerTypedefType(final SchemaPath path, final EnumBuilder enumBuilder) {
+ public void addInnerTypedefType(final SchemaPath path, final EnumBuilder enumBuilder) {
this.innerTypes.put(path, enumBuilder);
}
}
- void addKeyType(final SchemaPath path, final GeneratedTypeBuilder genType) {
+ public void addKeyType(final SchemaPath path, final GeneratedTypeBuilder genType) {
this.keyTypes.put(path, genType);
}
public GeneratedTOBuilder getKeyGenTO(final SchemaPath path) {
return this.genTOs.get(path);
}
+
+ public ListMultimap<String, String> getPackagesMap() {
+ return Multimaps.unmodifiableListMultimap(packagesMap);
+ }
+
+ public void putToPackagesMap(final String packageName, final String actualClassName) {
+ this.packagesMap.put(packageName, actualClassName);
+ }
+
+ public void cleanPackagesMap() {
+ this.packagesMap.clear();
+ }
}
package org.opendaylight.mdsal.binding.javav2.generator.spi;
import com.google.common.annotations.Beta;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions;
import org.opendaylight.mdsal.binding.javav2.model.api.Type;
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
* @param parentNode parent node
* @return Resolved Type
*/
- Type javaTypeForSchemaDefinitionType(TypeDefinition<?> type, SchemaNode parentNode);
+ Type javaTypeForSchemaDefinitionType(TypeDefinition<?> type, SchemaNode parentNode, ModuleContext context);
/**
*
* @param restrictions restrictions applied to given type definition
* @return Resolved Type
*/
- Type javaTypeForSchemaDefinitionType(TypeDefinition<?> type, SchemaNode parentNode, Restrictions restrictions);
+ Type javaTypeForSchemaDefinitionType(TypeDefinition<?> type, SchemaNode parentNode, Restrictions restrictions,
+ ModuleContext context);
/**
* Returns string containing code for creation of new type instance.
import com.google.common.annotations.Beta;
import java.util.List;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.Constant;
import org.opendaylight.mdsal.binding.javav2.model.api.Type;
import org.opendaylight.yangtools.yang.common.QName;
* Enumeration Name
* @return <code>new</code> instance of Enumeration Builder.
*/
- EnumBuilder addEnumeration(String name);
+ EnumBuilder addEnumeration(String name, ModuleContext context);
/**
* Sets parent type for data schema node node builder
import java.util.Map.Entry;
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.model.api.Type;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.impl.txt.yangTemplateForModule;
import org.opendaylight.mdsal.binding.javav2.generator.impl.txt.yangTemplateForNode;
import org.opendaylight.mdsal.binding.javav2.generator.impl.txt.yangTemplateForNodes;
* <code>enumTypeDef</code>
*/
static EnumBuilder resolveInnerEnumFromTypeDefinition(final EnumTypeDefinition enumTypeDef, final QName enumName,
- final Map<Module, ModuleContext> genCtx, final GeneratedTypeBuilder typeBuilder, final Module module) {
+ final Map<Module, ModuleContext> genCtx, final GeneratedTypeBuilder typeBuilder, final Module module) {
if (enumTypeDef != null && typeBuilder != null && enumTypeDef.getQName().getLocalName() != null) {
- final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumName.getLocalName());
+ final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumName.getLocalName(), genCtx.get(module));
final String enumTypedefDescription = encodeAngleBrackets(enumTypeDef.getDescription());
enumBuilder.setDescription(enumTypedefDescription);
enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);
*/
static GeneratedTOBuilder addTOToTypeBuilder(final TypeDefinition<?> typeDef, final GeneratedTypeBuilder
typeBuilder, final DataSchemaNode leaf, final Module parentModule, final TypeProvider typeProvider,
- final SchemaContext schemaContext) {
+ final SchemaContext schemaContext, ModuleContext context) {
final String classNameFromLeaf = leaf.getQName().getLocalName();
GeneratedTOBuilder genTOBuilder = null;
final String packageName = typeBuilder.getFullyQualifiedName();
genTOBuilder = ((TypeProviderImpl) typeProvider)
.provideGeneratedTOBuilderForUnionTypeDef(packageName, ((UnionTypeDefinition) typeDef),
classNameFromLeaf, leaf, schemaContext,
- ((TypeProviderImpl) typeProvider).getGenTypeDefsContextMap());
+ ((TypeProviderImpl) typeProvider).getGenTypeDefsContextMap(), context);
} else if (typeDef instanceof BitsTypeDefinition) {
genTOBuilder = (((TypeProviderImpl) typeProvider)).provideGeneratedTOBuilderForBitsTypeDefinition(
- packageName, typeDef, classNameFromLeaf, parentModule.getName());
+ packageName, typeDef, classNameFromLeaf, parentModule.getName(), context);
}
if (genTOBuilder != null) {
typeBuilder.addEnclosingTransferObject(genTOBuilder);
* <code>list</code> or empty TO builder if <code>list</code> is null or list of
* key definitions is null or empty.
*/
- static GeneratedTOBuilder resolveListKeyTOBuilder(final String packageName, final ListSchemaNode list) {
+ static GeneratedTOBuilder resolveListKeyTOBuilder(final String packageName, final ListSchemaNode list,
+ ModuleContext context) {
GeneratedTOBuilder genTOBuilder = null;
if ((list.getKeyDefinition() != null) && (!list.getKeyDefinition().isEmpty())) {
// underscore used as separator for distinction of class name parts
final String genTOName =
new StringBuilder(list.getQName().getLocalName()).append('_').append(BindingNamespaceType.Key)
.toString();
- genTOBuilder = new GeneratedTOBuilderImpl(packageName, genTOName);
+ genTOBuilder = new GeneratedTOBuilderImpl(packageName, genTOName, context);
}
return genTOBuilder;
}
- static GeneratedTypeBuilder resolveListKeyTypeBuilder(final String packageName, final ListSchemaNode list) {
+ static GeneratedTypeBuilder resolveListKeyTypeBuilder(final String packageName, final ListSchemaNode list,
+ ModuleContext context) {
GeneratedTypeBuilder genTypeBuilder = null;
if ((list.getKeyDefinition() != null) && (!list.getKeyDefinition().isEmpty())) {
// underscore used as separator for distinction of class name parts
final String genTOName =
new StringBuilder(list.getQName().getLocalName()).append('_').append(BindingNamespaceType.Key)
.toString();
- genTypeBuilder = new GeneratedTypeBuilderImpl(packageName, genTOName);
+ genTypeBuilder = new GeneratedTypeBuilderImpl(packageName, genTOName, context);
}
return genTypeBuilder;
}
import java.util.Map;
import java.util.Set;
import org.opendaylight.mdsal.binding.javav2.generator.api.BindingGenerator;
+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.yang.types.TypeProviderImpl;
import org.opendaylight.mdsal.binding.javav2.model.api.Type;
Preconditions.checkArgument(modules != null, "Set of Modules cannot be NULL.");
this.typeProvider = new TypeProviderImpl(context);
- final Module[] modulesArray = new Module[context.getModules().size()];
- context.getModules().toArray(modulesArray);
- final List<Module> contextModules = ModuleDependencySort.sort(modulesArray);
+ final List<Module> contextModules = ModuleDependencySort.sort(context.getModules());
this.genTypeBuilders = new HashMap<>();
for (final Module contextModule : contextModules) {
this.genCtx = ModuleToGenType.generate(contextModule, this.genTypeBuilders, context, this.typeProvider,
this.genCtx, this.verboseClassComments);
+ this.genCtx.get(contextModule).cleanPackagesMap();
}
for (final Module contextModule : contextModules) {
this.genCtx = AugmentToGenType.generate(contextModule, context, this.typeProvider, this.genCtx,
this.genTypeBuilders, this.verboseClassComments);
+ this.genCtx.get(contextModule).cleanPackagesMap();
}
final List<Type> filteredGenTypes = new ArrayList<>();
import java.util.List;
import java.util.Map;
import java.util.Set;
+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;
static GeneratedTypeBuilder moduleToDataType(final Module module, final Map<Module, ModuleContext> 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());
* if <code>module</code> is null
*/
static GeneratedTypeBuilder moduleTypeBuilder(final Module module, final String postfix, final boolean
- verboseClassComments) {
+ verboseClassComments, 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);
+ final GeneratedTypeBuilderImpl moduleBuilder = new GeneratedTypeBuilderImpl(packageName, moduleName, context);
moduleBuilder.setDescription(createDescription(module, verboseClassComments));
moduleBuilder.setReference(module.getReference());
moduleBuilder.setModuleName(moduleName);
if (!schemaNode.isAugmenting()) {
return true;
} else if (schemaNode.isAugmenting()) {
- Preconditions.checkState(schemaNode instanceof ModelStatement<?>);
QName qname = schemaNode.getPath().getLastComponent();
final Module originalModule = schemaContext.findModuleByNamespaceAndRevision(qname.getNamespace(),
qname.getRevision());
}
GeneratedTypeBuilderImpl augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augIdentifier,
- true, false);
+ true, false, genCtx.get(module));
augTypeBuilder.addImplementsType(BindingTypes.TREE_NODE);
augTypeBuilder.addImplementsType(parameterizedTypeFor(BindingTypes.INSTANTIABLE, augTypeBuilder));
}
GeneratedTypeBuilder it = addRawInterfaceDefinition(basePackageName, schemaNode, schemaContext, "", suffix,
- verboseClassComments, genTypeBuilders, namespaceType);
+ verboseClassComments, genTypeBuilders, namespaceType, genCtx.get(module));
if (namespaceType.equals(BindingNamespaceType.Data)) {
if (parent == null) {
it.addImplementsType(BindingTypes.TREE_NODE);
static GeneratedTypeBuilder addRawInterfaceDefinition(final String basePackageName, final SchemaNode schemaNode,
final SchemaContext schemaContext, final String prefix, final String suffix,
final boolean verboseClassComments, final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders,
- final BindingNamespaceType namespaceType) {
+ final BindingNamespaceType namespaceType, ModuleContext context) {
Preconditions.checkArgument(schemaNode != null, "Data Schema Node cannot be NULL.");
Preconditions.checkArgument(basePackageName != null, "Base package Name for Generated Type cannot be NULL.");
}
final String packageName = packageNameForGeneratedType(basePackageName, schemaNode.getPath(), namespaceType);
- final GeneratedTypeBuilderImpl newType = new GeneratedTypeBuilderImpl(packageName, schemaNodeName);
+ 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());
checkArgument(choiceNode != null, "Choice Schema Node cannot be NULL.");
final GeneratedTypeBuilder choiceTypeBuilder = addRawInterfaceDefinition(basePackageName, choiceNode,
- schemaContext, "", "", verboseClasssComments, genTypeBuilders, namespaceType);
+ schemaContext, "", "", verboseClasssComments, genTypeBuilders, namespaceType, genCtx.get(module));
constructGetter(parent, choiceNode.getQName().getLocalName(),
choiceNode.getDescription(), choiceTypeBuilder, choiceNode.getStatus());
if (namespaceType.equals(BindingNamespaceType.Data)) {
Type getterReturnType = Types.listTypeFor(genType);
if (namespaceType.equals(BindingNamespaceType.Grouping)) {
getterReturnType = Types.listTypeFor(wildcardTypeFor(genType.getPackageName(), genType.getName(),
- true, true));
+ true, true, null));
}
constructGetter(parent, nodeName, node.getDescription(), getterReturnType, node.getStatus());
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);
+ 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,
genCtx.get(module).addKeyType(node.getPath(), genTypeBuilder);
}
} else {
- final GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, node);
+ final GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, node, genCtx.get(module));
for (final DataSchemaNode schemaNode : node.getChildNodes()) {
if (resolveDataSchemaNodesCheck(module, schemaContext, schemaNode)) {
addSchemaNodeToListBuilders(nodeName, basePackageName, schemaNode, genType, genTOBuilder, listKeys,
Type returnKeyType = keyType;
if (namespaceType.equals(BindingNamespaceType.Grouping)) {
returnKeyType = wildcardTypeFor(keyType.getPackageName(), keyType.getName(),
- true, true);
+ true, true, null);
}
constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", returnKeyType, Status.CURRENT);
final TypeDefinition<?> typeDef = leaf.getType();
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);
((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));
if (genTOBuilder != null) {
//TODO: https://bugs.opendaylight.org/show_bug.cgi?id=2289
returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule, typeProvider);
}
} else if (typeDef instanceof BitsTypeDefinition) {
final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leaf, parentModule,
- typeProvider, schemaContext);
+ typeProvider, schemaContext, genCtx.get(module));
if (genTOBuilder != null) {
returnType = genTOBuilder.toInstance();
}
// 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) {
Type returnType = null;
if (typeDef.getBaseType() == null) {
if (typeDef instanceof EnumTypeDefinition) {
- returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node);
+ 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());
+ returnType = new ReferencedTypeImpl(enumBuilder.getPackageName(), enumBuilder.getName(),
+ genCtx.get(module));
((TypeProviderImpl) typeProvider).putReferencedType(node.getPath(), returnType);
} else if (typeDef instanceof UnionTypeDefinition) {
final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule,
- typeProvider, schemaContext);
+ typeProvider, schemaContext, genCtx.get(module));
if (genTOBuilder != null) {
returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule, typeProvider);
}
} else if (typeDef instanceof BitsTypeDefinition) {
final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule,
- typeProvider, schemaContext);
+ typeProvider, schemaContext, genCtx.get(module));
returnType = genTOBuilder.toInstance();
} else {
final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef);
- returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions);
+ returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions, genCtx.get(module));
}
} else {
final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef);
- returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions);
+ returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions, genCtx.get(module));
}
final ParameterizedType listType = Types.listTypeFor(returnType);
qname.getRevision());
returnType = genCtx.get(enumModule).getInnerType(originalLeaf.getType().getPath());
} else {
- returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
+ returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, genCtx.get(module));
}
return AuxiliaryGenUtils.resolveLeafSchemaNodeAsProperty(nodeName, toBuilder, leaf, returnType, isReadOnly);
}
final String packageName = BindingGeneratorUtil.packageNameForGeneratedType(basePackageName, identity.getPath(),
BindingNamespaceType.Identity);
- newType = new GeneratedTOBuilderImpl(packageName, identity.getQName().getLocalName(), true, false);
+ newType = new GeneratedTOBuilderImpl(packageName, identity.getQName().getLocalName(), true, false,
+ genCtx.get(module));
final Set<IdentitySchemaNode> baseIdentities = identity.getBaseIdentities();
if (baseIdentities.size() == 0) {
//no base - abstract
final GeneratedTOBuilderImpl gto = new GeneratedTOBuilderImpl(BaseIdentity.class.getPackage().getName(),
- BaseIdentity.class.getSimpleName());
+ BaseIdentity.class.getSimpleName(), genCtx.get(module));
newType.setExtendsType(gto.toInstance());
} else {
//one base - inheritance
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+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.generated.type.builder.GeneratedTOBuilderImpl;
import org.opendaylight.mdsal.binding.javav2.generator.yang.types.TypeProviderImpl;
import org.opendaylight.mdsal.binding.javav2.model.api.Type;
import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder;
import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingNamespaceType;
import org.opendaylight.mdsal.binding.javav2.util.BindingMapping;
-import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
import org.opendaylight.yangtools.yang.model.api.Module;
* iterate over them
* @param schemaContext
* schema context only used as input parameter for method
- * {@link GenHelperUtil#identityToGenType(Module, String, IdentitySchemaNode, SchemaContext, Map, boolean, Map, TypeProvider, Map)}
+ * {@link GenHelperUtil#identityToGenType(Module, String, IdentitySchemaNode, SchemaContext, Map, boolean)}
* @param genCtx generated context
* @return returns generated context
*
return genCtx;
}
- final GeneratedTypeBuilder listenerInterface = moduleTypeBuilder(module, "Listener", verboseClassComments);
+ final GeneratedTypeBuilder listenerInterface = moduleTypeBuilder(module, "Listener", verboseClassComments,
+ genCtx.get(module));
listenerInterface.addImplementsType(NOTIFICATION_LISTENER);
final String basePackageName = BindingMapping.getRootPackageName(module);
import static org.opendaylight.mdsal.binding.javav2.generator.impl.GenHelperUtil.moduleTypeBuilder;
import static org.opendaylight.mdsal.binding.javav2.generator.impl.GenHelperUtil.processUsesImplements;
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.ACTION;
import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.INPUT;
import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes.INSTANCE_IDENTIFIER;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
+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.BindingTypes;
import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject;
* @return generated context
*/
static Map<Module, ModuleContext> actionMethodsToGenType(final Module module, Map<Module, ModuleContext> genCtx,
- final SchemaContext schemaContext, final boolean verboseClassComments, Map<String, Map<String,
- GeneratedTypeBuilder>> genTypeBuilders, TypeProvider typeProvider) {
+ final SchemaContext schemaContext, final boolean verboseClassComments,
+ Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders, TypeProvider typeProvider) {
checkModuleAndModuleName(module);
final Collection<DataSchemaNode> potentials = module.getChildNodes();
sb.append("Rpc");
}
final GeneratedTypeBuilder interfaceBuilder = moduleTypeBuilder(module, sb.toString(),
- verboseClassComments);
+ verboseClassComments, genCtx.get(module));
final String basePackageName = interfaceBuilder.getPackageName();
GeneratedTypeBuilder>> genTypeBuilders, final Map<Module, ModuleContext> genCtx, final boolean isInput,
final BindingNamespaceType namespaceType) {
final GeneratedTypeBuilder nodeType = addRawInterfaceDefinition(basePackageName, operationNode, schemaContext,
- operationName, "", verboseClassComments, genTypeBuilders, namespaceType);
+ operationName, "", verboseClassComments, genTypeBuilders, namespaceType, genCtx.get(module));
addImplementedInterfaceFromUses(operationNode, nodeType, genCtx);
nodeType.addImplementsType(parameterizedTypeFor(BindingTypes.TREE_CHILD_NODE, parent, parameterizedTypeFor
(BindingTypes.ITEM, parent)));
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Map;
+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.JavaIdentifier;
import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer;
* returned.
*/
@Override
- public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode) {
+ public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode,
+ ModuleContext context) {
if (type != null) {
return TYPE_MAP.get(type.getQName().getLocalName());
}
@Override
public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode,
- final Restrictions restrictions) {
+ final Restrictions restrictions, ModuleContext context) {
final String typeName = type.getQName().getLocalName();
switch (typeName) {
case "union" :
return UNION_TYPE;
default:
- return javaTypeForSchemaDefinitionType(type, parentNode);
+ return javaTypeForSchemaDefinitionType(type, parentNode, context);
}
}
import java.util.Set;
import java.util.TreeMap;
import org.apache.commons.lang3.StringEscapeUtils;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil;
import org.opendaylight.mdsal.binding.javav2.generator.util.TypeConstants;
import org.opendaylight.mdsal.binding.javav2.generator.util.Types;
@SuppressWarnings({ "rawtypes", "unchecked" })
static GeneratedTransferObject provideGeneratedTOFromExtendedType(final TypeDefinition<?> typedef, final
TypeDefinition<?> innerExtendedType, final String basePackageName, final String moduleName, final SchemaContext
- schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap,
+ ModuleContext context) {
Preconditions.checkArgument(innerExtendedType != null, "Extended type cannot be NULL!");
Preconditions.checkArgument(basePackageName != null, "String with base package name cannot be NULL!");
final String typedefName = typedef.getQName().getLocalName();
final String innerTypeDef = innerExtendedType.getQName().getLocalName();
- final GeneratedTOBuilderImpl genTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typedefName);
+ final GeneratedTOBuilderImpl genTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typedefName, context);
final String typedefDescription = encodeAngleBrackets(typedef.getDescription());
genTOBuilder.setDescription(typedefDescription);
* JAVA <code>Type</code> to which is <code>typedef</code> mapped
* @return generated transfer object which represent<code>javaType</code>
*/
- static GeneratedTransferObject wrapJavaTypeIntoTO(final String basePackageName, final TypeDefinition<?> typedef, final Type javaType, final String moduleName) {
+ static GeneratedTransferObject wrapJavaTypeIntoTO(final String basePackageName, final TypeDefinition<?> typedef,
+ final Type javaType, final String moduleName, ModuleContext context) {
Preconditions.checkNotNull(javaType, "javaType cannot be null");
final String propertyName = "value";
- final GeneratedTOBuilder genTOBuilder = typedefToTransferObject(basePackageName, typedef, moduleName);
+ final GeneratedTOBuilder genTOBuilder = typedefToTransferObject(basePackageName, typedef, moduleName, context);
genTOBuilder.setRestrictions(BindingGeneratorUtil.getRestrictions(typedef));
final GeneratedPropertyBuilder genPropBuilder = genTOBuilder.addProperty(propertyName);
genPropBuilder.setReturnType(javaType);
* </ul>
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- static Enumeration provideTypeForEnum(final EnumTypeDefinition enumTypeDef, final String enumName, final
- SchemaNode parentNode, final SchemaContext schemaContext) {
+ static Enumeration provideTypeForEnum(final EnumTypeDefinition enumTypeDef, final String enumName,
+ final SchemaNode parentNode, final SchemaContext schemaContext, ModuleContext context) {
Preconditions.checkArgument(enumTypeDef != null, "EnumTypeDefinition reference cannot be NULL!");
Preconditions.checkArgument(enumTypeDef.getQName().getLocalName() != null,
"Local Name in EnumTypeDefinition QName cannot be NULL!");
packageName = basePackageName;
}
- final EnumerationBuilderImpl enumBuilder = new EnumerationBuilderImpl(packageName, enumName);
+ final EnumerationBuilderImpl enumBuilder = new EnumerationBuilderImpl(packageName, enumName, context);
final String enumTypedefDescription = encodeAngleBrackets(enumTypeDef.getDescription());
enumBuilder.setDescription(enumTypedefDescription);
enumBuilder.setReference(enumTypeDef.getReference());
* <code>typedef</code> and <code>basePackageName</code>
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- private static GeneratedTOBuilderImpl typedefToTransferObject(final String basePackageName, final TypeDefinition<?> typedef, final String moduleName) {
+ private static GeneratedTOBuilderImpl typedefToTransferObject(final String basePackageName,
+ final TypeDefinition<?> typedef, final String moduleName, ModuleContext context) {
final String typeDefTOName = typedef.getQName().getLocalName();
if ((basePackageName != null) && (typeDefTOName != null)) {
- final GeneratedTOBuilderImpl newType = new GeneratedTOBuilderImpl(basePackageName, typeDefTOName);
+ final GeneratedTOBuilderImpl newType = new GeneratedTOBuilderImpl(basePackageName, typeDefTOName, context);
final String typedefDescription = encodeAngleBrackets(typedef.getDescription());
newType.setDescription(typedefDescription);
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+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.JavaIdentifier;
import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl;
import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
+import org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort;
import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+
@Beta
public final class TypeProviderImpl implements TypeProvider {
}
@Override
- public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode) {
- return javaTypeForSchemaDefinitionType(type, parentNode, null);
+ public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode,
+ ModuleContext context) {
+ return javaTypeForSchemaDefinitionType(type, parentNode, null, context);
}
/**
* </ul>
*/
@Override
- public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode, final Restrictions restrictions) {
- return javaTypeForSchemaDefType(type, parentNode, restrictions, this.schemaContext, this.genTypeDefsContextMap);
+ public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode, final
+ Restrictions restrictions, ModuleContext context) {
+ return javaTypeForSchemaDefType(type, parentNode, restrictions, this.schemaContext, this
+ .genTypeDefsContextMap, context);
}
@Override
*
*/
private void resolveTypeDefsFromContext(final SchemaContext schemaContext, final Map<String, Map<Date, Map<String,
- Type>>> genTypeDefsContextMap, final Map<Module, Set<Type>> additionalTypes) {
+ Type>>> genTypeDefsContextMap, final Map<Module, Set<Type>> additionalTypes) {
final Set<Module> modules = schemaContext.getModules();
Preconditions.checkArgument(modules != null, "Set of Modules cannot be NULL!");
- final Module[] modulesArray = new Module[modules.size()];
- int i = 0;
- for (final Module modul : modules) {
- modulesArray[i++] = modul;
- }
- final List<Module> modulesSortedByDependency = org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort
- .sort(modulesArray);
+ final List<Module> modulesSortedByDependency = ModuleDependencySort.sort(modules);
for (final Module module : modulesSortedByDependency) {
Map<Date, Map<String, Type>> dateTypeMap = genTypeDefsContextMap.get(module.getName());
}
modulesSortedByDependency.stream().filter(module -> module != null).forEach(module -> {
+ ModuleContext context = new ModuleContext();
final String basePackageName = packageNameWithNamespacePrefix(getRootPackageName(module),
BindingNamespaceType.Typedef);
final List<TypeDefinition<?>> typeDefinitions = getAllTypedefs(module);
if (listTypeDefinitions != null) {
for (final TypeDefinition<?> typedef : listTypeDefinitions) {
typedefToGeneratedType(basePackageName, module, typedef, genTypeDefsContextMap,
- additionalTypes, schemaContext);
+ additionalTypes, schemaContext, context);
}
}
});
* </ul>
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public GeneratedTOBuilder provideGeneratedTOBuilderForBitsTypeDefinition(final String basePackageName, final
- TypeDefinition<?> typeDef, final String typeDefName, final String moduleName) {
+ public GeneratedTOBuilder provideGeneratedTOBuilderForBitsTypeDefinition(final String basePackageName,
+ final TypeDefinition<?> typeDef, final String typeDefName, final String moduleName, ModuleContext context) {
Preconditions.checkArgument(typeDef != null, "typeDef cannot be NULL!");
Preconditions.checkArgument(basePackageName != null, "Base Package Name cannot be NULL!");
if (typeDef instanceof BitsTypeDefinition) {
final BitsTypeDefinition bitsTypeDefinition = (BitsTypeDefinition) typeDef;
- final GeneratedTOBuilderImpl genTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typeDefName, true, false);
+ final GeneratedTOBuilderImpl genTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typeDefName,
+ true, false, context);
final String typedefDescription = encodeAngleBrackets(typeDef.getDescription());
genTOBuilder.setDescription(typedefDescription);
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public List<GeneratedTOBuilder> provideGeneratedTOBuildersForUnionTypeDef(final String basePackageName,
- final UnionTypeDefinition typedef, final String typeDefName, final SchemaNode parentNode, final SchemaContext
- schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ final UnionTypeDefinition typedef, final String typeDefName, final SchemaNode parentNode,
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap, ModuleContext context) {
Preconditions.checkNotNull(basePackageName, "Base Package Name cannot be NULL!");
Preconditions.checkNotNull(typedef, "Type Definition cannot be NULL!");
Preconditions.checkNotNull(typedef.getQName(), "Type definition QName cannot be NULL!");
final Module module = findParentModule(schemaContext, parentNode);
final GeneratedTOBuilderImpl unionGenTOBuilder;
- unionGenTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typeDefName, true, false);
+ unionGenTOBuilder = new GeneratedTOBuilderImpl(basePackageName, typeDefName, true, false,
+ context);
final String typedefDescription = encodeAngleBrackets(typedef.getDescription());
unionGenTOBuilder.setDescription(typedefDescription);
unionGenTOBuilder.setReference(typedef.getReference());
parentNode, schemaContext, genTypeDefsContextMap);
} else if (unionType instanceof UnionTypeDefinition) {
generatedTOBuilders.add(resolveUnionSubtypeAsUnion(unionGenTOBuilder, (UnionTypeDefinition) unionType,
- unionGenTOBuilder.getFullyQualifiedName(), parentNode, schemaContext, genTypeDefsContextMap));
+ unionGenTOBuilder.getFullyQualifiedName(), parentNode, schemaContext, genTypeDefsContextMap,
+ context));
} else if (unionType instanceof EnumTypeDefinition) {
final Enumeration enumeration = addInnerEnumerationToTypeBuilder((EnumTypeDefinition) unionType,
- unionTypeName, unionGenTOBuilder);
+ unionTypeName, unionGenTOBuilder, context);
updateUnionTypeAsProperty(unionGenTOBuilder, enumeration, unionTypeName);
} else {
final Type javaType = javaTypeForSchemaDefType(unionType, parentNode, null, schemaContext,
- genTypeDefsContextMap);
+ genTypeDefsContextMap, context);
updateUnionTypeAsProperty(unionGenTOBuilder, javaType, unionTypeName);
}
}
}
}
- private Type javaTypeForSchemaDefType(final TypeDefinition<?> typeDefinition, final SchemaNode
- parentNode, final Restrictions r, final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ private Type javaTypeForSchemaDefType(final TypeDefinition<?> typeDefinition, final SchemaNode parentNode,
+ final Restrictions r, final SchemaContext schemaContext,
+ final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap, ModuleContext context) {
Preconditions.checkArgument(typeDefinition != null, "Type Definition cannot be NULL!");
final String typedefName = typeDefinition.getQName().getLocalName();
Preconditions.checkArgument(typedefName != null, "Type Definitions Local Name cannot be NULL!");
// and generated an enclosing ExtendedType to hold any range constraints. The new parser instantiates
// a base type which holds these constraints.
if (typeDefinition instanceof DecimalTypeDefinition) {
- final Type ret = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType(typeDefinition, parentNode, r);
+ final Type ret = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType
+ (typeDefinition, parentNode, r, null);
if (ret != null) {
return ret;
}
}
// Deal with leafrefs/identityrefs
- Type ret = javaTypeForLeafrefOrIdentityRef(typeDefinition, parentNode, schemaContext, genTypeDefsContextMap);
+ Type ret = javaTypeForLeafrefOrIdentityRef(typeDefinition, parentNode, schemaContext,
+ genTypeDefsContextMap, context);
if (ret != null) {
return ret;
}
- ret = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType(typeDefinition, parentNode);
+ ret = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType(typeDefinition, parentNode,
+ null);
if (ret == null) {
LOG.debug("Failed to resolve Java type for {}", typeDefinition);
}
return ret;
}
- Type returnType = javaTypeForExtendedType(typeDefinition, schemaContext, genTypeDefsContextMap);
+ Type returnType = javaTypeForExtendedType(typeDefinition, schemaContext, genTypeDefsContextMap, context);
if (r != null && !r.isEmpty() && returnType instanceof GeneratedTransferObject) {
final GeneratedTransferObject gto = (GeneratedTransferObject) returnType;
final Module module = findParentModule(schemaContext, parentNode);
JavaIdentifierNormalizer.normalizeSpecificIdentifier(typedefName, JavaIdentifier.CLASS);
final String name = packageName + "." + genTOName;
if (module.equals(module1) && !(returnType.getFullyQualifiedName().equals(name))) {
- returnType = shadedTOWithRestrictions(gto, r);
+ returnType = shadedTOWithRestrictions(gto, r, context);
}
}
return returnType;
* <code>modulName</code> or <code>typedef</code> or Q name of
* <code>typedef</code> equals <code>null</code>
*/
- private Type typedefToGeneratedType(final String basePackageName, final Module module, final
- TypeDefinition<?> typedef, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap, final Map<Module,
- Set<Type>> additionalTypes, final SchemaContext schemaContext) {
+ private Type typedefToGeneratedType(final String basePackageName, final Module module,
+ final TypeDefinition<?> typedef, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap,
+ final Map<Module, Set<Type>> additionalTypes, final SchemaContext schemaContext, ModuleContext context) {
final String moduleName = module.getName();
final Date moduleRevision = module.getRevision();
if ((basePackageName != null) && (moduleName != null) && (typedef != null)) {
Type returnType;
if (innerTypeDefinition.getBaseType() != null) {
returnType = provideGeneratedTOFromExtendedType(typedef, innerTypeDefinition, basePackageName,
- module.getName(), schemaContext, genTypeDefsContextMap);
+ module.getName(), schemaContext, genTypeDefsContextMap, context);
} else if (innerTypeDefinition instanceof UnionTypeDefinition) {
final GeneratedTOBuilder genTOBuilder = provideGeneratedTOBuilderForUnionTypeDef(basePackageName,
- (UnionTypeDefinition) innerTypeDefinition, typedefName, typedef, schemaContext, genTypeDefsContextMap);
+ (UnionTypeDefinition) innerTypeDefinition, typedefName, typedef, schemaContext,
+ genTypeDefsContextMap, context);
genTOBuilder.setTypedef(true);
genTOBuilder.setIsUnion(true);
addUnitsToGenTO(genTOBuilder, typedef.getUnits());
// enums are automatically Serializable
final EnumTypeDefinition enumTypeDef = (EnumTypeDefinition) innerTypeDefinition;
// TODO units for typedef enum
- returnType = provideTypeForEnum(enumTypeDef, typedefName, typedef, schemaContext);
+ returnType = provideTypeForEnum(enumTypeDef, typedefName, typedef, schemaContext, context);
} else if (innerTypeDefinition instanceof BitsTypeDefinition) {
final BitsTypeDefinition bitsTypeDefinition = (BitsTypeDefinition) innerTypeDefinition;
final GeneratedTOBuilder genTOBuilder =
provideGeneratedTOBuilderForBitsTypeDefinition(
- basePackageName, bitsTypeDefinition, typedefName, module.getName());
+ basePackageName, bitsTypeDefinition, typedefName, module.getName(), context);
genTOBuilder.setTypedef(true);
addUnitsToGenTO(genTOBuilder, typedef.getUnits());
makeSerializable((GeneratedTOBuilderImpl) genTOBuilder);
returnType = genTOBuilder.toInstance();
} else {
final Type javaType = javaTypeForSchemaDefType(innerTypeDefinition, typedef, null,
- schemaContext, genTypeDefsContextMap);
- returnType = wrapJavaTypeIntoTO(basePackageName, typedef, javaType, module.getName());
+ schemaContext, genTypeDefsContextMap, context);
+ returnType = wrapJavaTypeIntoTO(basePackageName, typedef, javaType, module.getName(), context);
}
if (returnType != null) {
final Map<Date, Map<String, Type>> modulesByDate = genTypeDefsContextMap.get(moduleName);
* type definition which is converted to JAVA <code>Type</code>
* @return JAVA <code>Type</code> instance for <code>typeDefinition</code>
*/
- private Type javaTypeForExtendedType(final TypeDefinition<?> typeDefinition, final SchemaContext
- schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ private Type javaTypeForExtendedType(final TypeDefinition<?> typeDefinition, final SchemaContext schemaContext,
+ final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap, ModuleContext context) {
final String typedefName = typeDefinition.getQName().getLocalName();
final TypeDefinition<?> baseTypeDef = baseTypeDefForExtendedType(typeDefinition);
- Type returnType = javaTypeForLeafrefOrIdentityRef(baseTypeDef, typeDefinition, schemaContext, genTypeDefsContextMap);
+ Type returnType = javaTypeForLeafrefOrIdentityRef(baseTypeDef, typeDefinition, schemaContext,
+ genTypeDefsContextMap, context);
if (returnType == null) {
final Module module = findParentModule(schemaContext, typeDefinition);
final Restrictions r = BindingGeneratorUtil.getRestrictions(typeDefinition);
}
if (returnType == null) {
returnType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType(
- baseTypeDef, typeDefinition, r);
+ baseTypeDef, typeDefinition, r, null);
}
}
}
* @return JAVA <code>Type</code> instance for <code>typeDefinition</code>
*/
private Type javaTypeForLeafrefOrIdentityRef(final TypeDefinition<?> typeDefinition, final SchemaNode parentNode,
- final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap,
+ ModuleContext context) {
if (typeDefinition instanceof LeafrefTypeDefinition) {
final LeafrefTypeDefinition leafref = (LeafrefTypeDefinition) typeDefinition;
if (isLeafRefSelfReference(leafref, parentNode, schemaContext)) {
throw new YangValidationException("Leafref " + leafref.toString() + " is referencing itself, incoming" +
" StackOverFlowError detected.");
}
- return provideTypeForLeafref(leafref, parentNode, schemaContext, genTypeDefsContextMap);
+ return provideTypeForLeafref(leafref, parentNode, schemaContext, genTypeDefsContextMap, context);
} else if (typeDefinition instanceof IdentityrefTypeDefinition) {
final IdentityrefTypeDefinition idref = (IdentityrefTypeDefinition) typeDefinition;
return provideTypeForIdentityref(idref, schemaContext);
*
*/
public Type provideTypeForLeafref(final LeafrefTypeDefinition leafrefType, final SchemaNode parentNode,
- final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap,
+ ModuleContext context) {
Type returnType = null;
Preconditions.checkArgument(leafrefType != null, "Leafref Type Definition reference cannot be NULL!");
} else if (leafListContainsEnumDefinition(dataNode)) {
returnType = Types.listTypeFor(this.referencedTypes.get(dataNode.getPath()));
} else {
- returnType = resolveTypeFromDataSchemaNode(dataNode, schemaContext, genTypeDefsContextMap);
+ returnType = resolveTypeFromDataSchemaNode(dataNode, schemaContext, genTypeDefsContextMap, context);
}
} else {
returnType = Types.typeForClass(Object.class);
* @return JAVA <code>Type</code> representation of <code>dataNode</code>
*/
private Type resolveTypeFromDataSchemaNode(final SchemaNode dataNode, final SchemaContext schemaContext,
- final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap, ModuleContext context) {
Type returnType = null;
if (dataNode != null) {
if (dataNode instanceof LeafSchemaNode) {
final LeafSchemaNode leaf = (LeafSchemaNode) dataNode;
//not using CompatUtils here anymore
final TypeDefinition<?> type = leaf.getType();
- returnType = javaTypeForSchemaDefType(type, leaf, null, schemaContext, genTypeDefsContextMap);
+ returnType = javaTypeForSchemaDefType(type, leaf, null, schemaContext, genTypeDefsContextMap, context);
} else if (dataNode instanceof LeafListSchemaNode) {
final LeafListSchemaNode leafList = (LeafListSchemaNode) dataNode;
- returnType = javaTypeForSchemaDefType(leafList.getType(), leafList, null, schemaContext, genTypeDefsContextMap);
+ returnType = javaTypeForSchemaDefType(leafList.getType(), leafList, null, schemaContext,
+ genTypeDefsContextMap, context);
}
}
return returnType;
JavaIdentifier.CLASS);
final Type baseType = Types.typeForClass(Class.class);
- final Type paramType = Types.wildcardTypeFor(packageName, genTypeName, true, true);
+ final Type paramType = Types.wildcardTypeFor(packageName, genTypeName, true, true, null);
return Types.parameterizedTypeFor(baseType, paramType);
}
- /**
- * Converts <code>typedef</code> to the generated TO builder.
- *
- * @param basePackageName
- * string with name of package to which the module belongs
- * @param typedef
- * type definition from which is the generated TO builder created
- * @return generated TO builder which contains data from
- * <code>typedef</code> and <code>basePackageName</code>
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- private static GeneratedTOBuilderImpl typedefToTransferObject(final String basePackageName, final TypeDefinition<?> typedef, final String moduleName) {
-
- final String packageName = BindingGeneratorUtil.packageNameForGeneratedType(basePackageName, typedef.getPath
- (), BindingNamespaceType.Typedef);
- final String typeDefTOName = typedef.getQName().getLocalName();
-
- if ((packageName != null) && (typeDefTOName != null)) {
- final GeneratedTOBuilderImpl newType = new GeneratedTOBuilderImpl(packageName, typeDefTOName);
- final String typedefDescription = encodeAngleBrackets(typedef.getDescription());
-
- newType.setDescription(typedefDescription);
- newType.setReference(typedef.getReference());
- newType.setSchemaPath((List) typedef.getPath().getPathFromRoot());
- newType.setModuleName(moduleName);
-
- return newType;
- }
- return null;
- }
-
- private static GeneratedTransferObject shadedTOWithRestrictions(final GeneratedTransferObject gto, final Restrictions r) {
- final GeneratedTOBuilder gtob = new GeneratedTOBuilderImpl(gto.getPackageName(), gto.getName());
+ private static GeneratedTransferObject shadedTOWithRestrictions(final GeneratedTransferObject gto,
+ final Restrictions r, ModuleContext context) {
+ final GeneratedTOBuilder gtob = new GeneratedTOBuilderImpl(gto.getPackageName(), gto.getName(), context);
final GeneratedTransferObject parent = gto.getSuperType();
if (parent != null) {
gtob.setExtendsType(parent);
*
* In this case the new generated TO is created for union subtype (recursive
* call of method
- * {@link #provideGeneratedTOBuildersForUnionTypeDef(String, UnionTypeDefinition,
- * String, SchemaNode, SchemaContext, Map)}
+ * {@link #provideGeneratedTOBuilderForUnionTypeDef(String, UnionTypeDefinition, String, SchemaNode, SchemaContext, Map, ModuleContext)}
* provideGeneratedTOBuilderForUnionTypeDef} and in parent TO builder
* <code>parentUnionGenTOBuilder</code> is created property which type is
* equal to new generated TO.
* bigger one due to recursive call of
* <code>provideGeneratedTOBuildersForUnionTypeDef</code> method.
*/
- private GeneratedTOBuilder resolveUnionSubtypeAsUnion(final GeneratedTOBuilder
- parentUnionGenTOBuilder, final UnionTypeDefinition unionSubtype, final String basePackageName,
- final SchemaNode parentNode, final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ private GeneratedTOBuilder resolveUnionSubtypeAsUnion(final GeneratedTOBuilder parentUnionGenTOBuilder,
+ final UnionTypeDefinition unionSubtype, final String basePackageName, final SchemaNode parentNode,
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap,
+ ModuleContext context) {
final String newTOBuilderName = provideAvailableNameForGenTOBuilder(parentUnionGenTOBuilder.getName());
final GeneratedTOBuilder subUnionGenTOBUilder = provideGeneratedTOBuilderForUnionTypeDef(
- basePackageName, unionSubtype, newTOBuilderName, parentNode, schemaContext, genTypeDefsContextMap);
+ basePackageName, unionSubtype, newTOBuilderName, parentNode, schemaContext, genTypeDefsContextMap,
+ context);
final GeneratedPropertyBuilder propertyBuilder;
propertyBuilder = parentUnionGenTOBuilder
* builders
*/
public GeneratedTOBuilder provideGeneratedTOBuilderForUnionTypeDef(final String basePackageName,
- final UnionTypeDefinition typedef, final String typeDefName, final SchemaNode parentNode, final SchemaContext
- schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ final UnionTypeDefinition typedef, final String typeDefName, final SchemaNode parentNode,
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap,
+ ModuleContext context) {
final List<GeneratedTOBuilder> builders = provideGeneratedTOBuildersForUnionTypeDef(basePackageName,
- typedef, typeDefName, parentNode, schemaContext, genTypeDefsContextMap);
+ typedef, typeDefName, parentNode, schemaContext, genTypeDefsContextMap, context);
Preconditions.checkState(!builders.isEmpty(), "No GeneratedTOBuilder objects generated from union %s", typedef);
final GeneratedTOBuilder resultTOBuilder = builders.remove(0);
private GeneratedTOBuilder provideGeneratedTOBuilderForUnionBuilder(final Module parentModule,
- final GeneratedTOBuilder genTOBuilder) {
+ final GeneratedTOBuilder genTOBuilder) {
final String outerCls = Types.getOuterClassName(genTOBuilder);
final StringBuilder name;
if (outerCls != null) {
* parent Schema Node for Extended Subtype
*
*/
- private static void resolveExtendedSubtypeAsUnion(final GeneratedTOBuilder parentUnionGenTOBuilder, final
- TypeDefinition<?> unionSubtype, final List<String> regularExpressions, final SchemaNode parentNode,
- final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ private static void resolveExtendedSubtypeAsUnion(final GeneratedTOBuilder parentUnionGenTOBuilder,
+ final TypeDefinition<?> unionSubtype, final List<String> regularExpressions, final SchemaNode parentNode,
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
final String unionTypeName = unionSubtype.getQName().getLocalName();
final Type genTO = findGenTO(unionTypeName, unionSubtype, schemaContext, genTypeDefsContextMap);
final TypeDefinition<?> baseType = baseTypeDefForExtendedType(unionSubtype);
if (unionTypeName.equals(baseType.getQName().getLocalName())) {
final Type javaType = BaseYangTypes.BASE_YANG_TYPES_PROVIDER.javaTypeForSchemaDefinitionType(baseType,
- parentNode);
+ parentNode, null);
if (javaType != null) {
updateUnionTypeAsProperty(parentUnionGenTOBuilder, javaType, unionTypeName);
}
* <code>null</code> it it doesn't exist
*/
private static Type findGenTO(final String searchedTypeName, final SchemaNode parentNode,
- final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
+ final SchemaContext schemaContext, final Map<String, Map<Date, Map<String, Type>>> genTypeDefsContextMap) {
final Module typeModule = findParentModule(schemaContext, parentNode);
if (typeModule != null && typeModule.getName() != null) {
* </ul>
*
*/
- private static Enumeration addInnerEnumerationToTypeBuilder(final EnumTypeDefinition enumTypeDef, final String enumName, final GeneratedTypeBuilderBase<?> typeBuilder) {
+ private static Enumeration addInnerEnumerationToTypeBuilder(final EnumTypeDefinition enumTypeDef,
+ final String enumName, final GeneratedTypeBuilderBase<?> typeBuilder, ModuleContext context) {
Preconditions.checkArgument(enumTypeDef != null, "EnumTypeDefinition reference cannot be NULL!");
Preconditions.checkArgument(enumTypeDef.getQName().getLocalName() != null,
"Local Name in EnumTypeDefinition QName cannot be NULL!");
Preconditions.checkArgument(typeBuilder != null, "Generated Type Builder reference cannot be NULL!");
- final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumName);
+ final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumName, context);
final String enumTypedefDescription = encodeAngleBrackets(enumTypeDef.getDescription());
enumBuilder.setDescription(enumTypedefDescription);
enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);
}
private static boolean isLeafRefSelfReference(final LeafrefTypeDefinition leafref, final SchemaNode parentNode,
- final SchemaContext schemaContext) {
+ final SchemaContext schemaContext) {
final SchemaNode leafRefValueNode;
final RevisionAwareXPath leafRefXPath = leafref.getPathStatement();
final RevisionAwareXPath leafRefStrippedXPath = new RevisionAwareXPathImpl(leafRefXPath.toString()
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.junit.Ignore;
import org.junit.Test;
+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.generated.type.builder.GeneratedTypeBuilderImpl;
import org.opendaylight.mdsal.binding.javav2.generator.yang.types.TypeProviderImpl;
import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder;
import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingNamespaceType;
import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable;
-import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
final QName create = QName.create("urn:test:simple:test", "2017-02-06", "my-cont");
final SchemaNode schemaNode = mock(SchemaNode.class);
when(schemaNode.getPath()).thenReturn(SchemaPath.create(true, create));
- moduleContext.addChildNodeType(schemaNode, new GeneratedTypeBuilderImpl("test", "Test"));
+ moduleContext.addChildNodeType(schemaNode, new GeneratedTypeBuilderImpl("test", "Test", moduleContext));
when(genCtx.values()).thenReturn(moduleContexts);
when(genCtx.get(context.getModules().iterator().next())).thenReturn(moduleContext);
final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders = new HashMap<>();
final Map genCtx = mock(Map.class);
final Collection<ModuleContext> moduleContexts = new ArrayList<>();
final ModuleContext mc = new ModuleContext();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(augmPackName, "augm");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(augmPackName, "augm", mc);
mc.addChildNodeType(targetSchNode, gtb);
moduleContexts.add(mc);
when(genCtx.values()).thenReturn(moduleContexts);
final Collection<ModuleContext> moduleContexts = new ArrayList<>();
final ModuleContext mc = new ModuleContext();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(augmPackName, "augm");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(augmPackName, "augm", mc);
mc.addChildNodeType(targetSchNode, gtb);
moduleContexts.add(mc);
genCtx.put(moduleAug, mc);
final Map<Module, ModuleContext> genCtx = new HashMap<>();
final ModuleContext mc = new ModuleContext();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("pckg.test.augm", "GtbAugm");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("pckg.test.augm", "GtbAugm", mc);
mc.addChildNodeType(schNode, gtb);
genCtx.put(moduleAug, mc);
final Map<Module, ModuleContext> genCtx = new HashMap<>();
final ModuleContext mc = new ModuleContext();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("pckg.test.augm", "GtbAugm");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("pckg.test.augm", "GtbAugm", mc);
mc.addChildNodeType(schNode, gtb);
genCtx.put(moduleAug, mc);
final ChoiceSchemaNode targetNode = mock(ChoiceSchemaNode.class);
when(targetNode.getPath()).thenReturn(path);
final Map<Module, ModuleContext> genCtx = new HashMap<>();
- final ModuleContext moduleContext = new ModuleContext();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(pckgName, "test-case-node-augment");
- moduleContext.addCaseType(path, gtb);
+ genCtx.put(module, new ModuleContext());
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(pckgName, "test-case-node-augment", genCtx.get(module));
+ genCtx.get(module).addCaseType(path, gtb);
final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilder = new HashMap<>();
when(schemaContext.findModuleByNamespaceAndRevision(qnamePath.getNamespace(), qnamePath.getRevision()))
when(targetNode.getPath()).thenReturn(path);
final Map<Module, ModuleContext> genCtx = new HashMap<>();
final ModuleContext moduleContext = new ModuleContext();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(pckgName, "test-case-node-augment");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl(pckgName, "test-case-node-augment", moduleContext);
moduleContext.addCaseType(path, gtb);
genCtx.put(module, moduleContext);
final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilder = new HashMap<>();
import java.util.Map;
import java.util.Set;
import org.junit.Test;
+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.Types;
import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTOBuilderImpl;
generate.setAccessible(true);
final GeneratedTypeBuilderImpl generatedTypeBuilder =
- new GeneratedTypeBuilderImpl("test.deprecated", "Non_Deprecated");
+ new GeneratedTypeBuilderImpl("test.deprecated", "Non_Deprecated", new ModuleContext());
final Status status = Status.CURRENT;
final Object[] args = { status, generatedTypeBuilder };
generate.setAccessible(true);
final GeneratedTypeBuilderImpl generatedTypeBuilder =
- new GeneratedTypeBuilderImpl("test.deprecated", "Deprecated");
+ new GeneratedTypeBuilderImpl("test.deprecated", "Deprecated", new ModuleContext());
final Status status = Status.DEPRECATED;
final Object[] args = { status, generatedTypeBuilder };
assertNotNull(generate);
generate.setAccessible(true);
- final GeneratedTypeBuilderBase gtbb = new GeneratedTypeBuilderImpl("test", "qname_constants");
+ final GeneratedTypeBuilderBase gtbb = new GeneratedTypeBuilderImpl("test", "qname_constants", new ModuleContext());
final String constantName = "ConstantName";
final QName constantQName = QName.create("urn:constant", "2017-04-06", constantName);
assertNotNull(generate);
generate.setAccessible(true);
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("test", "Getter_of");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("test", "Getter_of", new ModuleContext());
final String schemaNodeName = "schema_node_getter";
final String comment = null;
final Type returnType = Types.STRING;
generate.setAccessible(true);
final Map<String, GeneratedTypeBuilder> builders = new HashMap<>();
- builders.put("genTypeName1", new GeneratedTypeBuilderImpl("pckg.a1", "gen_a_1"));
- builders.put("genTypeName2", new GeneratedTypeBuilderImpl("pckg.a2", "gen_a_2"));
+ builders.put("genTypeName1", new GeneratedTypeBuilderImpl("pckg.a1", "gen_a_1", new ModuleContext()));
+ builders.put("genTypeName2", new GeneratedTypeBuilderImpl("pckg.a2", "gen_a_2", new ModuleContext()));
final String genTypeName = "genTypeName";
final Object[] args_n = { builders, genTypeName };
when(enumTypeDefinition.getQName()).thenReturn(enumQName);
final SchemaPath schemaPath = SchemaPath.create(true, enumQName);
when(enumTypeDefinition.getPath()).thenReturn(schemaPath);
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("urn.enum.test.pckg", "enum-test");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("urn.enum.test.pckg", "enum-test", new ModuleContext());
final Map<Module, ModuleContext> map = new HashMap<>();
final Module module = mock(Module.class);
final ModuleContext moduleContext = new ModuleContext();
public void addTOToTypeBuilderNullTest() throws Exception {
final Class[] parameterTypes =
{ TypeDefinition.class, GeneratedTypeBuilder.class, DataSchemaNode.class, Module.class,
- TypeProvider.class, SchemaContext.class };
+ TypeProvider.class, SchemaContext.class, ModuleContext.class };
final Method generate = AuxiliaryGenUtils.class.getDeclaredMethod("addTOToTypeBuilder", parameterTypes);
assertNotNull(generate);
generate.setAccessible(true);
final BooleanTypeDefinition typeDef = mock(BooleanTypeDefinition.class);
final GeneratedTypeBuilder typeBuilder =
- new GeneratedTypeBuilderImpl("test.boolean.type.def", "boolean-type-def");
+ new GeneratedTypeBuilderImpl("test.boolean.type.def", "boolean-type-def", new ModuleContext());
final DataSchemaNode leaf = mock(DataSchemaNode.class);
final QName qnameLeaf = QName.create("urn:leaf:qname:test", "2017-12-04", "leaf-qname-test");
when(leaf.getQName()).thenReturn(qnameLeaf);
when(schemaContext.getModules()).thenReturn(modules);
final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext);
- final Object[] args1 = { typeDef, typeBuilder, leaf, parentModule, typeProvider, schemaContext };
+ final Object[] args1 = { typeDef, typeBuilder, leaf, parentModule, typeProvider, schemaContext, new ModuleContext() };
final GeneratedTOBuilder result = (GeneratedTOBuilder) generate.invoke(AuxiliaryGenUtils.class, args1);
assertEquals(null, result);
}
throws NoSuchMethodException, ReactorException, FileNotFoundException, URISyntaxException,
IllegalAccessException, InvocationTargetException {
final Class[] parameterTypes = { TypeDefinition.class, GeneratedTypeBuilder.class, DataSchemaNode.class,
- Module.class, TypeProvider.class, SchemaContext.class };
+ Module.class, TypeProvider.class, SchemaContext.class, ModuleContext.class };
final Method generate = AuxiliaryGenUtils.class.getDeclaredMethod("addTOToTypeBuilder", parameterTypes);
assertNotNull(generate);
generate.setAccessible(true);
final GeneratedTypeBuilder typeBuilder =
- new GeneratedTypeBuilderImpl("test.boolean.spc.def", "spec-type-def");
+ new GeneratedTypeBuilderImpl("test.boolean.spc.def", "spec-type-def", new ModuleContext());
final SchemaContext schemaContext = YangParserTestUtils.parseYangSource(yangPath);
final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext);
final LeafSchemaNode leafSchemaNode =
(LeafSchemaNode) schemaContext.getModules().iterator().next().getChildNodes().iterator().next();
final TypeDefinition<? extends TypeDefinition<?>> typeDef = leafSchemaNode.getType();
final Object[] args1 = { typeDef, typeBuilder, leafSchemaNode, schemaContext.getModules().iterator().next(),
- typeProvider, schemaContext };
+ typeProvider, schemaContext, new ModuleContext() };
return (GeneratedTOBuilder) generate.invoke(AuxiliaryGenUtils.class, args1);
}
assertNotNull(generate);
generate.setAccessible(true);
- final GeneratedTypeBuilder typeBuilder = new GeneratedTypeBuilderImpl("test.boolean.spc.def", "spec-type-def");
+ final GeneratedTypeBuilder typeBuilder = new GeneratedTypeBuilderImpl("test.boolean.spc.def",
+ "spec-type-def", new ModuleContext());
final SchemaContext schemaContext = YangParserTestUtils.parseYangSource("/base/test-union.yang");
final TypeProviderImpl typeProvider = new TypeProviderImpl(schemaContext);
final LeafSchemaNode leafSchemaNode =
@SuppressWarnings({ "rawtypes" })
@Test
public void resolveListKeyTOBuilderTest() throws Exception {
- final Class[] parameterTypes = { String.class, ListSchemaNode.class };
+ final Class[] parameterTypes = { String.class, ListSchemaNode.class, ModuleContext.class };
final Method generate = AuxiliaryGenUtils.class.getDeclaredMethod("resolveListKeyTOBuilder", parameterTypes);
assertNotNull(generate);
generate.setAccessible(true);
when(list.getKeyDefinition()).thenReturn(keyDefs);
when(list.getQName()).thenReturn(qname);
- final Object[] args1 = { pckgName, list };
+ final Object[] args1 = { pckgName, list, new ModuleContext() };
final GeneratedTOBuilder result = (GeneratedTOBuilder) generate.invoke(AuxiliaryGenUtils.class, args1);
assertNotNull(result);
assertEquals("LocalnameKey", result.getName());
assertNotNull(generate);
generate.setAccessible(true);
- final GeneratedTOBuilder gtob = new GeneratedTOBuilderImpl("pckg.name.gto.tst", "gto_name");
+ final GeneratedTOBuilder gtob = new GeneratedTOBuilderImpl("pckg.name.gto.tst", "gto_name", true);
final LeafSchemaNode leaf = mock(LeafSchemaNode.class);
final boolean isReadOnly = true;
final Type type = mock(Type.class);
import org.junit.Assert;
import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTypeBuilderImpl;
import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder;
@Test
public void loadClassTest() throws Exception {
final Dummy dummy = new Dummy();
- final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("test", "dummy");
+ final GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("test", "dummy", new ModuleContext());
final Class<?> loadClass = dummy.loadClass(gtb.toInstance());
Assert.assertNotNull(loadClass);
}
import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.spi.TypeProvider;
import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder;
import org.opendaylight.yangtools.yang.common.QName;
import com.google.common.annotations.Beta;
import com.google.common.base.Preconditions;
import java.util.Objects;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.Type;
/**
* @param name
* string with the name for this <code>Type</code>
*/
- protected AbstractBaseType(final String pkName, final String name) {
+ protected AbstractBaseType(final String pkName, final String name, ModuleContext context) {
Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
this.packageName = JavaIdentifierNormalizer.normalizeFullPackageName(pkName);
- this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name);
+ Preconditions.checkNotNull(context, "In case of not having identifiers normalized, " +
+ "ModuleContext instance must be provided.");
+ this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name, context);
}
/**
* @param isNormalized
* true if pkName and name are normalized
*/
- protected AbstractBaseType(final String pkName, final String name, final boolean isNormalized) {
+ protected AbstractBaseType(final String pkName, final String name, final boolean isNormalized,
+ ModuleContext context) {
Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
if (isNormalized) {
this.name = name;
} else {
this.packageName = JavaIdentifierNormalizer.normalizeFullPackageName(pkName);
- this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name);
+ Preconditions.checkNotNull(context, "In case of not having identifiers normalized, " +
+ "ModuleContext instance must be provided.");
+ this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name, context);
}
}
-
protected AbstractBaseType(final String pkName, final String name, final boolean isPkNameNormalized,
- final boolean isTypeNormalized) {
+ final boolean isTypeNormalized, ModuleContext context ) {
Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
if (isPkNameNormalized) {
if (isTypeNormalized) {
this.name = name;
} else {
- this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name);
+ Preconditions.checkNotNull(context, "In case of not having identifiers normalized, " +
+ "ModuleContext instance must be provided.");
+ this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name, context);
}
}
return false;
}
-
- //TODO: further implementation of static util methods...
}
* <li>method</li>
* <li>variable</li>
* <li>constant</li>
+ * <li>package</li>
* </ul>
*/
@Beta
import com.google.common.annotations.Beta;
import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter;
-import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ListMultimap;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration;
import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration.Pair;
import org.opendaylight.mdsal.binding.javav2.util.BindingMapping;
private static final Set<String> WINDOWS_RESERVED_WORDS = BindingMapping.WINDOWS_RESERVED_WORDS.stream()
.map(String::toLowerCase).collect(Collectors.collectingAndThen(Collectors.toSet(), ImmutableSet::copyOf));
- // FIXME: this thing makes this class non-threadsafe and leak memory
- private static final ListMultimap<String, String> PACKAGES_MAP = ArrayListMultimap.create();
-
private JavaIdentifierNormalizer() {
throw new UnsupportedOperationException("Util class");
}
* - part of package name
* @return normalized name
*/
- public static String normalizePartialPackageName(final String packageNamePart) {
+ static String normalizePartialPackageName(final String packageNamePart) {
// if part of package name consist from java or windows reserved word, return it with
// underscore at the end and in lower case
final String lowerPart = packageNamePart.toLowerCase();
* - name of identifier
* @return - java acceptable identifier
*/
- public static String normalizeClassIdentifier(final String packageName, final String className) {
+ static String normalizeClassIdentifier(final String packageName, final String className,
+ ModuleContext context) {
if (packageName.isEmpty() && PRIMITIVE_TYPES.contains(className)) {
return className;
}
basePackageName = packageName;
}
- return normalizeClassIdentifier(basePackageName, convertedClassName, convertedClassName, 1);
+ return normalizeClassIdentifier(basePackageName, convertedClassName, convertedClassName, 1, context);
}
/**
* @return converted identifier
*/
private static String normalizeClassIdentifier(final String packageName, final String origClassName,
- final String actualClassName, final int rank) {
+ final String actualClassName, final int rank, ModuleContext context) {
+
+ final ListMultimap<String, String> packagesMap = context.getPackagesMap();
- // FIXME: this does not look thread-safe and seems to leak memory
- if (PACKAGES_MAP.containsKey(packageName)) {
- for (final String existingName : PACKAGES_MAP.get(packageName)) {
- if (actualClassName.equalsIgnoreCase(existingName)) {
- return normalizeClassIdentifier(packageName, origClassName, origClassName + rank, rank + 1);
+ synchronized (packagesMap) {
+ if (packagesMap.containsKey(packageName)) {
+ for (final String existingName : packagesMap.get(packageName)) {
+ if (actualClassName.equalsIgnoreCase(existingName)) {
+ return normalizeClassIdentifier(packageName, origClassName, origClassName + rank,
+ rank + 1, context);
+ }
}
}
+ context.putToPackagesMap(packageName, actualClassName);
+ return actualClassName;
}
- PACKAGES_MAP.put(packageName, actualClassName);
- return actualClassName;
}
/**
package org.opendaylight.mdsal.binding.javav2.generator.util;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
+
/**
*
* Wraps combination of <code>packageName</code> and <code>name</code> to the
* @param name
* string with the name for referenced type
*/
- public ReferencedTypeImpl(String packageName, String name) {
- super(packageName, name);
+ public ReferencedTypeImpl(String packageName, String name, ModuleContext context) {
+ super(packageName, name, context);
}
/**
* @param isNormalized
* indicates if identifier name is normalized
*/
- public ReferencedTypeImpl(String packageName, String name, boolean isNormalized) {
- super(packageName, name, isNormalized);
+ public ReferencedTypeImpl(String packageName, String name, boolean isNormalized, ModuleContext context) {
+ super(packageName, name, isNormalized, context);
}
@Override
builder.append(getPackageName());
builder.append(", name=");
builder.append(getName());
- builder.append("]");
+ builder.append(']');
return builder.toString();
}
}
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.BaseTypeWithRestrictions;
import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType;
import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType;
* <code>packageName</code> and <code>typeName</code>
*/
public static WildcardType wildcardTypeFor(final String packageName, final String typeName,
- final boolean isPkNameNormalized, final boolean isTypeNormalized) {
- return new WildcardTypeImpl(packageName, typeName, isPkNameNormalized, isTypeNormalized);
+ final boolean isPkNameNormalized, final boolean isTypeNormalized, ModuleContext context) {
+ return new WildcardTypeImpl(packageName, typeName, isPkNameNormalized, isTypeNormalized, context);
}
/**
* string with the name of the type
*/
private ConcreteTypeImpl(final String pkName, final String name, final Restrictions restrictions) {
- super(pkName, name);
+ super(pkName, name, true,null);
this.restrictions = restrictions;
}
* string with the name of the type
*/
private BaseTypeWithRestrictionsImpl(final String pkName, final String name, final Restrictions restrictions) {
- super(pkName, name);
+ super(pkName, name, null);
this.restrictions = Preconditions.checkNotNull(restrictions);
}
* array of actual parameters
*/
public ParameterizedTypeImpl(final Type rawType, final Type[] actTypes) {
- super(rawType.getPackageName(), rawType.getName(), true);
+ super(rawType.getPackageName(), rawType.getName(), true, null);
this.rawType = rawType;
this.actualTypes = actTypes.clone();
}
* @param typeName
* string with the name of type
*/
+ //FIXME: doesn't seem to be called at all
public WildcardTypeImpl(final String packageName, final String typeName) {
- super(packageName, typeName);
+ super(packageName, typeName, null);
}
/**
* if the type name has been normalized
*/
public WildcardTypeImpl(final String packageName, final String typeName, final boolean isPkNameNormalized,
- final boolean isTypeNormalized) {
- super(packageName, typeName, isPkNameNormalized, isTypeNormalized);
+ final boolean isTypeNormalized, ModuleContext context) {
+ super(packageName, typeName, isPkNameNormalized, isTypeNormalized, context);
}
}
private final boolean isAbstract;
public AbstractGeneratedType(final AbstractGeneratedTypeBuilder<?> builder) {
- super(builder.getPackageName(), builder.getName(), true);
+ super(builder.getPackageName(), builder.getName(), true, null);
this.parent = builder.getParent();
this.parentTypeForBuilder = builder.getParentTypeForBuilder();
this.comment = builder.getComment();
final List<GeneratedTOBuilder> enclosedGenTOBuilders, final List<EnumBuilder> enumBuilders,
final List<Constant> constants, final List<MethodSignatureBuilder> methodBuilders,
final List<GeneratedPropertyBuilder> propertyBuilders, final Type parentTypeForBuilder) {
- super(packageName, name);
+ //TODO: not called by actual codebase, fix this up (provide context) if needed - 07/20/2017
+ super(packageName, name, null);
this.parent = parent;
this.parentTypeForBuilder = parentTypeForBuilder;
this.comment = comment;
import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.Objects;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.util.AbstractBaseType;
import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier;
import org.opendaylight.mdsal.binding.javav2.model.api.Constant;
private boolean isAbstract;
private Type parentTypeForBuilder;
- protected AbstractGeneratedTypeBuilder(final String packageName, final String name) {
- super(packageName, name);
+ protected AbstractGeneratedTypeBuilder(final String packageName, final String name, ModuleContext context) {
+ super(packageName, name, context);
}
- protected AbstractGeneratedTypeBuilder(final String packageName, final String name, final boolean isNormalized) {
- super(packageName, name, true);
+ protected AbstractGeneratedTypeBuilder(final String packageName, final String name, final boolean isNormalized,
+ ModuleContext context) {
+ super(packageName, name, true, null);
}
- protected AbstractGeneratedTypeBuilder(final String packageName, final String name,
- final boolean isPkNameNormalized,
- final boolean isTypeNormalized) {
- super(packageName, name, isPkNameNormalized, isTypeNormalized);
+ protected AbstractGeneratedTypeBuilder(final String packageName, final String name, final boolean isPkNameNormalized,
+ final boolean isTypeNormalized, ModuleContext context) {
+ super(packageName, name, isPkNameNormalized, isTypeNormalized, context);
}
protected String getComment() {
@Override
public GeneratedTOBuilder addEnclosingTransferObject(final String name) {
Preconditions.checkArgument(name != null, "Name for Enclosing Generated Transfer Object cannot be null!");
- GeneratedTOBuilder builder = new GeneratedTOBuilderImpl(getFullyQualifiedName(), name);
+ GeneratedTOBuilder builder = new GeneratedTOBuilderImpl(getFullyQualifiedName(), name, true);
Preconditions.checkArgument(!enclosedTransferObjects.contains(builder), "This generated type already contains equal enclosing transfer object.");
enclosedTransferObjects = LazyCollections.lazyAdd(enclosedTransferObjects, builder);
}
@Override
- public EnumBuilder addEnumeration(final String name) {
+ public EnumBuilder addEnumeration(final String name, ModuleContext context) {
Preconditions.checkArgument(name != null, "Name of enumeration cannot be null!");
- final EnumBuilder builder = new EnumerationBuilderImpl(getFullyQualifiedName(), name, true, false);
+ final EnumBuilder builder = new EnumerationBuilderImpl(getFullyQualifiedName(), name, true, false,
+ context);
Preconditions.checkArgument(!enumDefinitions.contains(builder), "This generated type already contains equal enumeration.");
enumDefinitions = LazyCollections.lazyAdd(enumDefinitions, builder);
private List<AnnotationType.Parameter> parameters = ImmutableList.of();
public AnnotationTypeBuilderImpl(final String packageName, final String name) {
- super(packageName, name);
+ super(packageName, name, true, null);
this.packageName = packageName;
this.name = name;
}
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.util.AbstractBaseType;
import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer;
import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType;
private String moduleName;
private List<QName> schemaPath;
- public EnumerationBuilderImpl(final String packageName, final String name) {
- super(packageName, name);
+ public EnumerationBuilderImpl(final String packageName, final String name, ModuleContext context) {
+ super(packageName, name, context);
}
- public EnumerationBuilderImpl(final String packageName, final String name,
- final boolean isPkNameNormalized,
- final boolean isTypeNormalized) {
- super(packageName, name, isPkNameNormalized, isTypeNormalized);
+ public EnumerationBuilderImpl(final String packageName, final String name, final boolean isPkNameNormalized,
+ final boolean isTypeNormalized, ModuleContext context) {
+ super(packageName, name, isPkNameNormalized, isTypeNormalized, context);
}
public void setReference(final String reference) {
public EnumerationImpl(final Type definingType, final List<AnnotationTypeBuilder> annotationBuilders,
final String packageName, final String name, final List<Pair> values, final String description,
final String reference, final String moduleName, final List<QName> schemaPath) {
- super(packageName, name, true);
+ super(packageName, name, true, null);
this.definingType = definingType;
this.values = values;
this.description = description;
import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.Optional;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty;
import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject;
import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType;
private String moduleName;
private List<QName> schemaPath;
- public GeneratedTOBuilderImpl(final String packageName, final String name) {
- super(packageName, name);
+ public GeneratedTOBuilderImpl(final String packageName, final String name, ModuleContext context) {
+ super(packageName, name, context);
setAbstract(false);
}
public GeneratedTOBuilderImpl(final String packageName, final String name, final boolean isNormalized) {
- super(packageName, name, true);
+ super(packageName, name, true, null);
}
- public GeneratedTOBuilderImpl(final String packageName, final String name,
- final boolean isPkNameNormalized,
- final boolean isTypeNormalized) {
- super(packageName, name, isPkNameNormalized, isTypeNormalized);
+ public GeneratedTOBuilderImpl(final String packageName, final String name, final boolean isPkNameNormalized,
+ final boolean isTypeNormalized, ModuleContext context) {
+ super(packageName, name, isPkNameNormalized, isTypeNormalized, context);
setAbstract(false);
}
package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder;
import com.google.common.annotations.Beta;
+import com.google.common.base.Preconditions;
import java.util.List;
import java.util.Optional;
-import com.google.common.base.Preconditions;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil;
import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType;
import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTypeForBuilder;
private boolean isWithBuilder = false;
private String basePackageName = null;
- public GeneratedTypeBuilderImpl(final String packageName, final String name) {
- super(packageName, name);
+ public GeneratedTypeBuilderImpl(final String packageName, final String name, ModuleContext context) {
+ super(packageName, name, context);
setAbstract(true);
}
- public GeneratedTypeBuilderImpl(final String packageName, final String name,
- final boolean isPkNameNormalized,
- final boolean isTypeNormalized) {
- super(packageName, name, isPkNameNormalized, isTypeNormalized);
+ public GeneratedTypeBuilderImpl(final String packageName, final String name, final boolean isPkNameNormalized,
+ final boolean isTypeNormalized, ModuleContext context) {
+ super(packageName, name, isPkNameNormalized, isTypeNormalized, context);
setAbstract(true);
}
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.util.BindingMapping;
public class JavaIdentifierNormalizerTest {
@Test
public void specialPathsTest() {
+ ModuleContext context = new ModuleContext();
// QName - reserved & non reserved
String normalizeIdentifier =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common", "QName");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common",
+ "QName", context);
assertEquals("QName", normalizeIdentifier);
// again reserved
normalizeIdentifier =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common", "QName");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.opendaylight.yangtools.yang.common",
+ "QName", context);
assertEquals("QName", normalizeIdentifier);
// non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName", context);
assertEquals("Qname", normalizeIdentifier);
// again non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("qname.non.reserved", "QName", context);
assertEquals("Qname1", normalizeIdentifier);
// Augmentable - reserved & non reserved
normalizeIdentifier = JavaIdentifierNormalizer
- .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable");
+ .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable", context);
assertEquals("Augmentable", normalizeIdentifier);
// again reserved
normalizeIdentifier = JavaIdentifierNormalizer
- .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable");
+ .normalizeClassIdentifier("org.opendaylight.mdsal.binding.javav2.spec.structural", "Augmentable", context);
assertEquals("Augmentable", normalizeIdentifier);
// non reserved
normalizeIdentifier = JavaIdentifierNormalizer
- .normalizeClassIdentifier("augmentable.non.reserved", "Augmentable");
+ .normalizeClassIdentifier("augmentable.non.reserved", "Augmentable", context);
assertEquals("Augmentable", normalizeIdentifier);
// again non reserved
normalizeIdentifier =
- JavaIdentifierNormalizer.normalizeClassIdentifier("augmentable.non.reserved", "Augmentable");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("augmentable.non.reserved", "Augmentable", context);
assertEquals("Augmentable1", normalizeIdentifier);
// List - reserved & non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List", context);
assertEquals("List", normalizeIdentifier);
// again reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.util", "List", context);
assertEquals("List", normalizeIdentifier);
// non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List", context);
assertEquals("List", normalizeIdentifier);
// again non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("list.non.reserved", "List", context);
assertEquals("List1", normalizeIdentifier);
// String - reserved & non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String", context);
assertEquals("String", normalizeIdentifier);
// again reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("java.lang", "String", context);
assertEquals("String", normalizeIdentifier);
// non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String", context);
assertEquals("String", normalizeIdentifier);
// again non reserved
- normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String");
+ normalizeIdentifier = JavaIdentifierNormalizer.normalizeClassIdentifier("string.non.reserved", "String", context);
assertEquals("String1", normalizeIdentifier);
}
*/
@Test
public void sameClassNamesSamePackageTest() {
- String normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "Foo");
- String normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "fOo");
+ ModuleContext context = new ModuleContext();
+ String normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package",
+ "Foo", context);
+ String normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package",
+ "fOo", context);
final String normalizeIdentifier3 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "foo");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "foo", context);
assertEquals(normalizeIdentifier1, "Foo");
assertEquals(normalizeIdentifier2, "Foo1");
assertEquals(normalizeIdentifier3, "Foo2");
- normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "*");
- normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "asterisk");
+ normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package", "*",
+ context);
+ normalizeIdentifier2 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.same.package",
+ "asterisk", context);
assertEquals(normalizeIdentifier1, "Asterisk");
assertEquals(normalizeIdentifier2, "Asterisk1");
}
*/
@Test
public void sameClassNamesOtherPackageTest() {
+ ModuleContext context = new ModuleContext();
String normalizeIdentifier1 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "Foo");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "Foo", context);
String normalizeIdentifier2 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "fOo");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "fOo", context);
final String normalizeIdentifier3 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next.next", "foo");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next.next", "foo", context);
assertEquals(normalizeIdentifier1, "Foo");
assertEquals(normalizeIdentifier2, "Foo");
assertEquals(normalizeIdentifier3, "Foo");
- normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "*");
+ normalizeIdentifier1 = JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package", "*",
+ context);
normalizeIdentifier2 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "asterisk");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.other.package.next", "asterisk", context);
assertEquals(normalizeIdentifier1, "Asterisk");
assertEquals(normalizeIdentifier2, "Asterisk");
}
*/
@Test
public void sameClassNamesSamePackageReservedWordsTest() {
+ ModuleContext context = new ModuleContext();
final String normalizeIdentifier1 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "int");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "int", context);
final String normalizeIdentifier2 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "InT");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "InT", context);
final String normalizeIdentifier3 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "inT");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.same.package", "inT", context);
assertEquals(normalizeIdentifier1, "IntReservedKeyword");
assertEquals(normalizeIdentifier2, "IntReservedKeyword1");
assertEquals(normalizeIdentifier3, "IntReservedKeyword2");
*/
@Test
public void sameClassNamesOtherPackageReservedWordsTest() {
+ ModuleContext context = new ModuleContext();
final String normalizeIdentifier1 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package", "int");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package", "int", context);
final String normalizeIdentifier2 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next", "InT");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next", "InT", context);
final String normalizeIdentifier3 =
- JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next.next", "inT");
+ JavaIdentifierNormalizer.normalizeClassIdentifier("org.example.keywords.other.package.next.next",
+ "inT", context);
assertEquals(normalizeIdentifier1, "IntReservedKeyword");
assertEquals(normalizeIdentifier2, "IntReservedKeyword");
assertEquals(normalizeIdentifier3, "IntReservedKeyword");
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration;
import org.opendaylight.yangtools.yang.model.api.Status;
@Test
public void sameEnumTest() {
- EnumerationBuilderImpl enumerationBuilderImpl = new EnumerationBuilderImpl("package.same.test", "test");
+ ModuleContext context = new ModuleContext();
+ EnumerationBuilderImpl enumerationBuilderImpl = new EnumerationBuilderImpl("package.same.test", "test", context);
Enumeration enumeration = enumerationBuilderImpl.toInstance(enumerationBuilderImpl);
String formattedString = enumeration.toFormattedString();
assertTrue(!formattedString.isEmpty());
assertTrue(formattedString.contains("Test"));
- enumerationBuilderImpl = new EnumerationBuilderImpl("package.same.test", "Test");
+ enumerationBuilderImpl = new EnumerationBuilderImpl("package.same.test", "Test", context);
enumeration = enumerationBuilderImpl.toInstance(enumerationBuilderImpl);
formattedString = enumeration.toFormattedString();
@Test
public void enumTest() {
final EnumerationBuilderImpl enumerationBuilderImpl =
- new EnumerationBuilderImpl("package.test", "test**");
+ new EnumerationBuilderImpl("package.test", "test**", new ModuleContext());
enumerationBuilderImpl.addValue("value", 1, "des", "ref", Status.CURRENT);
final Enumeration enumeration = enumerationBuilderImpl.toInstance(enumerationBuilderImpl);
final String formattedString = enumeration.toFormattedString();
@Test
public void enumUniqueTest() {
final EnumerationBuilderImpl enumerationBuilderImpl =
- new EnumerationBuilderImpl("package.ex.ex.ex.test", "test");
+ new EnumerationBuilderImpl("package.ex.ex.ex.test", "test", new ModuleContext());
enumerationBuilderImpl.addValue("foo", 1, "des", "ref", Status.CURRENT);
enumerationBuilderImpl.addValue("Foo", 1, "des", "ref", Status.CURRENT);
enumerationBuilderImpl.addValue("foo1", 1, "des", "ref", Status.CURRENT);
@Test
public void asteriskInEnumTest() {
final EnumerationBuilderImpl enumerationBuilderImpl =
- new EnumerationBuilderImpl("package.ex.test", "test**");
+ new EnumerationBuilderImpl("package.ex.test", "test**", new ModuleContext());
enumerationBuilderImpl.addValue("val**ue", 1, "des", "ref", Status.CURRENT);
enumerationBuilderImpl.addValue("val*ue", 1, "des", "ref", Status.CURRENT);
enumerationBuilderImpl.addValue("*value*", 1, "des", "ref", Status.CURRENT);
@Test
public void reverseSolidusInEnumTest() {
final EnumerationBuilderImpl enumerationBuilderImpl =
- new EnumerationBuilderImpl("package.ex.ex.test", "test\\\\");
+ new EnumerationBuilderImpl("package.ex.ex.test", "test\\\\", new ModuleContext());
enumerationBuilderImpl.addValue("val\\\\ue", 1, "des", "ref", Status.CURRENT);
enumerationBuilderImpl.addValue("val\\ue", 1, "des", "ref", Status.CURRENT);
enumerationBuilderImpl.addValue("\\value\\", 1, "des", "ref", Status.CURRENT);
final String prefix = Types.BOOLEAN.equals(method.getReturnType()) ? "is" : "get";
if (method.getName().startsWith(prefix)) {
final String fieldName = toFirstLower(method.getName().substring(prefix.length()));
- final GeneratedTOBuilderImpl tmpGenTO = new GeneratedTOBuilderImpl("foo", "foo");
+ final GeneratedTOBuilderImpl tmpGenTO = new GeneratedTOBuilderImpl("foo", "foo", true);
tmpGenTO.addProperty(fieldName)
.setReturnType(method.getReturnType());
return tmpGenTO.toInstance().getProperties().get(0);
final String fullyQualifiedName = method.getReturnType().getName();
final String aPackage = getPackage(fullyQualifiedName);
final String name = getName(fullyQualifiedName);
- final GeneratedTOBuilderImpl generatedTOBuilder = new GeneratedTOBuilderImpl(aPackage, name);
- final ReferencedTypeImpl referencedType = new ReferencedTypeImpl(aPackage, name, true);
+ final GeneratedTOBuilderImpl generatedTOBuilder = new GeneratedTOBuilderImpl(aPackage,
+ name, true);
+ final ReferencedTypeImpl referencedType = new ReferencedTypeImpl(aPackage, name, true,
+ null);
final ReferencedTypeImpl generic = new ReferencedTypeImpl(getType().getPackageName(),
- getType().getName(), true);
+ getType().getName(), true, null);
final ParameterizedType parametrizedReturnType = Types.parameterizedTypeFor(referencedType, generic);
generatedTOBuilder.addMethod(method.getName()).setReturnType(parametrizedReturnType);
augmentField = propertyFromGetter(generatedTOBuilder.toInstance().getMethodDefinitions().get(0));
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTypeBuilderImpl;
import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType;
import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature;
final GeneratedType genType = spy(GeneratedType.class);
doReturn(TEST).when(genType).getName();
doReturn(TEST).when(genType).getPackageName();
- doReturn(new GeneratedTypeBuilderImpl(new StringBuilder(methodeName).append("test").toString(), methodeName)
+ doReturn(new GeneratedTypeBuilderImpl(new StringBuilder(methodeName).append("test").toString(), methodeName,
+ new ModuleContext())
.toInstance()).when(genType).getParentTypeForBuilder();
final List<MethodSignature> listMethodSign = new ArrayList<>();
final GeneratedType genType = spy(GeneratedType.class);
doReturn(TEST).when(genType).getName();
doReturn(TEST).when(genType).getPackageName();
- doReturn(new GeneratedTypeBuilderImpl(new StringBuilder(methodeName).append("test").toString(), methodeName)
+ doReturn(new GeneratedTypeBuilderImpl(new StringBuilder(methodeName).append("test").toString(), methodeName,
+ new ModuleContext())
.toInstance()).when(genType).getParentTypeForBuilder();
final List<MethodSignature> listMethodSign = new ArrayList<>();
import javax.annotation.Nullable;
import org.opendaylight.mdsal.binding.javav2.generator.api.ClassLoadingStrategy;
import org.opendaylight.mdsal.binding.javav2.generator.impl.BindingGeneratorImpl;
-import org.opendaylight.mdsal.binding.javav2.generator.impl.ModuleContext;
+import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
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;
}
private static Type referencedType(final Class<?> type) {
- return new ReferencedTypeImpl(type.getPackage().getName(), type.getSimpleName(), true);
+ return new ReferencedTypeImpl(type.getPackage().getName(), type.getSimpleName(), true, null);
}
static Type referencedType(final String type) {
final int packageClassSeparator = type.lastIndexOf(DOT);
return new ReferencedTypeImpl(type.substring(0, packageClassSeparator),
- type.substring(packageClassSeparator + 1), true);
+ type.substring(packageClassSeparator + 1), true, null);
}
/**
if (type instanceof ReferencedTypeImpl) {
return type;
}
- return new ReferencedTypeImpl(type.getPackageName(), type.getName());
+ return new ReferencedTypeImpl(type.getPackageName(), type.getName(), true, null);
}
private static Set<Type> collectAllContainerTypes(final GeneratedType type, final Set<Type> collection) {
Code Review / mdsal.git / commitdiff