From 7ad583ed505fa451d6165f6d88bd1c2f197e0b61 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Apr 2021 13:52:28 +0200 Subject: [PATCH] Remove parent type references Requiring Constant, Enumeration, GeneratedType and TypeMember to report its enclosing/parent type leads to circular dependencies, as the parent type needs to report the objects as well. This leads to the requirement to perform callouts from constructor -- utterly fusing parents and children together. As it turns out, though, these references are not used anywhere and hence we can completely ditch them. Change-Id: Ic9bfa6d0b69ffa3bdc1cd02c824405c9e22d0375 Signed-off-by: Robert Varga --- .../mdsal/binding/model/api/Constant.java | 26 +++++------------ .../mdsal/binding/model/api/Enumeration.java | 11 ------- .../binding/model/api/GeneratedType.java | 7 ----- .../mdsal/binding/model/api/TypeMember.java | 7 ----- .../api/type/builder/ConstantBuilder.java | 3 +- .../model/api/type/builder/EnumBuilder.java | 2 +- .../builder/GeneratedPropertyBuilder.java | 4 +-- .../generator/impl/AbstractTypeGenerator.java | 2 +- .../yang/types/AbstractTypeProvider.java | 4 +-- .../builder/AbstractEnumerationBuilder.java | 20 ++----------- .../type/builder/AbstractGeneratedType.java | 20 ++----------- .../builder/AbstractGeneratedTypeBuilder.java | 2 +- .../type/builder/AbstractTypeMember.java | 22 ++++---------- .../builder/CodegenEnumerationBuilder.java | 9 +++--- .../builder/CodegenGeneratedTOBuilder.java | 2 +- .../generated/type/builder/ConstantImpl.java | 18 +----------- .../builder/GeneratedPropertyBuilderImpl.java | 7 ++--- .../type/builder/GeneratedPropertyImpl.java | 21 +++++--------- .../builder/MethodSignatureBuilderImpl.java | 4 +-- .../type/builder/MethodSignatureImpl.java | 29 +++++++------------ .../builder/RuntimeEnumerationBuilder.java | 9 +++--- .../type/builder/AbstractTypeMemberTest.java | 3 +- .../type/builder/ConstantImplTest.java | 15 ++++------ .../builder/EnumerationBuilderImplTest.java | 25 +++++++--------- .../GeneratedPropertyBuilderImplTest.java | 2 +- .../builder/GeneratedPropertyImplTest.java | 14 ++++----- .../type/builder/GeneratedPropertyTest.java | 4 +-- .../builder/GeneratedTypeBuilderTest.java | 27 +++++++---------- .../type/builder/MethodSignatureImplTest.java | 8 ++--- .../generator/BuilderGeneratedProperty.java | 5 ---- 30 files changed, 98 insertions(+), 234 deletions(-) diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java index 9f1cf768b3..165604acd7 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java @@ -8,27 +8,15 @@ package org.opendaylight.mdsal.binding.model.api; /** - * Interface Contact is designed to hold and model java constant. In Java there - * are no constant keywords instead of the constant is defined as static final - * field with assigned value. For this purpose the Constant interface contains - * methods {@link #getType()} to provide wrapped return Type of Constant, - * {@link #getName()} the Name of constant and the {@link #getValue()} for - * providing of value assigned to Constant. To determine of which type the - * constant value is it is recommended firstly to retrieve Type from constant. - * The Type interface holds base information like java package name and java - * type name (e.g. fully qualified name). From this string user should be able - * to determine to which type can be {@link #getValue()} type typecasted to - * unbox and provide value assigned to constant. + * Interface Contact is designed to hold and model java constant. In Java there are no constant keywords instead of the + * constant is defined as static final field with assigned value. For this purpose the Constant interface contains + * methods {@link #getType()} to provide wrapped return Type of Constant, {@link #getName()} the Name of constant and + * the {@link #getValue()} for providing of value assigned to Constant. To determine of which type the constant value is + * it is recommended firstly to retrieve Type from constant. The Type interface holds base information like java package + * name and java type name (e.g. fully qualified name). From this string user should be able to determine to which type + * can be {@link #getValue()} type typecasted to unbox and provide value assigned to constant. */ public interface Constant { - - /** - * Returns the Type that declares constant. - * - * @return the Type that declares constant. - */ - Type getDefiningType(); - /** * Returns the return Type (or just Type) of the Constant. * diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java index 270c146802..746e55d241 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java @@ -14,17 +14,6 @@ import org.opendaylight.yangtools.yang.model.api.DocumentedNode; * Interface provide methods for reading data of enumeration class. */ public interface Enumeration extends GeneratedType { - /** - * Returns list of annotation definitions associated with enumeration type. - * - * @return list of annotation definitions associated with enumeration type. - */ - @Override - List getAnnotations(); - - @Override - Type getParentType(); - /** * Returns list of the couples - name and value. * diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java index bf74e5c61b..da38098e9c 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java @@ -30,13 +30,6 @@ import java.util.Optional; * no need to specify the scope of visibility. */ public interface GeneratedType extends Type, DocumentedType { - /** - * Returns the parent type if Generated Type is defined as enclosing type, otherwise returns null. - * - * @return the parent type if Generated Type is defined as enclosing type, otherwise returns null - */ - Type getParentType(); - /** * Returns comment string associated with Generated Type. * diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java index 76b93a3ebc..dd312e483a 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java @@ -62,11 +62,4 @@ public interface TypeMember { * @return the name of member. */ String getName(); - - /** - * Returns the Type that declares member. - * - * @return the Type that declares member. - */ - Type getDefiningType(); } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java index 52af4456eb..9dd6998478 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java @@ -8,11 +8,10 @@ package org.opendaylight.mdsal.binding.model.api.type.builder; import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Type; public interface ConstantBuilder { void assignValue(Object value); - Constant toInstance(Type definingType); + Constant toInstance(); } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java index 1815a09046..9f66e313db 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java @@ -20,7 +20,7 @@ public interface EnumBuilder extends Type, AnnotableTypeBuilder { void setDescription(String description); - Enumeration toInstance(Type definingType); + Enumeration toInstance(); /** * Updates this builder with data from enumTypeDef. Specifically this data represents list diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java index 114e37b651..75d4a6ec7c 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.model.api.type.builder; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.Type; /** * Generated Property Builder is interface that contains methods to build and instantiate Generated Property definition. @@ -35,8 +34,7 @@ public interface GeneratedPropertyBuilder extends TypeMemberBuildernull reference the method SHOULD thrown * {@link IllegalArgumentException}. * - * @param definingType Defining Type of Generated Property * @return new immutable instance of Generated Property. */ - GeneratedProperty toInstance(Type definingType); + GeneratedProperty toInstance(); } 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 b37efac412..cb50ded0b3 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 @@ -847,7 +847,7 @@ abstract class AbstractTypeGenerator { final EnumBuilder enumBuilder = typeBuilder.addEnumeration(BindingMapping.getClassName(enumName)); typeProvider.addEnumDescription(enumBuilder, enumTypeDef); enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef); - final Enumeration ret = enumBuilder.toInstance(typeBuilder); + final Enumeration ret = enumBuilder.toInstance(); context.addTypeToSchema(ret, enumTypeDef); context.addInnerTypedefType(enumTypeDef.getPath(), ret); return ret; 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 ffac152c86..47667067a4 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 @@ -635,7 +635,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { enumBuilder.setModuleName(module.getName()); enumBuilder.setSchemaPath(enumTypeDef.getPath()); enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef); - return enumBuilder.toInstance(null); + return enumBuilder.toInstance(); } /** @@ -669,7 +669,7 @@ public abstract class AbstractTypeProvider implements TypeProvider { addEnumDescription(enumBuilder, enumTypeDef); enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef); - return enumBuilder.toInstance(enumBuilder); + return enumBuilder.toInstance(); } public abstract void addEnumDescription(EnumBuilder enumBuilder, EnumTypeDefinition enumTypeDef); 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 4dce6e448d..476608c1b2 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 @@ -162,14 +162,11 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem } abstract static class AbstractEnumeration extends AbstractBaseType implements Enumeration { - - private final Type definingType; - private final List values; private final List annotations; + private final List values; - AbstractEnumeration(final AbstractEnumerationBuilder builder, final Type definingType) { + AbstractEnumeration(final AbstractEnumerationBuilder builder) { super(builder.getIdentifier()); - this.definingType = definingType; this.values = ImmutableList.copyOf(builder.values); final ArrayList a = new ArrayList<>(); @@ -179,11 +176,6 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem this.annotations = ImmutableList.copyOf(a); } - @Override - public final Type getParentType() { - return this.definingType; - } - @Override public final List getValues() { return this.values; @@ -226,14 +218,6 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem final StringBuilder builder = new StringBuilder(); builder.append("Enumeration [packageName="); builder.append(getPackageName()); - if (this.definingType != null) { - builder.append(", definingType="); - builder.append(this.definingType.getPackageName()); - builder.append("."); - builder.append(this.definingType.getName()); - } else { - builder.append(", definingType= null"); - } builder.append(", name="); builder.append(getName()); builder.append(", values="); 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 19771709e0..73a1b16bbe 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 @@ -33,7 +33,6 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuil abstract class AbstractGeneratedType extends AbstractBaseType implements GeneratedType { - private final Type parent; private final TypeComment comment; private final List annotations; private final List implementsTypes; @@ -47,7 +46,6 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat AbstractGeneratedType(final AbstractGeneratedTypeBuilder builder) { super(builder.getIdentifier()); - this.parent = builder.getParent(); this.comment = builder.getComment(); this.annotations = toUnmodifiableAnnotations(builder.getAnnotations()); this.implementsTypes = makeUnmodifiable(builder.getImplementsTypes()); @@ -61,14 +59,13 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat this.definition = builder.getYangSourceDefinition().orElse(null); } - AbstractGeneratedType(final Type parent, final JavaTypeName identifier, final TypeComment comment, + AbstractGeneratedType(final JavaTypeName identifier, final TypeComment comment, final List annotationBuilders, final boolean isAbstract, final List implementsTypes, final List enclosedGenTypeBuilders, final List enclosedGenTOBuilders, final List enumBuilders, final List constants, final List methodBuilders, final List propertyBuilders) { super(identifier); - this.parent = parent; this.comment = comment; this.annotations = toUnmodifiableAnnotations(annotationBuilders); this.implementsTypes = makeUnmodifiable(implementsTypes); @@ -151,7 +148,7 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat protected final List toUnmodifiableEnumerations(final List enumBuilders) { final List enums = new ArrayList<>(enumBuilders.size()); for (final EnumBuilder enumBuilder : enumBuilders) { - enums.add(enumBuilder.toInstance(this)); + enums.add(enumBuilder.toInstance()); } return makeUnmodifiable(enums); } @@ -160,16 +157,11 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat final List methodBuilders) { final List methods = new ArrayList<>(methodBuilders.size()); for (final GeneratedPropertyBuilder methodBuilder : methodBuilders) { - methods.add(methodBuilder.toInstance(this)); + methods.add(methodBuilder.toInstance()); } return makeUnmodifiable(methods); } - @Override - public final Type getParentType() { - return this.parent; - } - @Override public final TypeComment getComment() { return this.comment; @@ -227,12 +219,6 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat builder.append(getPackageName()); builder.append(", name="); builder.append(getName()); - if (this.parent != null) { - builder.append(", parent="); - builder.append(this.parent.getFullyQualifiedName()); - } else { - builder.append(", parent=null"); - } builder.append(", comment="); builder.append(this.comment); builder.append(", annotations="); diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilder.java index 4d641a0e65..28ac9a3d1e 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilder.java @@ -148,7 +148,7 @@ abstract class AbstractGeneratedTypeBuilder annotations; private final boolean isFinal; private final boolean isStatic; private final AccessModifier accessModifier; - protected AbstractTypeMember(final Type definingType, final String name, final List annotations, + protected AbstractTypeMember(final String name, final List annotations, final TypeMemberComment comment, final AccessModifier accessModifier, final Type returnType, final boolean isFinal, final boolean isStatic) { - this.definingType = definingType; this.name = name; this.annotations = annotations; this.comment = comment; @@ -54,11 +52,6 @@ abstract class AbstractTypeMember implements TypeMember { return comment; } - @Override - public Type getDefiningType() { - return this.definingType; - } - @Override public AccessModifier getAccessModifier() { return this.accessModifier; @@ -98,17 +91,12 @@ abstract class AbstractTypeMember implements TypeMember { @Override public String toString() { - final StringBuilder builder = new StringBuilder() + return new StringBuilder() .append("AbstractTypeMember [name=").append(getName()) .append(", comment=").append(getComment()) - .append(", definingType="); - if (getDefiningType() != null) { - builder.append(getDefiningType().getPackageName()).append('.').append(getDefiningType().getName()); - } else { - builder.append(" null"); - } - return builder.append(", returnType=").append(getReturnType()) + .append(", returnType=").append(getReturnType()) .append(", annotations=").append(getAnnotations()) - .append(']').toString(); + .append(']') + .toString(); } } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenEnumerationBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenEnumerationBuilder.java index 92c5221e3c..f80e54274a 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenEnumerationBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenEnumerationBuilder.java @@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.TypeComment; import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; import org.opendaylight.yangtools.yang.common.QName; @@ -51,8 +50,8 @@ public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder } @Override - public Enumeration toInstance(final Type definingType) { - return new EnumerationImpl(this, definingType); + public Enumeration toInstance() { + return new EnumerationImpl(this); } @Override @@ -96,8 +95,8 @@ public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder private final String moduleName; private final SchemaPath schemaPath; - EnumerationImpl(final CodegenEnumerationBuilder builder, final Type definingType) { - super(builder, definingType); + EnumerationImpl(final CodegenEnumerationBuilder builder) { + super(builder); this.description = builder.description; this.moduleName = builder.moduleName; this.schemaPath = builder.schemaPath; 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 4a27bbe31a..b115bf5d2e 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 @@ -87,7 +87,7 @@ public final class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder if (builder.suid == null) { this.suid = null; } else { - this.suid = builder.suid.toInstance(GTO.this); + this.suid = builder.suid.toInstance(); } } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java index 7ad4fbb3c8..a0437f3d28 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java @@ -12,24 +12,16 @@ import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Type; final class ConstantImpl implements Constant { - - private final Type definingType; private final Type type; private final String name; private final Object value; - ConstantImpl(final Type definingType, final Type type, final String name, final Object value) { - this.definingType = definingType; + ConstantImpl(final Type type, final String name, final Object value) { this.type = type; this.name = name; this.value = value; } - @Override - public Type getDefiningType() { - return this.definingType; - } - @Override public Type getType() { return this.type; @@ -81,14 +73,6 @@ final class ConstantImpl implements Constant { builder.append(this.name); builder.append(", value="); builder.append(this.value); - if (this.definingType != null) { - builder.append(", definingType="); - builder.append(this.definingType.getPackageName()); - builder.append("."); - builder.append(this.definingType.getName()); - } else { - builder.append(", definingType= null"); - } builder.append("]"); return builder.toString(); } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImpl.java index ca406eadde..485ab354ab 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImpl.java @@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.List; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; public final class GeneratedPropertyBuilderImpl extends AbstractTypeMemberBuilder @@ -41,10 +40,10 @@ public final class GeneratedPropertyBuilderImpl extends AbstractTypeMemberBuilde } @Override - public GeneratedProperty toInstance(final Type definingType) { + public GeneratedProperty toInstance() { final List annotations = toAnnotationTypes(); - return new GeneratedPropertyImpl(definingType, getName(), annotations, getComment(), getAccessModifier(), - getReturnType(), isFinal(), isStatic(), this.readOnly, this.value); + return new GeneratedPropertyImpl(getName(), annotations, getComment(), getAccessModifier(), getReturnType(), + isFinal(), isStatic(), this.readOnly, this.value); } @Override diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImpl.java index 166e893312..3df8ac463d 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImpl.java @@ -18,10 +18,10 @@ final class GeneratedPropertyImpl extends AbstractTypeMember implements Generate private final String value; private final boolean readOnly; - GeneratedPropertyImpl(final Type definingType, final String name, final List annotations, - final TypeMemberComment comment, final AccessModifier accessModifier, final Type returnType, - final boolean isFinal, final boolean isStatic, final boolean isReadOnly, final String value) { - super(definingType, name, annotations, comment, accessModifier, returnType, isFinal, isStatic); + GeneratedPropertyImpl(final String name, final List annotations, final TypeMemberComment comment, + final AccessModifier accessModifier, final Type returnType, final boolean isFinal, final boolean isStatic, + final boolean isReadOnly, final String value) { + super(name, annotations, comment, accessModifier, returnType, isFinal, isStatic); this.value = value; this.readOnly = isReadOnly; } @@ -38,20 +38,15 @@ final class GeneratedPropertyImpl extends AbstractTypeMember implements Generate @Override public String toString() { - final StringBuilder builder = new StringBuilder() + return new StringBuilder() .append("GeneratedPropertyImpl [name=").append(getName()) .append(", annotations=").append(getAnnotations()) .append(", comment=").append(getComment()) - .append(", parent="); - if (getDefiningType() != null) { - builder.append(getDefiningType().getPackageName()).append(".").append(getDefiningType().getName()); - } else { - builder.append("null"); - } - return builder.append(", returnType=").append(getReturnType()) + .append(", returnType=").append(getReturnType()) .append(", isFinal=").append(isFinal()) .append(", isReadOnly=").append(readOnly) .append(", modifier=").append(getAccessModifier()) - .append(']').toString(); + .append(']') + .toString(); } } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java index 7e1b9d16ae..daaa4806c6 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java @@ -64,8 +64,8 @@ final class MethodSignatureBuilderImpl extends AbstractTypeMemberBuilder annotations = toAnnotationTypes(); - return new MethodSignatureImpl(definingType, getName(), annotations, getComment(), getAccessModifier(), - getReturnType(), this.unmodifiableParams, isFinal(), this.isAbstract, isStatic(), isDefault, mechanics); + return new MethodSignatureImpl(getName(), annotations, getComment(), getAccessModifier(), getReturnType(), + unmodifiableParams, isFinal(), isAbstract, isStatic(), isDefault, mechanics); } @Override diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java index 305c2eb2eb..6a1409fd91 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java @@ -26,18 +26,18 @@ class MethodSignatureImpl extends AbstractTypeMember implements MethodSignature private final boolean isDefault; @VisibleForTesting - MethodSignatureImpl(final Type definingType, final String name, final List annotations, - final TypeMemberComment comment, final AccessModifier accessModifier, final Type returnType, - final List params, final boolean isFinal, final boolean isAbstract, final boolean isStatic) { - this(definingType, name, annotations, comment, accessModifier, returnType, params, isFinal, isAbstract, - isStatic, false, ValueMechanics.NORMAL); + MethodSignatureImpl(final String name, final List annotations, + final TypeMemberComment comment, final AccessModifier accessModifier, final Type returnType, + final List params, final boolean isFinal, final boolean isAbstract, final boolean isStatic) { + this(name, annotations, comment, accessModifier, returnType, params, isFinal, isAbstract, isStatic, false, + ValueMechanics.NORMAL); } - MethodSignatureImpl(final Type definingType, final String name, final List annotations, + MethodSignatureImpl(final String name, final List annotations, final TypeMemberComment comment, final AccessModifier accessModifier, final Type returnType, final List params, final boolean isFinal, final boolean isAbstract, final boolean isStatic, final boolean isDefault, final ValueMechanics mechanics) { - super(definingType, name, annotations, comment, accessModifier, returnType, isFinal, isStatic); + super(name, annotations, comment, accessModifier, returnType, isFinal, isStatic); this.params = params; this.isAbstract = isAbstract; this.isDefault = isDefault; @@ -90,22 +90,13 @@ class MethodSignatureImpl extends AbstractTypeMember implements MethodSignature @Override public String toString() { - final StringBuilder builder = new StringBuilder() + return new StringBuilder() .append("MethodSignatureImpl [name=").append(getName()) .append(", comment=").append(getComment()) - .append(", definingType="); - - final Type defType = getDefiningType(); - if (defType != null) { - builder.append(defType.getPackageName()).append('.').append(defType.getName()); - } else { - builder.append(" null"); - } - - return builder .append(", returnType=").append(getReturnType()) .append(", params=").append(this.params) .append(", annotations=").append(getAnnotations()) - .append(']').toString(); + .append(']') + .toString(); } } diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeEnumerationBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeEnumerationBuilder.java index 8348aa6957..bedc81ec47 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeEnumerationBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeEnumerationBuilder.java @@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.Optional; import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.TypeComment; import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; import org.opendaylight.yangtools.yang.common.QName; @@ -43,8 +42,8 @@ public final class RuntimeEnumerationBuilder extends AbstractEnumerationBuilder } @Override - public Enumeration toInstance(final Type definingType) { - return new EnumerationImpl(this, definingType); + public Enumeration toInstance() { + return new EnumerationImpl(this); } @Override @@ -75,8 +74,8 @@ public final class RuntimeEnumerationBuilder extends AbstractEnumerationBuilder } private static final class EnumerationImpl extends AbstractEnumeration { - EnumerationImpl(final RuntimeEnumerationBuilder builder, final Type definingType) { - super(builder, definingType); + EnumerationImpl(final RuntimeEnumerationBuilder builder) { + super(builder); } @Override diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberTest.java index c512bb192f..e7f2a827f4 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberTest.java @@ -36,7 +36,8 @@ public class AbstractTypeMemberTest { assertTrue(genProperty.isFinal()); assertTrue(genProperty.isStatic()); assertEquals(genProperty.hashCode(), genProperty2.hashCode()); - assertTrue(genProperty.toString().contains("org.opendaylight.yangtools.test.TestType")); + assertEquals("MethodSignatureImpl [name=TestProperty, comment=TypeMemberComment{contract=test comment}, " + + "returnType=null, params=[], annotations=[]]", genProperty.toString()); assertNotNull(genProperty.toString()); assertTrue(genProperty.equals(genProperty2)); assertFalse(genProperty.equals(null)); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java index 4f16e951b6..da833f6351 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java @@ -16,28 +16,23 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; public class ConstantImplTest { - @Test public void testMethodsOfConstantImpl() { - final CodegenGeneratedTypeBuilder definingType = new CodegenGeneratedTypeBuilder( - JavaTypeName.create("org.opendaylight.yangtools.test", "DefiningType")); final CodegenGeneratedTypeBuilder type = new CodegenGeneratedTypeBuilder( JavaTypeName.create("org.opendaylight.yangtools.test.v1", "BaseType")); - final ConstantImpl constImpl = new ConstantImpl(definingType, type, "IpAddress", "127.0.0.1"); - final ConstantImpl constImpl2 = new ConstantImpl(definingType, type, "IpAddress", "127.0.0.1"); - final ConstantImpl constImpl3 = new ConstantImpl(definingType, type, "IpAddress", "127.0.0.0"); + final ConstantImpl constImpl = new ConstantImpl(type, "IpAddress", "127.0.0.1"); + final ConstantImpl constImpl2 = new ConstantImpl(type, "IpAddress", "127.0.0.1"); + final ConstantImpl constImpl3 = new ConstantImpl(type, "IpAddress", "127.0.0.0"); final ConstantImpl constImpl4 = constImpl; - final ConstantImpl constImpl5 = new ConstantImpl(definingType, type, null, "127.0.0.0"); - final ConstantImpl constImpl6 = new ConstantImpl(definingType, type, "IpAddress", null); + final ConstantImpl constImpl5 = new ConstantImpl(type, null, "127.0.0.0"); + final ConstantImpl constImpl6 = new ConstantImpl(type, "IpAddress", null); - assertEquals("DefiningType", constImpl.getDefiningType().getName()); assertEquals("BaseType", constImpl.getType().getName()); assertEquals("IpAddress", constImpl.getName()); assertEquals("127.0.0.1", constImpl.getValue()); assertTrue(constImpl.toFormattedString().contains("GeneratedTransferObject")); assertTrue(constImpl.toString().contains("GeneratedTransferObject")); assertEquals(constImpl.hashCode(), constImpl2.hashCode()); - assertNotNull(constImpl.getDefiningType()); assertNotNull(constImpl.getType()); assertNotNull(constImpl.getName()); assertNotNull(constImpl.getValue()); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java index 14a612b85f..8cb09ba274 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java @@ -55,7 +55,7 @@ public class EnumerationBuilderImplTest { enumerationBuilderOtherName = new CodegenEnumerationBuilder(JavaTypeName.create(packageName, "SomeOtherName")); enumerationBuilderOtherPackage = new CodegenEnumerationBuilder(JavaTypeName.create("org.opendaylight.other", name)); - enumeration = enumerationBuilder.toInstance(enumerationBuilder); + enumeration = enumerationBuilder.toInstance(); } @Test(expected = NullPointerException.class) @@ -92,7 +92,6 @@ public class EnumerationBuilderImplTest { assertEquals(name, enumeration.getName()); assertEquals(packageName, enumeration.getPackageName()); assertEquals(null, enumeration.getComment()); - assertEquals(enumerationBuilder, enumeration.getParentType()); assertEquals(DESCRIPTION, enumeration.getDescription()); assertEquals(moduleName, enumeration.getModuleName()); assertEquals(packageName + '.' + name, enumeration.getFullyQualifiedName()); @@ -112,20 +111,19 @@ public class EnumerationBuilderImplTest { assertEquals(enumeration, enumeration); assertNotEquals(enumeration, "string"); - final Enumeration enumerationOtherPackage = enumerationBuilderOtherPackage - .toInstance(enumerationBuilderOtherPackage); + final Enumeration enumerationOtherPackage = enumerationBuilderOtherPackage.toInstance(); assertNotEquals(enumeration, enumerationOtherPackage); - final Enumeration enumerationOtherName = enumerationBuilderOtherName.toInstance(enumerationBuilderOtherName); + final Enumeration enumerationOtherName = enumerationBuilderOtherName.toInstance(); assertNotEquals(enumeration, enumerationOtherName); enumerationBuilderSame.addValue(valueName, valueName, value, Status.CURRENT, valueDescription, null); - final Enumeration enumerationSame = enumerationBuilderSame.toInstance(enumerationBuilderSame); + final Enumeration enumerationSame = enumerationBuilderSame.toInstance(); assertEquals(enumeration, enumerationSame); final CodegenEnumerationBuilder enumerationBuilderSame1 = new CodegenEnumerationBuilder( JavaTypeName.create(packageName, name)); - final Enumeration enumerationSame1 = enumerationBuilderSame1.toInstance(enumerationBuilderSame1); + final Enumeration enumerationSame1 = enumerationBuilderSame1.toInstance(); enumerationBuilderSame1.addValue(valueName, valueName, 14, Status.CURRENT, valueDescription, null); // Enums are equal thanks to same package name and local name assertEquals(enumeration, enumerationSame1); @@ -133,14 +131,11 @@ public class EnumerationBuilderImplTest { @Test public void testEnumerationToString() { - final String formattedString = "public enum " + name + " {\n" - + "\t TestValue " + "(12 );\n" - + "}"; - final String s = "Enumeration [packageName=" + packageName + ", definingType=" + packageName + "." + name - + ", name=" + name + ", values=[EnumPair [name=TestValue, mappedName=TestValue, value=12]]]"; - - assertEquals(s, enumeration.toString()); - assertEquals(formattedString, enumeration.toFormattedString()); + assertEquals("Enumeration [packageName=" + packageName + ", name=" + name + + ", values=[EnumPair [name=TestValue, mappedName=TestValue, value=12]]]", enumeration.toString()); + assertEquals("public enum " + name + " {\n" + + "\t TestValue " + "(12 );\n" + + "}", enumeration.toFormattedString()); assertEquals("EnumerationBuilderImpl [packageName=org.opendaylight.test, name=TestName, " + "values=[EnumPair [name=TestValue, mappedName=TestValue, value=12]]]", diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java index e60d763b5a..36e5ae6b1c 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java @@ -35,7 +35,7 @@ public class GeneratedPropertyBuilderImplTest { + "(java.lang.Boolean), isFinal=true, isReadOnly=false, modifier=PUBLIC]", generatedPropertyBuilderImpl.toString()); - GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(null); + GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(); assertNotNull(instance); 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 3e05d8e788..31ca9b26d3 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 @@ -15,7 +15,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; import org.opendaylight.mdsal.binding.model.util.Types; @@ -32,8 +31,7 @@ public class GeneratedPropertyImplTest { generatedPropertyBuilderImpl.setAccessModifier(AccessModifier.PUBLIC); generatedPropertyBuilderImpl.setReturnType(Types.BOOLEAN); - GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(new CodegenGeneratedTypeBuilder( - JavaTypeName.create("my.package", "myTypeName")).build()); + GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(); assertNotNull(instance); @@ -47,7 +45,7 @@ public class GeneratedPropertyImplTest { assertEquals("GeneratedPropertyImpl [name=myPropertyName, annotations=[], " + "comment=TypeMemberComment{contract=myComment}, " - + "parent=my.package.myTypeName, returnType=Type (java.lang.Boolean), isFinal=true, isReadOnly=false, " + + "returnType=Type (java.lang.Boolean), isFinal=true, isReadOnly=false, " + "modifier=PUBLIC]", instance.toString()); } @@ -65,10 +63,10 @@ public class GeneratedPropertyImplTest { generatedPropertyBuilderImpl3.setReturnType(Types.BOOLEAN); generatedPropertyBuilderImpl4.setReturnType(Types.STRING); - final GeneratedProperty property = generatedPropertyBuilderImpl.toInstance(null); - final GeneratedProperty property2 = generatedPropertyBuilderImpl2.toInstance(null); - final GeneratedProperty property3 = generatedPropertyBuilderImpl3.toInstance(null); - final GeneratedProperty property4 = generatedPropertyBuilderImpl4.toInstance(null); + final GeneratedProperty property = generatedPropertyBuilderImpl.toInstance(); + final GeneratedProperty property2 = generatedPropertyBuilderImpl2.toInstance(); + final GeneratedProperty property3 = generatedPropertyBuilderImpl3.toInstance(); + final GeneratedProperty property4 = generatedPropertyBuilderImpl4.toInstance(); assertNotNull(property); assertNotNull(property2); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyTest.java index 00e3dc7d50..f2a9b9cb0b 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyTest.java @@ -25,7 +25,7 @@ public class GeneratedPropertyTest { propertyBuilderImpl.setValue("new value"); propertyBuilderImpl.setReadOnly(true); - final GeneratedProperty genProperty = propertyBuilderImpl.toInstance(null); + final GeneratedProperty genProperty = propertyBuilderImpl.toInstance(); assertNotNull(genProperty); assertNotNull(propertyBuilderImpl.toString()); @@ -33,7 +33,7 @@ public class GeneratedPropertyTest { @Test public void testMethodsForGeneratedPropertyImpl() { - final GeneratedPropertyImpl propertyImpl = new GeneratedPropertyImpl(null, "Test", null, + final GeneratedPropertyImpl propertyImpl = new GeneratedPropertyImpl("Test", null, TypeMemberComment.contractOf("test property"), AccessModifier.PRIVATE, null, true, true, true, "test value"); 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 f8d696f092..649f23f606 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 @@ -50,12 +50,9 @@ public class GeneratedTypeBuilderTest { Constant constant2 = generatedTypeBuilder.addConstant( Types.typeForClass(int.class, BindingGeneratorUtil.getRestrictions(null)), "myIntConstant", 1); - Constant constant3 = new ConstantImpl(generatedTypeBuilder, Types.typeForClass(String.class), "myConstant", - "myConstantValue"); - final Constant constant4 = new ConstantImpl(generatedTypeBuilder, Types.typeForClass(String.class), - "myConstant2", "myConstantValue"); - final Constant constant5 = new ConstantImpl(generatedTypeBuilder, Types.typeForClass(String.class), - "myConstant", "myConstantValue2"); + Constant constant3 = new ConstantImpl(Types.typeForClass(String.class), "myConstant", "myConstantValue"); + final Constant constant4 = new ConstantImpl(Types.typeForClass(String.class), "myConstant2", "myConstantValue"); + final Constant constant5 = new ConstantImpl(Types.typeForClass(String.class), "myConstant", "myConstantValue2"); assertNotNull(constant); assertNotNull(constant2); @@ -79,8 +76,8 @@ public class GeneratedTypeBuilderTest { assertFalse(constant.hashCode() == constant4.hashCode()); assertTrue(constant.hashCode() == constant5.hashCode()); - assertEquals("Constant [type=Type (java.lang.String), name=myConstant, value=myConstantValue, " - + "definingType=my.package.MyName]", constant.toString()); + assertEquals("Constant [type=Type (java.lang.String), name=myConstant, value=myConstantValue]", + constant.toString()); assertEquals("Type (java.lang.String) myConstant myConstantValue", constant.toFormattedString()); @@ -97,7 +94,6 @@ public class GeneratedTypeBuilderTest { assertEquals("myConstant", constant.getName()); assertEquals("myConstantValue", constant.getValue()); assertEquals(Types.typeForClass(String.class), constant.getType()); - assertEquals(generatedTypeBuilder, constant.getDefiningType()); } @Test(expected = IllegalArgumentException.class) @@ -158,10 +154,10 @@ public class GeneratedTypeBuilderTest { assertEquals(2, properties.size()); - assertTrue(properties.contains(propertyBuilder.toInstance(instance))); - assertTrue(properties.contains(propertyBuilder2.toInstance(instance))); + assertTrue(properties.contains(propertyBuilder.toInstance())); + assertTrue(properties.contains(propertyBuilder2.toInstance())); // assertTrue(properties.contains(propertyBuilderNull.toInstance(instance))); - assertFalse(properties.contains(new GeneratedPropertyBuilderImpl("myProperty3").toInstance(instance))); + assertFalse(properties.contains(new GeneratedPropertyBuilderImpl("myProperty3").toInstance())); } @@ -217,11 +213,10 @@ public class GeneratedTypeBuilderTest { assertEquals(2, enumerations.size()); - assertTrue(enumerations.contains(enumBuilder.toInstance(instance))); - assertTrue(enumerations.contains(enumBuilder2.toInstance(instance))); + assertTrue(enumerations.contains(enumBuilder.toInstance())); + assertTrue(enumerations.contains(enumBuilder2.toInstance())); assertFalse(enumerations.contains(new CodegenEnumerationBuilder(JavaTypeName.create("my.package", - "myEnumName3")) - .toInstance(instance))); + "myEnumName3")).toInstance())); } diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImplTest.java index 0558438538..56981ac8da 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImplTest.java @@ -45,18 +45,18 @@ public class MethodSignatureImplTest { boolean isAbstract = false; boolean isStatic = false; - signature1 = new MethodSignatureImpl(type, name, annotations, comment, + signature1 = new MethodSignatureImpl(name, annotations, comment, accessModifier, returnType, params, isFinal, isAbstract, isStatic); - signature2 = new MethodSignatureImpl(type, name, annotations, comment, + signature2 = new MethodSignatureImpl(name, annotations, comment, accessModifier, returnType, params, isFinal, isAbstract, isStatic); returnType = null; - signature3 = new MethodSignatureImpl(type, name, annotations, comment, + signature3 = new MethodSignatureImpl(name, annotations, comment, accessModifier, returnType, params, isFinal, isAbstract, isStatic); name = null; - signature4 = new MethodSignatureImpl(type, name, annotations, comment, + signature4 = new MethodSignatureImpl(name, annotations, comment, accessModifier, returnType, params, isFinal, isAbstract, isStatic); diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java index 3f7510ea2d..a9abd4b05f 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java @@ -87,11 +87,6 @@ final class BuilderGeneratedProperty implements GeneratedProperty { throw uoe(); } - @Override - public Type getDefiningType() { - throw uoe(); - } - @Override public String getValue() { throw uoe(); -- 2.36.6