From 65200ab6676fc5a3d7efaa28d0309450f0223980 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 25 Jun 2021 10:55:27 +0200 Subject: [PATCH] Hide binding.model.api.DefaultType Expose DefaultType only from Type.of() static factory methods and adjust its implementation to remove open-coded toString() methods. Change-Id: Iaa3c0a7c117f12235a18e75512d9974403ab7f24 Signed-off-by: Robert Varga --- .../codec/impl/DataContainerCodecContext.java | 4 +- .../codec/impl/DataObjectCodecContext.java | 3 +- .../src/main/java/module-info.java | 1 + ...bstractBaseType.java => AbstractType.java} | 35 ++------ .../mdsal/binding/model/api/DefaultType.java | 21 +---- .../mdsal/binding/model/api/Type.java | 13 +++ .../{DefaultTypeTest.java => TypeTest.java} | 6 +- .../impl/reactor/ActionGenerator.java | 7 +- .../impl/reactor/ChoiceGenerator.java | 4 +- .../generator/impl/reactor/Generator.java | 5 +- .../generator/impl/reactor/KeyGenerator.java | 4 +- .../impl/reactor/NotificationGenerator.java | 3 +- .../binding/generator/impl/Mdsal269Test.java | 4 +- .../binding/yang/types/TypeProviderTest.java | 6 +- .../mdsal/binding/model/util/Types.java | 10 +-- .../builder/AbstractEnumerationBuilder.java | 36 ++------ .../builder/AbstractGeneratedTOBuilder.java | 82 +++++-------------- .../type/builder/AbstractGeneratedType.java | 35 +++----- .../builder/AbstractGeneratedTypeBuilder.java | 17 +++- .../builder/AnnotationTypeBuilderImpl.java | 41 ++++------ .../builder/CodegenGeneratedTypeBuilder.java | 29 ------- .../builder/RuntimeGeneratedTypeBuilder.java | 29 ------- .../type/builder/AnnotationBuilderTest.java | 14 ++-- .../type/builder/ConstantImplTest.java | 7 +- .../builder/EnumerationBuilderImplTest.java | 9 +- .../GeneratedPropertyBuilderImplTest.java | 6 +- .../builder/GeneratedPropertyImplTest.java | 2 +- .../type/builder/GeneratedTOBuilderTest.java | 21 ++--- .../builder/GeneratedTypeBuilderTest.java | 9 +- .../java/api/generator/JavaFileTemplate.java | 5 +- .../api/AbstractBindingRuntimeContext.java | 13 ++- 31 files changed, 153 insertions(+), 328 deletions(-) rename binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/{AbstractBaseType.java => AbstractType.java} (50%) rename binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/{DefaultTypeTest.java => TypeTest.java} (72%) diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java index 9ef6b5baf3..6c99bc8988 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java @@ -27,7 +27,7 @@ import org.opendaylight.mdsal.binding.dom.codec.api.IncorrectNestingException; import org.opendaylight.mdsal.binding.dom.codec.api.MissingClassInLoadingStrategyException; import org.opendaylight.mdsal.binding.dom.codec.api.MissingSchemaException; import org.opendaylight.mdsal.binding.dom.codec.api.MissingSchemaForClassException; -import org.opendaylight.mdsal.binding.model.api.DefaultType; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.BindingObject; @@ -212,7 +212,7 @@ abstract class DataContainerCodecContext loaded; try { - loaded = ctx.loadClass(DefaultType.of(cls)); + loaded = ctx.loadClass(Type.of(cls)); } catch (ClassNotFoundException e) { LOG.debug("Proposed {} cannot be loaded in {}", cls, ctx, e); return false; diff --git a/binding/mdsal-binding-generator-api/src/main/java/module-info.java b/binding/mdsal-binding-generator-api/src/main/java/module-info.java index 90366bbc98..32fe968543 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/module-info.java +++ b/binding/mdsal-binding-generator-api/src/main/java/module-info.java @@ -10,6 +10,7 @@ module org.opendaylight.mdsal.binding.generator.api { exports org.opendaylight.mdsal.binding.model.api; exports org.opendaylight.mdsal.binding.model.api.type.builder; + requires transitive org.opendaylight.yangtools.concepts; requires transitive org.opendaylight.yangtools.yang.model.api; // Annotations diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractBaseType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractType.java similarity index 50% rename from binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractBaseType.java rename to binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractType.java index c0ba25d447..f9c19c568d 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractBaseType.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractType.java @@ -7,54 +7,31 @@ */ package org.opendaylight.mdsal.binding.model.api; -import static java.util.Objects.requireNonNull; - import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.concepts.AbstractSimpleIdentifiable; /** * It is used only as ancestor for other Types. Note this forms the equality domain over most types, please * consider joining the party. */ @Beta -public class AbstractBaseType implements Type { - /** - * Name of this Type. - */ - private final @NonNull JavaTypeName identifier; - +public abstract class AbstractType extends AbstractSimpleIdentifiable implements Type { /** * Constructs the instance of this class with a JavaTypeName. * * @param identifier for this Type */ - protected AbstractBaseType(final JavaTypeName identifier) { - this.identifier = requireNonNull(identifier); - } - - @Override - public final JavaTypeName getIdentifier() { - return this.identifier; + protected AbstractType(final JavaTypeName identifier) { + super(identifier); } @Override public final int hashCode() { - return identifier.hashCode(); + return getIdentifier().hashCode(); } @Override public final boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof Type)) { - return false; - } - return identifier.equals(((Type) obj).getIdentifier()); - } - - @Override - public String toString() { - return "Type (" + getFullyQualifiedName() + ")"; + return this == obj || obj instanceof Type && getIdentifier().equals(((Type) obj).getIdentifier()); } } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java index 9e22ce2a41..4211e9de2b 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java @@ -7,28 +7,11 @@ */ package org.opendaylight.mdsal.binding.model.api; -import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.Identifiable; - /** * Wraps combination of packageName and name to the object representation. */ -@Beta -public final class DefaultType extends AbstractBaseType { - private DefaultType(final JavaTypeName identifier) { +final class DefaultType extends AbstractType { + DefaultType(final JavaTypeName identifier) { super(identifier); } - - public static @NonNull DefaultType of(final JavaTypeName identifier) { - return new DefaultType(identifier); - } - - public static @NonNull DefaultType of(final Identifiable type) { - return of(type.getIdentifier()); - } - - public static @NonNull Type of(final Class type) { - return of(JavaTypeName.create(type)); - } } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java index c95bce565d..ef8b75d3a9 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java @@ -7,6 +7,7 @@ */ package org.opendaylight.mdsal.binding.model.api; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Identifiable; /** @@ -49,4 +50,16 @@ public interface Type extends Identifiable { default String getFullyQualifiedName() { return getIdentifier().toString(); } + + static @NonNull Type of(final JavaTypeName identifier) { + return new DefaultType(identifier); + } + + static @NonNull Type of(final Identifiable type) { + return of(type.getIdentifier()); + } + + static @NonNull Type of(final Class type) { + return of(JavaTypeName.create(type)); + } } diff --git a/binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/DefaultTypeTest.java b/binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/TypeTest.java similarity index 72% rename from binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/DefaultTypeTest.java rename to binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/TypeTest.java index 8b1c520ab7..d6e2983c16 100644 --- a/binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/DefaultTypeTest.java +++ b/binding/mdsal-binding-generator-api/src/test/java/org/opendaylight/mdsal/binding/model/api/TypeTest.java @@ -12,16 +12,16 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -public class DefaultTypeTest { +public class TypeTest { @Test public void testCreateNewReferencedType() { - DefaultType refType = DefaultType.of(JavaTypeName.create("org.opendaylight.yangtools.test", "RefTypeTest")); + Type refType = Type.of(JavaTypeName.create("org.opendaylight.yangtools.test", "RefTypeTest")); assertEquals("RefTypeTest", refType.getName()); } @Test public void testToStringMethod() { - DefaultType refType = DefaultType.of(JavaTypeName.create("org.opendaylight.yangtools.test", "RefTypeTest")); + Type refType = Type.of(JavaTypeName.create("org.opendaylight.yangtools.test", "RefTypeTest")); assertTrue(refType.toString().contains("RefTypeTest")); } } diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java index 69ef3c0335..dbfa981e62 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.DefaultType; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; @@ -68,12 +67,12 @@ final class ActionGenerator extends AbstractCompositeGenerator { break; } - builder.addImplementsType(BindingTypes.childOf(DefaultType.of(ancestor.typeName()))); + builder.addImplementsType(BindingTypes.childOf(Type.of(ancestor.typeName()))); } /** @@ -398,7 +397,7 @@ public abstract class Generator implements Iterable { * @param builder Target builder */ static final void defaultImplementedInterace(final GeneratedTypeBuilder builder) { - defineImplementedInterfaceMethod(builder, DefaultType.of(builder)).setDefault(true); + defineImplementedInterfaceMethod(builder, Type.of(builder)).setDefault(true); } static final > AbstractExplicitGenerator getChild(final Generator parent, diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java index 3b27958ffc..aacf7b2a1d 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java @@ -11,8 +11,8 @@ import static java.util.Objects.requireNonNull; import java.util.Set; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; -import org.opendaylight.mdsal.binding.model.api.DefaultType; import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; @@ -48,7 +48,7 @@ final class KeyGenerator extends AbstractExplicitGenerator leafNames = statement().argument(); for (Generator listChild : listGen) { diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java index c1163093b8..a29acb721a 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java @@ -7,7 +7,6 @@ */ package org.opendaylight.mdsal.binding.generator.impl.reactor; -import org.opendaylight.mdsal.binding.model.api.DefaultType; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; @@ -62,7 +61,7 @@ final class NotificationGenerator extends AbstractCompositeGenerator enumLeafTypedef = enumLeafNode.getType(); provider.putReferencedType(enumLeafNode.getPath(), - DefaultType.of(provider.javaTypeForSchemaDefinitionType(enumLeafTypedef, enumLeafNode))); + Type.of(provider.javaTypeForSchemaDefinitionType(enumLeafTypedef, enumLeafNode))); final LeafListSchemaNode enumListNode = provideLeafListNodeFromTopLevelContainer(TEST_TYPE_PROVIDER, "foo", "list-of-enums"); final TypeDefinition enumLeafListTypedef = enumListNode.getType(); provider.putReferencedType(enumListNode.getPath(), - DefaultType.of(provider.javaTypeForSchemaDefinitionType(enumLeafListTypedef, enumListNode))); + Type.of(provider.javaTypeForSchemaDefinitionType(enumLeafListTypedef, enumListNode))); } @Test diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java index e5e928b369..46460d9eb8 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.AbstractBaseType; +import org.opendaylight.mdsal.binding.model.api.AbstractType; import org.opendaylight.mdsal.binding.model.api.BaseTypeWithRestrictions; import org.opendaylight.mdsal.binding.model.api.ConcreteType; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; @@ -289,7 +289,7 @@ public final class Types { /** * Represents concrete JAVA type. */ - private static final class ConcreteTypeImpl extends AbstractBaseType implements ConcreteType { + private static final class ConcreteTypeImpl extends AbstractType implements ConcreteType { private final Restrictions restrictions; /** @@ -312,7 +312,7 @@ public final class Types { /** * Represents concrete JAVA type with changed restriction values. */ - private static final class BaseTypeWithRestrictionsImpl extends AbstractBaseType implements + private static final class BaseTypeWithRestrictionsImpl extends AbstractType implements BaseTypeWithRestrictions { private final Restrictions restrictions; @@ -336,7 +336,7 @@ public final class Types { /** * Represents parametrized JAVA type. */ - private static class ParametrizedTypeImpl extends AbstractBaseType implements ParameterizedType { + private static class ParametrizedTypeImpl extends AbstractType implements ParameterizedType { /** * Array of JAVA actual type parameters. */ @@ -377,7 +377,7 @@ public final class Types { /** * Represents JAVA bounded wildcard type. */ - private static class WildcardTypeImpl extends AbstractBaseType implements WildcardType { + private static class WildcardTypeImpl extends AbstractType implements WildcardType { /** * Creates instance of this class with concrete package and type name. * 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 476608c1b2..21d8097064 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 @@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collections; @@ -17,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import org.opendaylight.mdsal.binding.model.api.AbstractBaseType; +import org.opendaylight.mdsal.binding.model.api.AbstractType; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Enumeration; @@ -36,7 +37,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; // FIXME: public because EnumBuilder does not have setters we are exposing -public abstract class AbstractEnumerationBuilder extends AbstractBaseType implements EnumBuilder { +public abstract class AbstractEnumerationBuilder extends AbstractType implements EnumBuilder { private List values = ImmutableList.of(); private List annotationBuilders = ImmutableList.of(); @@ -70,22 +71,9 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem abstract AbstractPair createEnumPair(String name, String mappedName, int value, Status status, String description, String reference); - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override - public final String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("EnumerationBuilderImpl [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - builder.append(", values="); - builder.append(values); - builder.append("]"); - return builder.toString(); + protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { + return super.addToStringAttributes(toStringHelper).add("values", values); } @Override @@ -161,7 +149,7 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem } } - abstract static class AbstractEnumeration extends AbstractBaseType implements Enumeration { + abstract static class AbstractEnumeration extends AbstractType implements Enumeration { private final List annotations; private final List values; @@ -214,16 +202,8 @@ public abstract class AbstractEnumerationBuilder extends AbstractBaseType implem } @Override - public final String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("Enumeration [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - builder.append(", values="); - builder.append(this.values); - builder.append("]"); - return builder.toString(); + protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { + return super.addToStringAttributes(toStringHelper).add("values", values); } @Override diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTOBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTOBuilder.java index e35905cbbd..f8bdb4fc19 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTOBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTOBuilder.java @@ -7,6 +7,7 @@ */ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; @@ -91,30 +92,11 @@ abstract class AbstractGeneratedTOBuilder extends AbstractGeneratedTypeBuilder annotations; private final List implementsTypes; @@ -212,25 +212,14 @@ abstract class AbstractGeneratedType extends AbstractBaseType implements Generat } @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("GeneratedType [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - builder.append(", comment="); - builder.append(this.comment); - builder.append(", annotations="); - builder.append(this.annotations); - builder.append(", enclosedTypes="); - builder.append(this.enclosedTypes); - builder.append(", enumerations="); - builder.append(this.enumerations); - builder.append(", constants="); - builder.append(this.constants); - builder.append(", methodSignatures="); - builder.append(this.methodSignatures); - builder.append("]"); - return builder.toString(); + protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { + return super.addToStringAttributes(toStringHelper) + .omitNullValues() + .add("comment", comment) + .add("annotations", annotations) + .add("enclosedTypes", enclosedTypes) + .add("enumerations", enumerations) + .add("constants", constants) + .add("methodSignatures", methodSignatures); } } 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 b63554e1f3..8c86f959df 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 @@ -10,10 +10,11 @@ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.opendaylight.mdsal.binding.model.api.AbstractBaseType; +import org.opendaylight.mdsal.binding.model.api.AbstractType; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Enumeration; @@ -28,7 +29,7 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilde import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; -abstract class AbstractGeneratedTypeBuilder> extends AbstractBaseType +abstract class AbstractGeneratedTypeBuilder> extends AbstractType implements GeneratedTypeBuilderBase { private List annotationBuilders = Collections.emptyList(); @@ -214,9 +215,19 @@ abstract class AbstractGeneratedTypeBuilder annotationBuilders = Collections.emptyList(); private List parameters = Collections.emptyList(); @@ -71,21 +72,14 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota } @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("AnnotationTypeBuilder [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - builder.append(", annotationBuilders="); - builder.append(this.annotationBuilders); - builder.append(", parameters="); - builder.append(this.parameters); - builder.append("]"); - return builder.toString(); + protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { + return super.addToStringAttributes(toStringHelper) + .omitNullValues() + .add("annotationBuilders", annotationBuilders) + .add("parameters", parameters); } - private static final class AnnotationTypeImpl extends AbstractBaseType implements AnnotationType { + private static final class AnnotationTypeImpl extends AbstractType implements AnnotationType { private final List annotations; private final List parameters; private final List paramNames; @@ -142,18 +136,11 @@ final class AnnotationTypeBuilderImpl extends AbstractBaseType implements Annota } @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("AnnotationType [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - builder.append(", annotations="); - builder.append(this.annotations); - builder.append(", parameters="); - builder.append(this.parameters); - builder.append("]"); - return builder.toString(); + protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { + return super.addToStringAttributes(toStringHelper) + .omitNullValues() + .add("annotations", annotations) + .add("parameters", parameters); } } 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 f86612d7ad..6051cfabf5 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 @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.TypeComment; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -47,34 +46,6 @@ public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuil this.reference = reference; } - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("GeneratedTransferObject [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - - final TypeComment comment = getComment(); - if (comment != null) { - builder.append(", comment="); - builder.append(comment.getJavadoc()); - } - builder.append(", annotations="); - builder.append(getAnnotations()); - builder.append(", implements="); - builder.append(getImplementsTypes()); - builder.append(", constants="); - builder.append(getConstants()); - builder.append(", enumerations="); - builder.append(getEnumerations()); - builder.append(", properties="); - builder.append(", methods="); - builder.append(getMethodDefinitions()); - builder.append("]"); - return builder.toString(); - } - @Override 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/RuntimeGeneratedTypeBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java index a571b7db50..2aebce7380 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 @@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.TypeComment; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -47,34 +46,6 @@ public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuil // No-op } - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("GeneratedTransferObject [packageName="); - builder.append(getPackageName()); - builder.append(", name="); - builder.append(getName()); - - final TypeComment comment = getComment(); - if (comment != null) { - builder.append(", comment="); - builder.append(comment.getJavadoc()); - } - builder.append(", annotations="); - builder.append(getAnnotations()); - builder.append(", implements="); - builder.append(getImplementsTypes()); - builder.append(", constants="); - builder.append(getConstants()); - builder.append(", enumerations="); - builder.append(getEnumerations()); - builder.append(", properties="); - builder.append(", methods="); - builder.append(getMethodDefinitions()); - builder.append("]"); - return builder.toString(); - } - @Override protected RuntimeGeneratedTypeBuilder thisInstance() { return 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 cfadb5b3c9..c731320cec 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 @@ -405,17 +405,17 @@ public class AnnotationBuilderTest { annotationTypeBuilder.addAnnotation("my.package", "MySubAnnotationName"); annotationTypeBuilder.addParameter("MyParameter", "myValue"); - assertEquals("AnnotationTypeBuilder [packageName=my.package, name=MyAnnotationName, " - + "annotationBuilders=[AnnotationTypeBuilder [packageName=my.package, name=MySubAnnotationName, " - + "annotationBuilders=[], parameters=[]]], parameters=[ParameterImpl [name=MyParameter, value=myValue, " - + "values=[]]]]", annotationTypeBuilder.toString()); + assertEquals("AnnotationTypeBuilderImpl{identifier=my.package.MyAnnotationName, " + + "annotationBuilders=[AnnotationTypeBuilderImpl{identifier=my.package.MySubAnnotationName, " + + "annotationBuilders=[], parameters=[]}], parameters=[ParameterImpl [name=MyParameter, value=myValue, " + + "values=[]]]}", annotationTypeBuilder.toString()); AnnotationType annotationTypeInstance = annotationTypeBuilder.build(); assertEquals("my.package.MyAnnotationName", annotationTypeInstance.getFullyQualifiedName()); - assertEquals("AnnotationType [packageName=my.package, name=MyAnnotationName, annotations=[AnnotationType " - + "[packageName=my.package, name=MySubAnnotationName, annotations=[], parameters=[]]], " - + "parameters=[ParameterImpl [name=MyParameter, value=myValue, values=[]]]]", + assertEquals("AnnotationTypeImpl{identifier=my.package.MyAnnotationName, " + + "annotations=[AnnotationTypeImpl{identifier=my.package.MySubAnnotationName, annotations=[], " + + "parameters=[]}], parameters=[ParameterImpl [name=MyParameter, value=myValue, values=[]]]}", annotationTypeInstance.toString()); } 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 dd48d42d0e..eadbd42bf4 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 @@ -7,8 +7,6 @@ */ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -32,7 +30,10 @@ public class ConstantImplTest { assertEquals("BaseType", constImpl.getType().getName()); assertEquals("IpAddress", constImpl.getName()); assertEquals("127.0.0.1", constImpl.getValue()); - assertThat(constImpl.toString(), containsString("GeneratedTransferObject")); + assertEquals( + "Constant [type=CodegenGeneratedTypeBuilder{identifier=org.opendaylight.yangtools.test.v1.BaseType, " + + "constants=[], enumerations=[], methods=[], annotations=[], implements=[]}, name=IpAddress, " + + "value=127.0.0.1]", constImpl.toString()); assertEquals(constImpl.hashCode(), constImpl2.hashCode()); assertNotNull(constImpl.getType()); assertNotNull(constImpl.getName()); 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 8f486030bd..410f0e9ff3 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 @@ -131,15 +131,14 @@ public class EnumerationBuilderImplTest { @Test public void testEnumerationToString() { - assertEquals("Enumeration [packageName=" + packageName + ", name=" + name - + ", values=[EnumPair [name=TestValue, mappedName=TestValue, value=12]]]", enumeration.toString()); + assertEquals("EnumerationImpl{identifier=org.opendaylight.test.TestName, " + + "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]]]", - enumerationBuilder.toString()); + assertEquals("CodegenEnumerationBuilder{identifier=org.opendaylight.test.TestName, " + + "values=[EnumPair [name=TestValue, mappedName=TestValue, value=12]]}", enumerationBuilder.toString()); } @Test 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 36e5ae6b1c..24e2db2024 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 @@ -31,9 +31,9 @@ public class GeneratedPropertyBuilderImplTest { generatedPropertyBuilderImpl.setAccessModifier(AccessModifier.PUBLIC); generatedPropertyBuilderImpl.setReturnType(Types.BOOLEAN); - assertEquals("GeneratedPropertyImpl [name=myPropertyName, annotations=[], comment=null, returnType=Type " - + "(java.lang.Boolean), isFinal=true, isReadOnly=false, modifier=PUBLIC]", - generatedPropertyBuilderImpl.toString()); + assertEquals("GeneratedPropertyImpl [name=myPropertyName, annotations=[], comment=null, " + + "returnType=ConcreteTypeImpl{identifier=java.lang.Boolean}, isFinal=true, isReadOnly=false, " + + "modifier=PUBLIC]", generatedPropertyBuilderImpl.toString()); GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(); 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 31ca9b26d3..fee94929fa 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 @@ -45,7 +45,7 @@ public class GeneratedPropertyImplTest { assertEquals("GeneratedPropertyImpl [name=myPropertyName, annotations=[], " + "comment=TypeMemberComment{contract=myComment}, " - + "returnType=Type (java.lang.Boolean), isFinal=true, isReadOnly=false, " + + "returnType=ConcreteTypeImpl{identifier=java.lang.Boolean}, isFinal=true, isReadOnly=false, " + "modifier=PUBLIC]", instance.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 c72d82cdbe..aa30fd1a73 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 @@ -7,9 +7,9 @@ */ package org.opendaylight.mdsal.binding.model.util.generated.type.builder; -import static org.junit.Assert.assertFalse; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; @@ -46,8 +46,8 @@ public class GeneratedTOBuilderTest { public void testToString() { final GeneratedTOBuilder genTypeBuilder = new CodegenGeneratedTOBuilder( JavaTypeName.create("org.opendaylight.controller", "AnnotClassCache")); - String toString = genTypeBuilder.toString(); - assertTrue(toString.contains("GeneratedTransferObject")); + assertThat(genTypeBuilder.toString(), + startsWith("CodegenGeneratedTOBuilder{identifier=org.opendaylight.controller.AnnotClassCache")); } @Test @@ -55,18 +55,7 @@ public class GeneratedTOBuilderTest { final GeneratedTOBuilder genTypeBuilder1 = new CodegenGeneratedTOBuilder( JavaTypeName.create("org.opendaylight.controller", "AnnotClassCache")); - genTypeBuilder1.setTypedef(true); GeneratedTransferObject genTO = genTypeBuilder1.build(); - String toString = genTO.toString(); - assertFalse(toString.contains("GeneratedTransferObject")); - - final GeneratedTOBuilder genTypeBuilder2 = new CodegenGeneratedTOBuilder( - JavaTypeName.create("org.opendaylight.controller", "AnnotClassCache")); - - genTypeBuilder2.setTypedef(false); - genTO = genTypeBuilder2.build(); - toString = genTO.toString(); - - assertTrue(toString.contains("GeneratedTransferObject")); + assertThat(genTO.toString(), startsWith("GTO{identifier=org.opendaylight.controller.AnnotClassCache")); } } 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 fc99c72f7f..4a02275d46 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 @@ -77,7 +77,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]", + assertEquals( + "Constant [type=ConcreteTypeImpl{identifier=java.lang.String}, name=myConstant, value=myConstantValue]", constant.toString()); GeneratedType instance = generatedTypeBuilder.build(); @@ -289,10 +290,8 @@ public class GeneratedTypeBuilderTest { generatedTypeBuilder.setSchemaPath(SchemaPath.create(true, QName.create("test", "path"))); assertNotNull(generatedTypeBuilder.addComment(TypeComments.javadoc("My comment..").get())); - assertEquals( - "GeneratedTransferObject [packageName=my.package, name=MyName, comment=My comment.., annotations=[], " - + "implements=[], constants=[], enumerations=[], properties=, methods=[]]", - generatedTypeBuilder.toString()); + assertEquals("CodegenGeneratedTypeBuilder{identifier=my.package.MyName, comment=My comment.., constants=[], " + + "enumerations=[], methods=[], annotations=[], implements=[]}", generatedTypeBuilder.toString()); GeneratedType instance = generatedTypeBuilder.build(); diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java index e56923324a..528a714cf0 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java @@ -35,7 +35,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.xtext.xbase.lib.StringExtensions; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.DefaultType; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.model.api.GeneratedType; @@ -137,7 +136,7 @@ class JavaFileTemplate { throw new ExceptionInInitializerError(e); } - AUGMENTATION_RET_TYPE = DefaultType.of(JavaTypeName.create(m.getReturnType())); + AUGMENTATION_RET_TYPE = Type.of(JavaTypeName.create(m.getReturnType())); } private final AbstractJavaGeneratedType javaType; @@ -306,7 +305,7 @@ class JavaFileTemplate { augmentType = t; } } else if (Augmentable.class.getName().equals(implementedIfc.getFullyQualifiedName())) { - augmentType = Types.parameterizedTypeFor(AUGMENTATION_RET_TYPE, DefaultType.of(type.getIdentifier())); + augmentType = Types.parameterizedTypeFor(AUGMENTATION_RET_TYPE, Type.of(type.getIdentifier())); } } diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java index 3f49ad8d5d..80e05a7294 100644 --- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java +++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java @@ -27,7 +27,6 @@ import java.util.Optional; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.DefaultType; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; @@ -80,7 +79,7 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon @Override public final > AugmentationSchemaNode getAugmentationDefinition(final Class augClass) { - return getTypes().findAugmentation(DefaultType.of(augClass)).orElse(null); + return getTypes().findAugmentation(Type.of(augClass)).orElse(null); } @Override @@ -88,17 +87,17 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon checkArgument(!Augmentation.class.isAssignableFrom(cls), "Supplied class must not be an augmentation (%s is)", cls); checkArgument(!Action.class.isAssignableFrom(cls), "Supplied class must not be an action (%s is)", cls); - return (DataSchemaNode) getTypes().findSchema(DefaultType.of(cls)).orElse(null); + return (DataSchemaNode) getTypes().findSchema(Type.of(cls)).orElse(null); } @Override public final ActionDefinition getActionDefinition(final Class> cls) { - return (ActionDefinition) getTypes().findSchema(DefaultType.of(cls)).orElse(null); + return (ActionDefinition) getTypes().findSchema(Type.of(cls)).orElse(null); } @Override public final Absolute getActionIdentifier(final Class> cls) { - return getTypes().findSchemaNodeIdentifier(DefaultType.of(cls)).orElse(null); + return getTypes().findSchemaNodeIdentifier(Type.of(cls)).orElse(null); } @Override @@ -158,7 +157,7 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon @Override public final Entry getTypeWithSchema(final Class type) { - return getTypeWithSchema(getTypes(), DefaultType.of(type)); + return getTypeWithSchema(getTypes(), Type.of(type)); } private static @NonNull Entry getTypeWithSchema(final BindingRuntimeTypes types, @@ -207,7 +206,7 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon @Override public final Set> getCases(final Class choice) { - final Collection cazes = getTypes().findCases(DefaultType.of(choice)); + final Collection cazes = getTypes().findCases(Type.of(choice)); final Set> ret = new HashSet<>(cazes.size()); for (final Type caze : cazes) { try { -- 2.36.6