From d45b654091cf3a65d4f5d51c856477be0c5dbade Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 4 Mar 2018 00:09:32 +0100 Subject: [PATCH] Use concepts.Builder in binding-generator-api We have three unrelated toInstance() methods. Rename them to build() and extend yangtools.concepts.Builder. Change-Id: I6a9008a699df1650dbd5c988d4f3f28fe2b965f0 Signed-off-by: Robert Varga --- .../type/builder/AnnotationTypeBuilder.java | 6 +- .../api/type/builder/GeneratedTOBuilder.java | 7 ++- .../type/builder/GeneratedTypeBuilder.java | 6 +- .../generator/impl/AbstractTypeGenerator.java | 30 ++++----- .../binding/generator/impl/ModuleContext.java | 16 ++--- .../generator/impl/RuntimeTypeGenerator.java | 27 +++----- .../generator/util/BindingRuntimeContext.java | 4 +- .../yang/types/AbstractTypeProvider.java | 16 ++--- .../binding/yang/types/TypeProviderTest.java | 14 ++--- .../builder/AbstractEnumerationBuilder.java | 2 +- .../type/builder/AbstractGeneratedType.java | 9 +-- .../builder/AbstractTypeMemberBuilder.java | 6 +- .../builder/AnnotationTypeBuilderImpl.java | 20 +++--- .../builder/CodegenGeneratedTOBuilder.java | 2 +- .../builder/CodegenGeneratedTypeBuilder.java | 2 +- .../builder/RuntimeGeneratedTOBuilder.java | 2 +- .../builder/RuntimeGeneratedTypeBuilder.java | 2 +- .../type/builder/AnnotationBuilderTest.java | 62 +++++++++---------- .../builder/GeneratedPropertyImplTest.java | 9 ++- .../builder/GeneratedTOBuilderImplTest.java | 18 +++--- .../type/builder/GeneratedTOBuilderTest.java | 6 +- .../builder/GeneratedTypeBuilderTest.java | 34 +++++----- .../java/api/generator/BuilderTemplate.xtend | 4 +- .../test/ClassCodeGeneratorTest.java | 4 +- .../generator/test/GeneratorJavaFileTest.java | 8 +-- 25 files changed, 160 insertions(+), 156 deletions(-) diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java index 75ace89bf8..429c19d254 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java @@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.model.api.type.builder; import java.util.List; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.concepts.Builder; /** * Annotation Type Builder Interface serves for creation and instantiation of @@ -20,7 +21,7 @@ import org.opendaylight.mdsal.binding.model.api.Type; * * @see AnnotationType */ -public interface AnnotationTypeBuilder extends Type { +public interface AnnotationTypeBuilder extends Type, Builder { /** * The method creates new AnnotationTypeBuilder containing specified package @@ -84,5 +85,6 @@ public interface AnnotationTypeBuilder extends Type { * * @return new immutable instance of Annotation Type. */ - AnnotationType toInstance(); + @Override + AnnotationType build(); } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java index 4c244013f6..277ca1f798 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java @@ -9,6 +9,7 @@ package org.opendaylight.mdsal.binding.model.api.type.builder; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.Restrictions; +import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; /** @@ -17,7 +18,8 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; * * @see GeneratedTransferObject */ -public interface GeneratedTOBuilder extends GeneratedTypeBuilderBase { +public interface GeneratedTOBuilder extends GeneratedTypeBuilderBase, + Builder { /** * Add Generated Transfer Object from which will be extended current @@ -75,7 +77,8 @@ public interface GeneratedTOBuilder extends GeneratedTypeBuilderBase { +public interface GeneratedTypeBuilder extends GeneratedTypeBuilderBase, Builder { /** * Returns the new immutable instance of Generated Type. * * @return the new immutable instance of Generated Type. */ - GeneratedType toInstance(); + @Override + GeneratedType build(); } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java index 862fe5175b..4f5815f6d2 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java @@ -444,7 +444,7 @@ abstract class AbstractTypeGenerator { annotateDeprecatedIfNecessary(rpc.getStatus(), inType); resolveDataSchemaNodes(module, basePackageName, inType, inType, input.getChildNodes()); genCtx.get(module).addChildNodeType(input, inType); - final GeneratedType inTypeInstance = inType.toInstance(); + final GeneratedType inTypeInstance = inType.build(); method.addParameter(inTypeInstance, "input"); } @@ -460,7 +460,7 @@ abstract class AbstractTypeGenerator { annotateDeprecatedIfNecessary(rpc.getStatus(), outType); resolveDataSchemaNodes(module, basePackageName, outType, outType, output.getChildNodes()); genCtx.get(module).addChildNodeType(output, outType); - outTypeInstance = outType.toInstance(); + outTypeInstance = outType.build(); } final Type rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult.class), outTypeInstance); @@ -583,7 +583,7 @@ abstract class AbstractTypeGenerator { if (baseIdentities.isEmpty()) { final GeneratedTOBuilder gto = typeProvider.newGeneratedTOBuilder( BaseIdentity.class.getPackage().getName(), BaseIdentity.class.getSimpleName()); - newType.setExtendsType(gto.toInstance()); + newType.setExtendsType(gto.build()); } else { final IdentitySchemaNode baseIdentity = baseIdentities.iterator().next(); final Module baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity); @@ -591,7 +591,7 @@ abstract class AbstractTypeGenerator { .getQNameModule()); final String returnTypeName = BindingMapping.getClassName(baseIdentity.getQName()); final GeneratedTransferObject gto = new CodegenGeneratedTOBuilder(returnTypePkgName, returnTypeName) - .toInstance(); + .build(); newType.setExtendsType(gto); } newType.setAbstract(true); @@ -778,7 +778,7 @@ abstract class AbstractTypeGenerator { addRawAugmentGenTypeDefinition(module, augmentPackageName, augmentPackageName, targetType, augSchema); } else { - generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.toInstance(), + generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.build(), (ChoiceSchemaNode) targetSchemaNode, augSchema.getChildNodes(), null); } } @@ -811,10 +811,10 @@ abstract class AbstractTypeGenerator { packageName = packageNameForAugmentedGeneratedType(augmentPackageName, ((SchemaNode) usesNodeParent).getPath()); } - addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName, targetTypeBuilder.toInstance(), + addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName, targetTypeBuilder.build(), augSchema); } else { - generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.toInstance(), + generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.build(), (ChoiceSchemaNode) targetSchemaNode, augSchema.getChildNodes(), usesNodeParent); } } @@ -1112,7 +1112,7 @@ abstract class AbstractTypeGenerator { choiceTypeBuilder.addImplementsType(typeForClass(DataContainer.class)); annotateDeprecatedIfNecessary(choiceNode.getStatus(), choiceTypeBuilder); genCtx.get(module).addChildNodeType(choiceNode, choiceTypeBuilder); - generateTypesFromChoiceCases(module, basePackageName, choiceTypeBuilder.toInstance(), choiceNode); + generateTypesFromChoiceCases(module, basePackageName, choiceTypeBuilder.build(), choiceNode); } } @@ -1349,7 +1349,7 @@ abstract class AbstractTypeGenerator { } else if (typeDef instanceof BitsTypeDefinition) { GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leaf, parentModule); if (genTOBuilder != null) { - returnType = genTOBuilder.toInstance(); + returnType = genTOBuilder.build(); } } else { // It is constrained version of already declared type (inner declared type exists, @@ -1556,7 +1556,7 @@ abstract class AbstractTypeGenerator { } } else if (typeDef instanceof BitsTypeDefinition) { final GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule); - returnType = genTOBuilder.toInstance(); + returnType = genTOBuilder.build(); } else { final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef); returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions); @@ -1598,11 +1598,11 @@ abstract class AbstractTypeGenerator { final Set types = typeProvider.getAdditionalTypes().get(parentModule); if (types == null) { typeProvider.getAdditionalTypes().put(parentModule, - Sets.newHashSet(unionBuilder.toInstance())); + Sets.newHashSet(unionBuilder.build())); } else { - types.add(unionBuilder.toInstance()); + types.add(unionBuilder.build()); } - return returnType.toInstance(); + return returnType.build(); } private GeneratedTOBuilder createUnionBuilder(final GeneratedTOBuilder genTOBuilder, @@ -1854,7 +1854,7 @@ abstract class AbstractTypeGenerator { checkArgument(typeBuilder != null, "Generated Type Builder cannot be NULL."); if (genTOBuilder != null) { - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); // Fake the 'getKey()' for items, this is equivalent to constructGetter() final MethodSignatureBuilder getMethod = typeBuilder.addMethod(getterMethodName("key", genTO)); @@ -1988,7 +1988,7 @@ abstract class AbstractTypeGenerator { private GeneratedTypeBuilder addImplementedInterfaceFromUses(final DataNodeContainer dataNodeContainer, final GeneratedTypeBuilder builder) { for (final UsesNode usesNode : dataNodeContainer.getUses()) { - final GeneratedType genType = findGroupingByPath(usesNode.getGroupingPath()).toInstance(); + final GeneratedType genType = findGroupingByPath(usesNode.getGroupingPath()).build(); if (genType == null) { throw new IllegalStateException("Grouping " + usesNode.getGroupingPath() + "is not resolved for " + builder.getName()); diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java index b1bc4785cb..60ffe40503 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleContext.java @@ -53,11 +53,11 @@ public final class ModuleContext { List result = new ArrayList<>(); if (moduleNode != null) { - result.add(moduleNode.toInstance()); + result.add(moduleNode.build()); } for (GeneratedTOBuilder b : genTOs) { - result.add(b.toInstance()); + result.add(b.build()); } for (Type b : typedefs.values()) { if (b != null) { @@ -65,22 +65,22 @@ public final class ModuleContext { } } for (GeneratedTypeBuilder b : childNodes.values()) { - result.add(b.toInstance()); + result.add(b.build()); } for (GeneratedTypeBuilder b : groupings.values()) { - result.add(b.toInstance()); + result.add(b.build()); } for (GeneratedTypeBuilder b : cases.values()) { - result.add(b.toInstance()); + result.add(b.build()); } for (GeneratedTOBuilder b : identities.values()) { - result.add(b.toInstance()); + result.add(b.build()); } for (GeneratedTypeBuilder b : topLevelNodes) { - result.add(b.toInstance()); + result.add(b.build()); } for (GeneratedTypeBuilder b : augmentations) { - result.add(b.toInstance()); + result.add(b.build()); } return result; } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java index 355a0df321..d815b55c54 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/RuntimeTypeGenerator.java @@ -18,12 +18,12 @@ import java.util.Map.Entry; import java.util.Set; import org.opendaylight.mdsal.binding.generator.api.BindingRuntimeTypes; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.api.type.builder.TypeMemberBuilder; import org.opendaylight.mdsal.binding.yang.types.RuntimeTypeProvider; +import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; @@ -67,24 +67,17 @@ final class RuntimeTypeGenerator extends AbstractTypeGenerator { } private static Type builtType(final Map knownTypes, final Type type) { - final Type existing = knownTypes.get(type); - if (existing != null) { - return existing; - } + if (type instanceof Builder) { + final Type existing = knownTypes.get(type); + if (existing != null) { + return existing; + } - final Type built; - if (type instanceof AnnotationTypeBuilder) { - built = ((AnnotationTypeBuilder) type).toInstance(); - } else if (type instanceof GeneratedTOBuilder) { - built = ((GeneratedTOBuilder) type).toInstance(); - } else if (type instanceof GeneratedTypeBuilder) { - built = ((GeneratedTypeBuilder) type).toInstance(); - } else { - built = type; + final Type built = (Type) ((Builder)type).build(); + knownTypes.put(type, built); + return built; } - - knownTypes.put(type, built); - return built; + return type; } @Override diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java index afa0d4b622..3a3f2d92ab 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java @@ -279,7 +279,7 @@ public class BindingRuntimeContext implements Immutable { () -> new NullPointerException("Failed to find defined type for " + referencedType + " schema " + schema)); if (definedType instanceof GeneratedTypeBuilder) { - return new SimpleEntry<>(((GeneratedTypeBuilder) definedType).toInstance(), schema); + return new SimpleEntry<>(((GeneratedTypeBuilder) definedType).build(), schema); } checkArgument(definedType instanceof GeneratedType, "Type %s is not a GeneratedType", referencedType); return new SimpleEntry<>((GeneratedType) definedType, schema); @@ -298,7 +298,7 @@ public class BindingRuntimeContext implements Immutable { final Entry caseIdentifier = new SimpleEntry<>(choiceType, caze); final HashSet caseChildren = new HashSet<>(); if (caze instanceof GeneratedTypeBuilder) { - caze = ((GeneratedTypeBuilder) caze).toInstance(); + caze = ((GeneratedTypeBuilder) caze).build(); } collectAllContainerTypes((GeneratedType) caze, caseChildren); for (final Type caseChild : caseChildren) { diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java index 745c9cc3c4..6cb6ff926e 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java @@ -256,7 +256,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { gpb.setFinal(gp.isFinal()); gpb.setStatic(gp.isStatic()); } - return gtob.toInstance(); + return gtob.build(); } private boolean isLeafRefSelfReference(final LeafrefTypeDefinition leafref, final SchemaNode parentNode) { @@ -822,7 +822,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { genTOBuilder.setIsUnion(true); addUnitsToGenTO(genTOBuilder, typedef.getUnits().orElse(null)); makeSerializable(genTOBuilder); - returnType = genTOBuilder.toInstance(); + returnType = genTOBuilder.build(); // union builder final GeneratedTOBuilder unionBuilder = newGeneratedTOBuilder(genTOBuilder.getPackageName(), genTOBuilder.getName() + "Builder"); @@ -834,10 +834,10 @@ public abstract class AbstractTypeProvider implements TypeProvider { method.setStatic(true); Set types = additionalTypes.get(module); if (types == null) { - types = Sets. newHashSet(unionBuilder.toInstance()); + types = Sets. newHashSet(unionBuilder.build()); additionalTypes.put(module, types); } else { - types.add(unionBuilder.toInstance()); + types.add(unionBuilder.build()); } } else if (innerTypeDefinition instanceof EnumTypeDefinition) { // enums are automatically Serializable @@ -851,7 +851,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { genTOBuilder.setTypedef(true); addUnitsToGenTO(genTOBuilder, typedef.getUnits().orElse(null)); makeSerializable(genTOBuilder); - returnType = genTOBuilder.toInstance(); + returnType = genTOBuilder.build(); } else { final Type javaType = javaTypeForSchemaDefinitionType(innerTypeDefinition, typedef); returnType = wrapJavaTypeIntoTO(basePackageName, typedef, javaType, module.getName()); @@ -906,7 +906,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { addUnitsToGenTO(genTOBuilder, typedef.getUnits().orElse(null)); genTOBuilder.setTypedef(true); makeSerializable(genTOBuilder); - return genTOBuilder.toInstance(); + return genTOBuilder.build(); } /** @@ -1140,7 +1140,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { if (parentModule != null && parentModule.getName() != null) { final Map, Map> modulesByDate = genTypeDefsContextMap.get(parentModule.getName()); final Map genTOsMap = modulesByDate.get(parentModule.getRevision()); - genTOsMap.put(newTypeDef.getQName().getLocalName(), genTOBuilder.toInstance()); + genTOsMap.put(newTypeDef.getQName().getLocalName(), genTOBuilder.build()); } } } @@ -1338,7 +1338,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { addUnitsToGenTO(genTOBuilder, typedef.getUnits().orElse(null)); makeSerializable(genTOBuilder); - return genTOBuilder.toInstance(); + return genTOBuilder.build(); } /** diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java index d6dc7fa896..32dd7394e1 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java @@ -475,7 +475,7 @@ public class TypeProviderTest { assertNotNull(unionTypeBuilder); - GeneratedTransferObject unionType = unionTypeBuilder.toInstance(); + GeneratedTransferObject unionType = unionTypeBuilder.build(); assertEquals("ComplexUnionType", unionType.getName()); unionTypeBuilder = provider.provideGeneratedTOBuilderForUnionTypeDef("test.package.name", @@ -483,7 +483,7 @@ public class TypeProviderTest { assertNotNull(unionTypeBuilder); - unionType = unionTypeBuilder.toInstance(); + unionType = unionTypeBuilder.build(); assertEquals("Union", unionType.getName()); unionTypeBuilder = provider.provideGeneratedTOBuilderForUnionTypeDef("test.package.name", @@ -491,7 +491,7 @@ public class TypeProviderTest { assertNotNull(unionTypeBuilder); - unionType = unionTypeBuilder.toInstance(); + unionType = unionTypeBuilder.build(); assertEquals("Union", unionType.getName()); } @@ -511,7 +511,7 @@ public class TypeProviderTest { assertNotNull(unionTypeBuilder); - final GeneratedTransferObject unionType = unionTypeBuilder.toInstance(); + final GeneratedTransferObject unionType = unionTypeBuilder.build(); assertEquals("ComplexStringIntUnionType", unionType.getName()); } @@ -711,15 +711,15 @@ public class TypeProviderTest { final GeneratedTOBuilder builder = new CodegenGeneratedTOBuilder("test.package", "TestBuilder"); CodegenTypeProvider.addUnitsToGenTO(builder, null); - GeneratedTransferObject genTO = builder.toInstance(); + GeneratedTransferObject genTO = builder.build(); assertTrue(genTO.getConstantDefinitions().isEmpty()); CodegenTypeProvider.addUnitsToGenTO(builder, ""); - genTO = builder.toInstance(); + genTO = builder.build(); assertTrue(genTO.getConstantDefinitions().isEmpty()); CodegenTypeProvider.addUnitsToGenTO(builder, "125"); - genTO = builder.toInstance(); + genTO = builder.build(); assertTrue(!genTO.getConstantDefinitions().isEmpty()); assertEquals(1, genTO.getConstantDefinitions().size()); assertEquals("_UNITS", genTO.getConstantDefinitions().get(0).getName()); diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractEnumerationBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractEnumerationBuilder.java index 9acbec1b89..80f47479fe 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractEnumerationBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractEnumerationBuilder.java @@ -169,7 +169,7 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem final ArrayList a = new ArrayList<>(); for (final AnnotationTypeBuilder b : builder.annotationBuilders) { - a.add(b.toInstance()); + a.add(b.build()); } this.annotations = ImmutableList.copyOf(a); } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedType.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedType.java index e2ce4f36ac..5801adada1 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedType.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedType.java @@ -94,23 +94,24 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat final ArrayList enclosedTypesList = new ArrayList<>(enclosedGenTypeBuilders.size() + enclosedGenTOBuilders.size()); for (final GeneratedTypeBuilder builder : enclosedGenTypeBuilders) { if (builder != null) { - enclosedTypesList.add(builder.toInstance()); + enclosedTypesList.add(builder.build()); } } for (final GeneratedTOBuilder builder : enclosedGenTOBuilders) { if (builder != null) { - enclosedTypesList.add(builder.toInstance()); + enclosedTypesList.add(builder.build()); } } return makeUnmodifiable(enclosedTypesList); } - protected static final List toUnmodifiableAnnotations(final List annotationBuilders) { + protected static final List toUnmodifiableAnnotations( + final List annotationBuilders) { final List annotationList = new ArrayList<>(annotationBuilders.size()); for (final AnnotationTypeBuilder builder : annotationBuilders) { - annotationList.add(builder.toInstance()); + annotationList.add(builder.build()); } return makeUnmodifiable(annotationList); } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java index 6a9d33e72b..c746714b31 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java @@ -114,7 +114,7 @@ abstract class AbstractTypeMemberBuilder> impleme final List annotations = new ArrayList<>(); for (final AnnotationTypeBuilder annotBuilder : getAnnotationBuilders()) { if (annotBuilder != null) { - annotations.add(annotBuilder.toInstance()); + annotations.add(annotBuilder.build()); } } @@ -125,8 +125,8 @@ abstract class AbstractTypeMemberBuilder> impleme public int hashCode() { final int prime = 31; int result = 1; - result = (prime * result) + Objects.hashCode(getName()); - result = (prime * result) + Objects.hashCode(getReturnType()); + result = prime * result + Objects.hashCode(getName()); + result = prime * result + Objects.hashCode(getReturnType()); return result; } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java index 1318f53d2b..316eb5701d 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -32,7 +32,7 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota @Override public AnnotationTypeBuilder addAnnotation(final String packageName, final String name) { - if ((packageName != null) && (name != null)) { + if (packageName != null && name != null) { final AnnotationTypeBuilder builder = new AnnotationTypeBuilderImpl(packageName, name); if (!this.annotationBuilders.contains(builder)) { this.annotationBuilders = LazyCollections.lazyAdd(this.annotationBuilders, builder); @@ -53,7 +53,7 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota @Override public boolean addParameter(final String paramName, final String value) { - if ((paramName != null) && (value != null)) { + if (paramName != null && value != null) { final ParameterImpl param = new ParameterImpl(paramName, value); return addParameter(param); } @@ -62,7 +62,7 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota @Override public boolean addParameters(final String paramName, final List values) { - if ((paramName != null) && (values != null)) { + if (paramName != null && values != null) { final ParameterImpl param = new ParameterImpl(paramName, values); return addParameter(param); } @@ -70,7 +70,7 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota } @Override - public AnnotationType toInstance() { + public AnnotationType build() { return new AnnotationTypeImpl(this.packageName, this.name, this.annotationBuilders, this.parameters); } @@ -78,8 +78,8 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota public int hashCode() { final int prime = 31; int result = 1; - result = (prime * result) + Objects.hashCode(this.name); - result = (prime * result) + Objects.hashCode(this.packageName); + result = prime * result + Objects.hashCode(this.name); + result = prime * result + Objects.hashCode(this.packageName); return result; } @@ -129,7 +129,7 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota final List a = new ArrayList<>(); for (final AnnotationTypeBuilder builder : annotationBuilders) { - a.add(builder.toInstance()); + a.add(builder.build()); } this.annotations = ImmutableList.copyOf(a); @@ -194,8 +194,8 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota public int hashCode() { final int prime = 31; int result = 1; - result = (prime * result) + Objects.hashCode(this.name); - result = (prime * result) + Objects.hashCode(this.packageName); + result = prime * result + Objects.hashCode(this.name); + result = prime * result + Objects.hashCode(this.packageName); return result; } @@ -267,7 +267,7 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota public int hashCode() { final int prime = 31; int result = 1; - result = (prime * result) + Objects.hashCode(this.name); + result = prime * result + Objects.hashCode(this.name); return result; } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTOBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTOBuilder.java index 69c46aaa86..2a0f45297a 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTOBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTOBuilder.java @@ -38,7 +38,7 @@ public final class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder } @Override - public GeneratedTransferObject toInstance() { + public GeneratedTransferObject build() { return new GTO(this); } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java index 838c92d00a..57615bccea 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java @@ -77,7 +77,7 @@ public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuil } @Override - public GeneratedType toInstance() { + public GeneratedType build() { return new GeneratedTypeImpl(this); } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java index c99338e650..a7a8e9d35d 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java @@ -51,7 +51,7 @@ public final class RuntimeGeneratedTOBuilder extends AbstractGeneratedTOBuilder } @Override - public GeneratedTransferObject toInstance() { + public GeneratedTransferObject build() { return new GTO(this); } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java index 0778d865d4..51bbcbc519 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java @@ -22,7 +22,7 @@ public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuil } @Override - public GeneratedType toInstance() { + public GeneratedType build() { return new GeneratedTypeImpl(this); } diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationBuilderTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationBuilderTest.java index 02a5589ea1..ca372df4c3 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationBuilderTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationBuilderTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.AnnotationType.Parameter; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; @@ -26,6 +25,7 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBu import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.util.Types; public class AnnotationBuilderTest { @@ -38,7 +38,7 @@ public class AnnotationBuilderTest { final AnnotationTypeBuilder annotDesc = genTypeBuilder.addAnnotation("javax.management", "Description"); annotDesc.addParameter("description", "some sort of interface"); - final GeneratedType genType = genTypeBuilder.toInstance(); + final GeneratedType genType = genTypeBuilder.build(); assertNotNull(genType); assertNotNull(genType.getAnnotations()); @@ -83,13 +83,13 @@ public class AnnotationBuilderTest { final AnnotationTypeBuilder annotManProp = methodBuilder.addAnnotation( "org.springframework.jmx.export.annotation", "ManagedOperation"); - final List typeValues = new ArrayList(); + final List typeValues = new ArrayList<>(); typeValues.add("\"val1\""); typeValues.add("\"val2\""); typeValues.add("\"val3\""); annotManProp.addParameters("types", typeValues); - final GeneratedType genType = genTypeBuilder.toInstance(); + final GeneratedType genType = genTypeBuilder.build(); assertNotNull(genType); assertNotNull(genType.getAnnotations()); @@ -145,13 +145,13 @@ public class AnnotationBuilderTest { final AnnotationTypeBuilder annotManProp = propertyBuilder.addAnnotation( "org.springframework.jmx.export.annotation", "ManagedOperation"); - final List typeValues = new ArrayList(); + final List typeValues = new ArrayList<>(); typeValues.add("\"val1\""); typeValues.add("\"val2\""); typeValues.add("\"val3\""); annotManProp.addParameters("types", typeValues); - final GeneratedTransferObject genTransObj = genTOBuilder.toInstance(); + final GeneratedTransferObject genTransObj = genTOBuilder.build(); assertNotNull(genTransObj); assertNotNull(genTransObj.getAnnotations()); @@ -197,12 +197,12 @@ public class AnnotationBuilderTest { genTypeBuilder.addAnnotation("javax.management", "MBean"); final AnnotationTypeBuilder annotNotify = genTypeBuilder.addAnnotation("javax.management", "NotificationInfo"); - final List notifyList = new ArrayList(); + final List notifyList = new ArrayList<>(); notifyList.add("\"my.notif.type\""); annotNotify.addParameters("types", notifyList); annotNotify.addParameter("description", "@Description(\"my notification\")"); - GeneratedTransferObject genTO = genTypeBuilder.toInstance(); + GeneratedTransferObject genTO = genTypeBuilder.build(); assertNotNull(genTO); assertNotNull(genTO.getAnnotations()); @@ -248,7 +248,7 @@ public class AnnotationBuilderTest { assertNotNull(annotationTypeBuilder.addAnnotation("my.package2", "MyName2")); assertNull(annotationTypeBuilder.addAnnotation("my.package2", "MyName2")); - AnnotationType annotationTypeInstance = annotationTypeBuilder.toInstance(); + AnnotationType annotationTypeInstance = annotationTypeBuilder.build(); assertEquals(2, annotationTypeInstance.getAnnotations().size()); @@ -273,10 +273,10 @@ public class AnnotationBuilderTest { assertFalse(annotationTypeBuilder.equals(annotationTypeBuilder2)); assertFalse(annotationTypeBuilder.equals(annotationTypeBuilder3)); - AnnotationType instance = annotationTypeBuilder.toInstance(); - AnnotationType instance2 = annotationTypeBuilder2.toInstance(); - AnnotationType instance3 = annotationTypeBuilder3.toInstance(); - AnnotationType instance4 = annotationTypeBuilder4.toInstance(); + AnnotationType instance = annotationTypeBuilder.build(); + AnnotationType instance2 = annotationTypeBuilder2.build(); + AnnotationType instance3 = annotationTypeBuilder3.build(); + AnnotationType instance4 = annotationTypeBuilder4.build(); assertFalse(instance.equals(null)); assertFalse(instance.equals(new Object())); @@ -290,8 +290,8 @@ public class AnnotationBuilderTest { annotationTypeBuilder.addParameter("myName2", "myValue2"); annotationTypeBuilder2.addParameter("myName", "myValue3"); - instance = annotationTypeBuilder.toInstance(); - instance2 = annotationTypeBuilder2.toInstance(); + instance = annotationTypeBuilder.build(); + instance2 = annotationTypeBuilder2.build(); Parameter parameter = instance.getParameter("myName"); Parameter parameter2 = instance.getParameter("myName2"); @@ -317,10 +317,10 @@ public class AnnotationBuilderTest { assertTrue(annotationTypeBuilder.hashCode() == annotationTypeBuilder4.hashCode()); assertTrue(annotationTypeBuilder.hashCode() == annotationTypeBuilder.hashCode()); - AnnotationType instance = annotationTypeBuilder.toInstance(); - AnnotationType instance2 = annotationTypeBuilder2.toInstance(); - AnnotationType instance3 = annotationTypeBuilder3.toInstance(); - AnnotationType instance4 = annotationTypeBuilder4.toInstance(); + AnnotationType instance = annotationTypeBuilder.build(); + AnnotationType instance2 = annotationTypeBuilder2.build(); + AnnotationType instance3 = annotationTypeBuilder3.build(); + AnnotationType instance4 = annotationTypeBuilder4.build(); assertFalse(instance.hashCode() == instance2.hashCode()); assertFalse(instance.hashCode() == instance3.hashCode()); @@ -332,8 +332,8 @@ public class AnnotationBuilderTest { annotationTypeBuilder.addParameter("myName2", "myValue2"); annotationTypeBuilder2.addParameter("myName", "myValue3"); - instance = annotationTypeBuilder.toInstance(); - instance2 = annotationTypeBuilder2.toInstance(); + instance = annotationTypeBuilder.build(); + instance2 = annotationTypeBuilder2.build(); Parameter parameter = instance.getParameter("myName"); Parameter parameter2 = instance.getParameter("myName2"); @@ -359,11 +359,11 @@ public class AnnotationBuilderTest { assertFalse(annotationTypeBuilder.addParameter("myName", "myValue")); assertFalse(annotationTypeBuilder.addParameters("myName", new ArrayList())); - ArrayList values = new ArrayList(); + ArrayList values = new ArrayList<>(); values.add("myValue"); assertTrue(annotationTypeBuilder.addParameters("myName2", values)); - AnnotationType annotationTypeInstance = annotationTypeBuilder.toInstance(); + AnnotationType annotationTypeInstance = annotationTypeBuilder.build(); assertTrue(annotationTypeInstance.containsParameters()); assertEquals(2, annotationTypeInstance.getParameters().size()); assertEquals(2, annotationTypeInstance.getParameterNames().size()); @@ -397,7 +397,7 @@ public class AnnotationBuilderTest { "AnnotationTypeBuilder [packageName=my.package, name=MyAnnotationName, annotationBuilders=[AnnotationTypeBuilder [packageName=my.package, name=MySubAnnotationName, annotationBuilders=[], parameters=[]]], parameters=[ParameterImpl [name=MyParameter, value=myValue, values=[]]]]", annotationTypeBuilder.toString()); - AnnotationType annotationTypeInstance = annotationTypeBuilder.toInstance(); + AnnotationType annotationTypeInstance = annotationTypeBuilder.build(); assertEquals("my.package.MyAnnotationName", annotationTypeInstance.getFullyQualifiedName()); assertEquals( @@ -410,7 +410,7 @@ public class AnnotationBuilderTest { final AnnotationTypeBuilderImpl annotBuilderImpl = new AnnotationTypeBuilderImpl("org.opedaylight.yangtools.test", "AnnotationTest"); annotBuilderImpl.addAnnotation("org.opedaylight.yangtools.test.v1", "AnnotationTest2"); annotBuilderImpl.addAnnotation(null, "AnnotationTest2"); - assertFalse(annotBuilderImpl.toInstance().getAnnotations().isEmpty()); + assertFalse(annotBuilderImpl.build().getAnnotations().isEmpty()); } @Test @@ -418,7 +418,7 @@ public class AnnotationBuilderTest { final AnnotationTypeBuilderImpl annotBuilderImpl = new AnnotationTypeBuilderImpl("org.opedaylight.yangtools.test", "AnnotationTest"); annotBuilderImpl.addParameter("testParam", "test value"); annotBuilderImpl.addParameter(null, "test value"); - final AnnotationType annotType = annotBuilderImpl.toInstance(); + final AnnotationType annotType = annotBuilderImpl.build(); assertEquals(1, annotType.getParameters().size()); } @@ -432,12 +432,12 @@ public class AnnotationBuilderTest { values.add("test3"); annotBuilderImpl.addParameters("testParam", values); - AnnotationType annotType = annotBuilderImpl.toInstance(); + AnnotationType annotType = annotBuilderImpl.build(); assertEquals(1, annotType.getParameters().size()); annotBuilderImpl.addParameters("testParam", null); - annotType = annotBuilderImpl.toInstance(); + annotType = annotBuilderImpl.build(); assertEquals(1, annotType.getParameters().size()); } @@ -470,10 +470,10 @@ public class AnnotationBuilderTest { public void testMethodsForAnnotationTypeImpl() { final AnnotationTypeBuilderImpl annotBuilderImpl = new AnnotationTypeBuilderImpl("org.opedaylight.yangtools.test", "AnnotationTest"); annotBuilderImpl.addParameter("testParam", "test value"); - final AnnotationType annotationType = annotBuilderImpl.toInstance(); + final AnnotationType annotationType = annotBuilderImpl.build(); final AnnotationTypeBuilderImpl annotBuilderImpl2 = new AnnotationTypeBuilderImpl("org.opedaylight.yangtools.test", "AnnotationTest"); - final AnnotationType annotationType2 = annotBuilderImpl2.toInstance(); + final AnnotationType annotationType2 = annotBuilderImpl2.build(); assertTrue(annotationType.containsParameters()); assertTrue(annotationType.getAnnotations().isEmpty()); @@ -498,7 +498,7 @@ public class AnnotationBuilderTest { annotBuilderImpl.addParameter("", "test value"); annotBuilderImpl.addParameter(null, "test value"); annotBuilderImpl.addParameter("", null); - final AnnotationType annotationType = annotBuilderImpl.toInstance(); + final AnnotationType annotationType = annotBuilderImpl.build(); final Parameter testParam = annotationType.getParameter("testParam"); assertEquals("testParam", testParam.getName()); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImplTest.java index c4c5c98258..b0e3b14aec 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImplTest.java @@ -7,12 +7,15 @@ */ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.util.Types; public class GeneratedPropertyImplTest { @@ -28,7 +31,7 @@ public class GeneratedPropertyImplTest { generatedPropertyBuilderImpl.setReturnType(Types.BOOLEAN); GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(new CodegenGeneratedTypeBuilder("my.package", - "myTypeName").toInstance()); + "myTypeName").build()); assertNotNull(instance); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java index a936933d50..fa217f39c7 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java @@ -34,9 +34,9 @@ public class GeneratedTOBuilderImplTest { public void testSetExtendsType() { final CodegenGeneratedTOBuilder genTOBuilder = new CodegenGeneratedTOBuilder("org.opendaylight.yangtools.test", "Test"); final CodegenGeneratedTOBuilder extendedTypeBuilder = new CodegenGeneratedTOBuilder("org.opendaylight.yangtools.test", "ExtendedType"); - final GeneratedTransferObject extendedType = extendedTypeBuilder.toInstance(); + final GeneratedTransferObject extendedType = extendedTypeBuilder.build(); genTOBuilder.setExtendsType(extendedType); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertEquals("ExtendedType", genTO.getSuperType().getName()); } @@ -55,7 +55,7 @@ public class GeneratedTOBuilderImplTest { final GeneratedPropertyBuilderImpl propertyBuilder = new GeneratedPropertyBuilderImpl("testProperty"); genTOBuilder.addEqualsIdentity(propertyBuilder); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertEquals(1, genTO.getEqualsIdentifiers().size()); assertEquals("testProperty", genTO.getEqualsIdentifiers().get(0).getName()); } @@ -66,7 +66,7 @@ public class GeneratedTOBuilderImplTest { final GeneratedPropertyBuilderImpl propertyBuilder = new GeneratedPropertyBuilderImpl("testProperty"); genTOBuilder.addHashIdentity(propertyBuilder); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertEquals(1, genTO.getHashCodeIdentifiers().size()); assertEquals("testProperty", genTO.getHashCodeIdentifiers().get(0).getName()); } @@ -77,7 +77,7 @@ public class GeneratedTOBuilderImplTest { final GeneratedPropertyBuilderImpl propertyBuilder = new GeneratedPropertyBuilderImpl("testProperty"); genTOBuilder.addToStringProperty(propertyBuilder); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertEquals(1, genTO.getToStringIdentifiers().size()); assertEquals("testProperty", genTO.getToStringIdentifiers().get(0).getName()); } @@ -108,7 +108,7 @@ public class GeneratedTOBuilderImplTest { } }; genTOBuilder.setRestrictions(restrictions); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertNotNull(genTO.getRestrictions()); } @@ -119,7 +119,7 @@ public class GeneratedTOBuilderImplTest { final GeneratedPropertyBuilderImpl propertyBuilder = new GeneratedPropertyBuilderImpl("testProperty"); genTOBuilder.setSUID(propertyBuilder); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertEquals("testProperty", genTO.getSUID().getName()); } @@ -140,7 +140,7 @@ public class GeneratedTOBuilderImplTest { genTOBuilder.setReference("http://tools.ietf.org/html/rfc6020"); genTOBuilder.setSchemaPath(SchemaPath.ROOT); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertTrue(genTO.isTypedef()); assertTrue(genTO.isUnionType()); @@ -154,7 +154,7 @@ public class GeneratedTOBuilderImplTest { @Test public void testMethodsOfGeneratedTransferObjectImpl() { final CodegenGeneratedTOBuilder genTOBuilder = new CodegenGeneratedTOBuilder("org.opendaylight.yangtools.test", "Test"); - final GeneratedTransferObject genTO = genTOBuilder.toInstance(); + final GeneratedTransferObject genTO = genTOBuilder.build(); assertNotNull(genTO.toString()); } diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderTest.java index 9aa88d63fd..e485e8317f 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderTest.java @@ -26,7 +26,7 @@ public class GeneratedTOBuilderTest { genTypeBuilder.setSUID(genTypeBuilder.addProperty("SUID")); genTypeBuilder.addMethod("addCount"); - GeneratedTransferObject genTO = genTypeBuilder.toInstance(); + GeneratedTransferObject genTO = genTypeBuilder.build(); genTypeBuilder.setExtendsType(genTO); GeneratedPropertyBuilder property = genTypeBuilder @@ -55,7 +55,7 @@ public class GeneratedTOBuilderTest { "org.opendaylight.controller", "AnnotClassCache"); genTypeBuilder1.setTypedef(true); - GeneratedTransferObject genTO = genTypeBuilder1.toInstance(); + GeneratedTransferObject genTO = genTypeBuilder1.build(); String toString = genTO.toString(); assertFalse(toString.contains("GeneratedTransferObject")); @@ -63,7 +63,7 @@ public class GeneratedTOBuilderTest { "org.opendaylight.controller", "AnnotClassCache"); genTypeBuilder2.setTypedef(false); - genTO = genTypeBuilder2.toInstance(); + genTO = genTypeBuilder2.build(); toString = genTO.toString(); assertTrue(toString.contains("GeneratedTransferObject")); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java index 8fcbab8140..d484fdab30 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java @@ -83,7 +83,7 @@ public class GeneratedTypeBuilderTest { assertEquals("Type (java.lang.String) myConstant myConstantValue", constant.toFormattedString()); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); List constantDefinitions = instance.getConstantDefinitions(); assertNotNull(constantDefinitions); assertEquals(2, constantDefinitions.size()); @@ -147,7 +147,7 @@ public class GeneratedTypeBuilderTest { assertTrue(generatedTypeBuilder.containsProperty("myProperty2")); assertFalse(generatedTypeBuilder.containsProperty("myProperty3")); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); List properties = instance.getProperties(); assertEquals(2, properties.size()); @@ -161,13 +161,13 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addMethodIllegalArgumentTest() { - CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addMethod(null); } @Test public void addMethodTest() { - CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); MethodSignatureBuilder methodBuilder = generatedTypeBuilder.addMethod("myMethodName"); MethodSignatureBuilder methodBuilder2 = generatedTypeBuilder.addMethod("myMethodName2"); @@ -179,7 +179,7 @@ public class GeneratedTypeBuilderTest { assertTrue(generatedTypeBuilder.containsMethod("myMethodName2")); assertFalse(generatedTypeBuilder.containsMethod("myMethodName3")); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); List methodDefinitions = instance.getMethodDefinitions(); assertEquals(2, methodDefinitions.size()); @@ -199,7 +199,7 @@ public class GeneratedTypeBuilderTest { @Test public void addEnumerationTest() { - CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); EnumBuilder enumBuilder = generatedTypeBuilder.addEnumeration("myEnumName"); EnumBuilder enumBuilder2 = generatedTypeBuilder.addEnumeration("myEnumName2"); @@ -207,7 +207,7 @@ public class GeneratedTypeBuilderTest { assertNotNull(enumBuilder); assertNotNull(enumBuilder2); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); List enumerations = instance.getEnumerations(); assertEquals(2, enumerations.size()); @@ -220,7 +220,7 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addImplementsTypeIllegalArgumentTest() { - CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addImplementsType(null); } @@ -233,7 +233,7 @@ public class GeneratedTypeBuilderTest { generatedTypeBuilder.addImplementsType(Types.typeForClass(Serializable.class))); assertEquals(generatedTypeBuilder, generatedTypeBuilder.addImplementsType(Types.typeForClass(Runnable.class))); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); List implementTypes = instance.getImplements(); assertEquals(2, implementTypes.size()); @@ -260,7 +260,7 @@ public class GeneratedTypeBuilderTest { @Test public void addEnclosingTransferObjectTest() { - CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); GeneratedTOBuilder enclosingTransferObject = generatedTypeBuilder.addEnclosingTransferObject("myTOName"); GeneratedTOBuilder enclosingTransferObject2 = generatedTypeBuilder.addEnclosingTransferObject("myTOName2"); @@ -270,23 +270,23 @@ public class GeneratedTypeBuilderTest { assertNotNull(enclosingTransferObject); assertNotNull(enclosingTransferObject2); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); List enclosedTypes = instance.getEnclosedTypes(); assertEquals(3, enclosedTypes.size()); - assertTrue(enclosedTypes.contains(enclosingTransferObject.toInstance())); - assertTrue(enclosedTypes.contains(enclosingTransferObject2.toInstance())); + assertTrue(enclosedTypes.contains(enclosingTransferObject.build())); + assertTrue(enclosedTypes.contains(enclosingTransferObject2.build())); assertTrue(enclosedTypes.contains(new CodegenGeneratedTOBuilder(generatedTypeBuilder.getFullyQualifiedName(), - "myTOName3").toInstance())); + "myTOName3").build())); assertFalse(enclosedTypes.contains(new CodegenGeneratedTOBuilder(generatedTypeBuilder.getFullyQualifiedName(), - "myTOName4").toInstance())); + "myTOName4").build())); } @Test public void generatedTypeTest() { - CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.setDescription("My description ..."); generatedTypeBuilder.setModuleName("myModuleName"); @@ -298,7 +298,7 @@ public class GeneratedTypeBuilderTest { "GeneratedTransferObject [packageName=my.package, name=MyName, comment=My comment.., annotations=[], implements=[], enclosedTypes=[], constants=[], enumerations=[], properties=, methods=[]]", generatedTypeBuilder.toString()); - GeneratedType instance = generatedTypeBuilder.toInstance(); + GeneratedType instance = generatedTypeBuilder.build(); assertEquals("My description ...", instance.getDescription()); assertEquals("myModuleName", instance.getModuleName()); diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend index 02d2f45132..12e975c268 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend @@ -127,7 +127,7 @@ class BuilderTemplate extends BaseTemplate { val generic = new ReferencedTypeImpl(type.packageName, type.name) val parametrizedReturnType = Types.parameterizedTypeFor(refType, generic) tmpGenTO.addMethod(m.name).setReturnType(parametrizedReturnType) - augmentField = tmpGenTO.toInstance.methodDefinitions.first.propertyFromGetter + augmentField = tmpGenTO.build.methodDefinitions.first.propertyFromGetter } } } @@ -209,7 +209,7 @@ class BuilderTemplate extends BaseTemplate { val fieldName = method.getName().substring(prefix.length()).toFirstLower val tmpGenTO = new CodegenGeneratedTOBuilder("foo", "foo") tmpGenTO.addProperty(fieldName).setReturnType(method.returnType) - return tmpGenTO.toInstance.properties.first + return tmpGenTO.build.properties.first } } diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java index 0baeafe54b..bd47d5c1e8 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java @@ -101,7 +101,7 @@ public class ClassCodeGeneratorTest { propBuilder.setReturnType(Types.typeForClass(Integer.class)); propBuilder.setReadOnly(false); - final GeneratedTransferObject genTO = toBuilder.toInstance(); + final GeneratedTransferObject genTO = toBuilder.build(); final TOGenerator clsGen = new TOGenerator(); final String outputStr = clsGen.generate(genTO); @@ -123,7 +123,7 @@ public class ClassCodeGeneratorTest { propBuilder.setReturnType(Types.typeForClass(Integer.class)); propBuilder.setReadOnly(false); toBuilder.addToStringProperty(propBuilder); - final GeneratedTransferObject genTO = toBuilder.toInstance(); + final GeneratedTransferObject genTO = toBuilder.build(); final TOGenerator clsGen = new TOGenerator(); assertEquals("", clsGen.generate(Types.typeForClass(String.class))); assertNotNull(clsGen.generate(genTO)); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java index 6e7852ba9e..9227899ab9 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java @@ -29,7 +29,7 @@ public class GeneratorJavaFileTest { @Test public void test() throws IOException { - final Set types = new HashSet(); + final Set types = new HashSet<>(); GeneratedType t1 = createGeneratedType("org.opendaylight.controller.gen", "Type1"); GeneratedType t2 = createGeneratedType("org.opendaylight.controller.gen", "Type2"); GeneratedType t3 = createGeneratedType("org.opendaylight.controller.gen", "Type3"); @@ -38,7 +38,7 @@ public class GeneratorJavaFileTest { types.add(t3); GeneratedTypeBuilder gtb = new CodegenGeneratedTypeBuilder("org.opendaylight.controller.gen", "Type4"); gtb.addImplementsType(Types.augmentableTypeFor(gtb)); - types.add(gtb.toInstance()); + types.add(gtb.build()); GeneratorJavaFile generator = new GeneratorJavaFile(types); generator.generateToFile(new File(PATH)); @@ -53,10 +53,10 @@ public class GeneratorJavaFileTest { assertTrue(filesList.contains("Type4Builder.java")); } - private static GeneratedType createGeneratedType(String pkgName, String name) { + private static GeneratedType createGeneratedType(final String pkgName, final String name) { GeneratedTypeBuilder builder = new CodegenGeneratedTypeBuilder(pkgName, name); builder.addImplementsType(BindingTypes.DATA_OBJECT); - return builder.toInstance(); + return builder.build(); } } -- 2.36.6