From 5574d44c009ac8b5918e78574b4b25216c1d6866 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 3 Mar 2018 18:07:37 +0100 Subject: [PATCH] Refactor GeneratedTypeBuilderImpl GeneratedTypeBuilderImpl is used by both runtime and codegen, capturing data not needed at runtime leading to a bloated RuntimeContext. Split out RuntimeGeneratedTOBuilder, renaming the original to CodegenGeneratedTypeBuilder. JIRA: MDSAL-315 Change-Id: Iaea5f9ae7b260bc5c9ef37cdb1a74aec52457a22 Signed-off-by: Robert Varga (cherry picked from commit d70cc768e3ff3500b9b49136e41a1e6345f749b5) --- .../generator/impl/AbstractTypeGenerator.java | 8 +- .../yang/types/TypeProviderImplTest.java | 4 +- ....java => CodegenGeneratedTypeBuilder.java} | 8 +- .../builder/RuntimeGeneratedTOBuilder.java | 2 +- .../builder/RuntimeGeneratedTypeBuilder.java | 108 ++++++++++++++++++ .../model/util/BindingGeneratorUtilTest.java | 10 +- .../AbstractGeneratedTypeBuilderTest.java | 16 +-- .../type/builder/AbstractTypeMemberTest.java | 4 +- .../type/builder/AnnotationBuilderTest.java | 4 +- .../type/builder/ConstantImplTest.java | 4 +- .../builder/GeneratedPropertyImplTest.java | 2 +- .../builder/GeneratedTypeBuilderTest.java | 36 +++--- .../MethodSignatureBuilderImplTest.java | 4 +- .../generator/test/GeneratorJavaFileTest.java | 6 +- 14 files changed, 162 insertions(+), 54 deletions(-) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/{GeneratedTypeBuilderImpl.java => CodegenGeneratedTypeBuilder.java} (91%) create mode 100644 binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java 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 32a7687477..24e9b46654 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 @@ -61,7 +61,7 @@ import org.opendaylight.mdsal.binding.model.util.ReferencedTypeImpl; import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedPropertyBuilderImpl; -import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTypeBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTypeBuilder; import org.opendaylight.mdsal.binding.yang.types.AbstractTypeProvider; import org.opendaylight.mdsal.binding.yang.types.GroupingDefinitionDependencySort; import org.opendaylight.yangtools.yang.binding.BaseIdentity; @@ -710,7 +710,7 @@ abstract class AbstractTypeGenerator { final String packageName = BindingMapping.getRootPackageName(module.getQNameModule()); final String moduleName = BindingMapping.getClassName(module.getName()) + postfix; - final GeneratedTypeBuilderImpl moduleBuilder = new GeneratedTypeBuilderImpl(packageName, moduleName); + final CodegenGeneratedTypeBuilder moduleBuilder = new CodegenGeneratedTypeBuilder(packageName, moduleName); moduleBuilder.setModuleName(moduleName); addCodegenInformation(moduleBuilder, module); @@ -911,7 +911,7 @@ abstract class AbstractTypeGenerator { augTypeName = augGenTypeName(augmentBuilders, targetTypeRef.getName()); } - final GeneratedTypeBuilder augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName); + final GeneratedTypeBuilder augTypeBuilder = new CodegenGeneratedTypeBuilder(augmentPackageName, augTypeName); augTypeBuilder.addImplementsType(DATA_OBJECT); augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef)); @@ -1725,7 +1725,7 @@ abstract class AbstractTypeGenerator { } // FIXME: Validation of name conflict - final GeneratedTypeBuilderImpl newType = new GeneratedTypeBuilderImpl(packageName, genTypeName); + final CodegenGeneratedTypeBuilder newType = new CodegenGeneratedTypeBuilder(packageName, genTypeName); final Module module = findParentModule(schemaContext, schemaNode); qnameConstant(newType, BindingMapping.QNAME_STATIC_FIELD_NAME, schemaNode.getQName()); diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java index 00dd021e4f..690fe4ef1b 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImplTest.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.NoSuchElementException; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTypeBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; @@ -107,7 +107,7 @@ public class TypeProviderImplTest { final AbstractTypeProvider typeProvider = new RuntimeTypeProvider(schemaContext); final SchemaPath refTypePath = SchemaPath.create(true, QName.create("", "cont1"), QName.create("", "list1")); - final GeneratedTypeBuilderImpl refType = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", + final CodegenGeneratedTypeBuilder refType = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "TestType"); typeProvider.putReferencedType(refTypePath, refType); final StringTypeDefinition stringType = BaseTypes.stringType(); diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java similarity index 91% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java index 576ba55f8b..a3ec20da0c 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/CodegenGeneratedTypeBuilder.java @@ -12,7 +12,7 @@ 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; -public final class GeneratedTypeBuilderImpl extends AbstractGeneratedTypeBuilder implements +public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuilder implements GeneratedTypeBuilder { private String description; @@ -20,7 +20,7 @@ public final class GeneratedTypeBuilderImpl extends AbstractGeneratedTypeBuilder private String moduleName; private Iterable schemaPath; - public GeneratedTypeBuilderImpl(final String packageName, final String name) { + public CodegenGeneratedTypeBuilder(final String packageName, final String name) { super(packageName, name); setAbstract(true); } @@ -81,7 +81,7 @@ public final class GeneratedTypeBuilderImpl extends AbstractGeneratedTypeBuilder } @Override - protected GeneratedTypeBuilderImpl thisInstance() { + protected CodegenGeneratedTypeBuilder thisInstance() { return this; } @@ -92,7 +92,7 @@ public final class GeneratedTypeBuilderImpl extends AbstractGeneratedTypeBuilder private final String moduleName; private final Iterable schemaPath; - public GeneratedTypeImpl(final GeneratedTypeBuilderImpl builder) { + public GeneratedTypeImpl(final CodegenGeneratedTypeBuilder builder) { super(builder); this.description = builder.description; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java index 330c72b337..da42231c75 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTOBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2018 Pantheon Technologies, s.r.o. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, 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 new file mode 100644 index 0000000000..af3dc31c1b --- /dev/null +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/RuntimeGeneratedTypeBuilder.java @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2018 Pantheon Technologies, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; + +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +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; + +public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuilder implements + GeneratedTypeBuilder { + + public RuntimeGeneratedTypeBuilder(final String packageName, final String name) { + super(packageName, name); + setAbstract(true); + } + + @Override + public GeneratedType toInstance() { + return new GeneratedTypeImpl(this); + } + + @Override + public void setDescription(final String description) { + // No-op + } + + @Override + public void setModuleName(final String moduleName) { + // No-op + } + + @Override + public void setSchemaPath(final Iterable schemaPath) { + // No-op + } + + @Override + public void setReference(final String reference) { + // 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(", enclosedTypes="); + builder.append(getEnclosedTypes()); + 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; + } + + private static final class GeneratedTypeImpl extends AbstractGeneratedType { + GeneratedTypeImpl(final RuntimeGeneratedTypeBuilder builder) { + super(builder); + } + + @Override + public String getDescription() { + throw new UnsupportedOperationException("Not available at runtime"); + } + + @Override + public String getReference() { + throw new UnsupportedOperationException("Not available at runtime"); + } + + @Override + public Iterable getSchemaPath() { + throw new UnsupportedOperationException("Not available at runtime"); + } + + @Override + public String getModuleName() { + throw new UnsupportedOperationException("Not available at runtime"); + } + } +} diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java index fbd1b67c87..0112eb0bb1 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java @@ -31,7 +31,7 @@ import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.Restrictions; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; -import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTypeBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTypeBuilder; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; @@ -122,16 +122,16 @@ public class BindingGeneratorUtilTest { assertNotNull(restriction); // test method computeDefaultSUID - GeneratedTypeBuilder genTypeBuilder = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", "TestType"); + GeneratedTypeBuilder genTypeBuilder = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "TestType"); genTypeBuilder.addMethod("testMethod"); genTypeBuilder.addAnnotation("org.opendaylight.yangtools.test.annotation", "AnnotationTest"); genTypeBuilder.addEnclosingTransferObject("testObject"); genTypeBuilder.addProperty("newProp"); - GeneratedTypeBuilder genType = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", "Type2"); + GeneratedTypeBuilder genType = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "Type2"); genTypeBuilder.addImplementsType(genType); long computedSUID = BindingGeneratorUtil.computeDefaultSUID(genTypeBuilder); - GeneratedTypeBuilder genTypeBuilder2 = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test2", "TestType2"); + GeneratedTypeBuilder genTypeBuilder2 = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test2", "TestType2"); long computedSUID2 = BindingGeneratorUtil.computeDefaultSUID(genTypeBuilder2); assertNotEquals(computedSUID, computedSUID2); @@ -286,7 +286,7 @@ public class BindingGeneratorUtilTest { @Test public void computeDefaultSUIDTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); MethodSignatureBuilder method = generatedTypeBuilder.addMethod("myMethodName"); method.setAccessModifier(AccessModifier.PUBLIC); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java index b59bdff570..3bc0e0ff9b 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java @@ -16,14 +16,14 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addPropertyIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addProperty(null); } @Test(expected = IllegalArgumentException.class) public void addPropertyIllegalArgumentTest2() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addProperty("myName"); generatedTypeBuilder.addProperty("myName"); @@ -31,7 +31,7 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addEnclosingTransferObjectArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addEnclosingTransferObject(new CodegenGeneratedTOBuilder("my.package", "myName")); generatedTypeBuilder.addEnclosingTransferObject(new CodegenGeneratedTOBuilder("my.package", "myName")); @@ -39,7 +39,7 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addEnclosingTransferObjectArgumentTest2() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addEnclosingTransferObject("myName"); generatedTypeBuilder.addEnclosingTransferObject("myName"); @@ -47,7 +47,7 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addImplementsTypeIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addImplementsType(Types.typeForClass(Serializable.class)); generatedTypeBuilder.addImplementsType(Types.typeForClass(Serializable.class)); @@ -55,7 +55,7 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addConstantIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addConstant(Types.STRING, "myName", "Value"); generatedTypeBuilder.addConstant(Types.BOOLEAN, "myName", true); @@ -63,7 +63,7 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addAnnotationIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addAnnotation("my.package", "myName"); generatedTypeBuilder.addAnnotation("my.package", "myName"); @@ -71,7 +71,7 @@ public class AbstractGeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addEnumerationIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addEnumeration("myName"); generatedTypeBuilder.addEnumeration("myName"); 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 6720cd136f..820aac7b18 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 @@ -20,8 +20,8 @@ public class AbstractTypeMemberTest { @Test public void testMethodsForAbstractTypeMemberBuilder() { final MethodSignatureBuilderImpl methodSignatureBuilderImpl = new MethodSignatureBuilderImpl("TestProperty"); - final GeneratedTypeBuilderImpl typeBuilderImpl = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", "TestType"); - final GeneratedTypeBuilderImpl typeBuilderImpl2 = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", "TestType2"); + final CodegenGeneratedTypeBuilder typeBuilderImpl = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "TestType"); + final CodegenGeneratedTypeBuilder typeBuilderImpl2 = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "TestType2"); methodSignatureBuilderImpl.setComment("test comment"); methodSignatureBuilderImpl.setFinal(true); methodSignatureBuilderImpl.setStatic(true); 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 c0899886ee..02a5589ea1 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 @@ -31,7 +31,7 @@ public class AnnotationBuilderTest { @Test public void generatedTypeAnnotationTest() { - final GeneratedTypeBuilder genTypeBuilder = new GeneratedTypeBuilderImpl("org.opendaylight.controller", + final GeneratedTypeBuilder genTypeBuilder = new CodegenGeneratedTypeBuilder("org.opendaylight.controller", "AnnotInterface"); genTypeBuilder.addAnnotation("javax.management", "MXBean"); @@ -67,7 +67,7 @@ public class AnnotationBuilderTest { @Test public void methodSignatureAnnotationTest() { - final GeneratedTypeBuilder genTypeBuilder = new GeneratedTypeBuilderImpl("org.opendaylight.controller", + final GeneratedTypeBuilder genTypeBuilder = new CodegenGeneratedTypeBuilder("org.opendaylight.controller", "TransferObject"); final MethodSignatureBuilder methodBuilder = genTypeBuilder.addMethod("simpleMethod"); 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 051190da38..c6604540d4 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 @@ -18,9 +18,9 @@ public class ConstantImplTest { @Test public void testMethodsOfConstantImpl() { - final GeneratedTypeBuilderImpl definingType = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", + final CodegenGeneratedTypeBuilder definingType = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "DefiningType"); - final GeneratedTypeBuilderImpl type = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test.v1", + final CodegenGeneratedTypeBuilder type = new CodegenGeneratedTypeBuilder("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"); 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 88236d1218..c4c5c98258 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 @@ -27,7 +27,7 @@ public class GeneratedPropertyImplTest { generatedPropertyBuilderImpl.setAccessModifier(AccessModifier.PUBLIC); generatedPropertyBuilderImpl.setReturnType(Types.BOOLEAN); - GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(new GeneratedTypeBuilderImpl("my.package", + GeneratedProperty instance = generatedPropertyBuilderImpl.toInstance(new CodegenGeneratedTypeBuilder("my.package", "myTypeName").toInstance()); assertNotNull(instance); 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 0bd589d75b..9caa7b4b69 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 @@ -36,7 +36,7 @@ public class GeneratedTypeBuilderTest { @Test public void addConstantTest() { - GeneratedTypeBuilder generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); // assertNotNull(generatedTypeBuilder.addComment("My comment ...")); @@ -101,22 +101,22 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addConstantIllegalArgumentTest() { - GeneratedTypeBuilder generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addConstant(Types.typeForClass(String.class), null, "myConstantValue"); } @Test(expected = IllegalArgumentException.class) public void addConstantIllegalArgumentTest2() { - GeneratedTypeBuilder generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + GeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addConstant(null, "myConstantName", "myConstantValue"); } @Test public void generatedTypeBuilderEqualsAndHashCodeTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); - GeneratedTypeBuilderImpl generatedTypeBuilder2 = new GeneratedTypeBuilderImpl("my.package", "MyName"); - GeneratedTypeBuilderImpl generatedTypeBuilder3 = new GeneratedTypeBuilderImpl("my.package", "MyName2"); - GeneratedTypeBuilderImpl generatedTypeBuilder4 = new GeneratedTypeBuilderImpl("my.package2", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder2 = new CodegenGeneratedTypeBuilder("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder3 = new CodegenGeneratedTypeBuilder("my.package", "MyName2"); + CodegenGeneratedTypeBuilder generatedTypeBuilder4 = new CodegenGeneratedTypeBuilder("my.package2", "MyName"); assertFalse(generatedTypeBuilder.equals(null)); assertFalse(generatedTypeBuilder.equals(new Object())); @@ -132,7 +132,7 @@ public class GeneratedTypeBuilderTest { @Test public void addPropertyTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); GeneratedPropertyBuilder propertyBuilder = generatedTypeBuilder.addProperty("myProperty"); GeneratedPropertyBuilder propertyBuilder2 = generatedTypeBuilder.addProperty("myProperty2"); @@ -161,13 +161,13 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addMethodIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addMethod(null); } @Test public void addMethodTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); MethodSignatureBuilder methodBuilder = generatedTypeBuilder.addMethod("myMethodName"); MethodSignatureBuilder methodBuilder2 = generatedTypeBuilder.addMethod("myMethodName2"); @@ -192,14 +192,14 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addEnumerationIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addEnumeration(null); } @Test public void addEnumerationTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); EnumBuilder enumBuilder = generatedTypeBuilder.addEnumeration("myEnumName"); EnumBuilder enumBuilder2 = generatedTypeBuilder.addEnumeration("myEnumName2"); @@ -220,14 +220,14 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addImplementsTypeIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addImplementsType(null); } @Test public void addImplementsTypeTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); assertEquals(generatedTypeBuilder, generatedTypeBuilder.addImplementsType(Types.typeForClass(Serializable.class))); @@ -246,21 +246,21 @@ public class GeneratedTypeBuilderTest { @Test(expected = IllegalArgumentException.class) public void addEnclosingTransferObjectIllegalArgumentTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addEnclosingTransferObject((String) null); } @Test(expected = IllegalArgumentException.class) public void addEnclosingTransferObjectIllegalArgumentTest2() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.addEnclosingTransferObject((GeneratedTOBuilder) null); } @Test public void addEnclosingTransferObjectTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); GeneratedTOBuilder enclosingTransferObject = generatedTypeBuilder.addEnclosingTransferObject("myTOName"); GeneratedTOBuilder enclosingTransferObject2 = generatedTypeBuilder.addEnclosingTransferObject("myTOName2"); @@ -286,7 +286,7 @@ public class GeneratedTypeBuilderTest { @Test public void generatedTypeTest() { - GeneratedTypeBuilderImpl generatedTypeBuilder = new GeneratedTypeBuilderImpl("my.package", "MyName"); + CodegenGeneratedTypeBuilder generatedTypeBuilder = new CodegenGeneratedTypeBuilder("my.package", "MyName"); generatedTypeBuilder.setDescription("My description ..."); generatedTypeBuilder.setModuleName("myModuleName"); diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImplTest.java index cb0957e57c..d00eff793d 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImplTest.java @@ -34,7 +34,7 @@ public class MethodSignatureBuilderImplTest { @Test public void testAddParameterMethod() { final MethodSignatureBuilderImpl signatureBuilderImpl = new MethodSignatureBuilderImpl("testMethod"); - final GeneratedTypeBuilderImpl ipAddressType = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", "IpAddress"); + final CodegenGeneratedTypeBuilder ipAddressType = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "IpAddress"); signatureBuilderImpl.addParameter(ipAddressType, "ipAddress"); final MethodSignature methodSignature = signatureBuilderImpl.toInstance(null); assertEquals("ipAddress", methodSignature.getParameters().get(0).getName()); @@ -48,7 +48,7 @@ public class MethodSignatureBuilderImplTest { final MethodSignatureBuilderImpl signatureBuilderImpl4 = new MethodSignatureBuilderImpl(null); final MethodSignatureBuilderImpl signatureBuilderImpl5 = signatureBuilderImpl; final MethodSignatureBuilderImpl signatureBuilderImpl6 = new MethodSignatureBuilderImpl("testMethod"); - final GeneratedTypeBuilderImpl returnType = new GeneratedTypeBuilderImpl("org.opendaylight.yangtools.test", "Address"); + final CodegenGeneratedTypeBuilder returnType = new CodegenGeneratedTypeBuilder("org.opendaylight.yangtools.test", "Address"); signatureBuilderImpl6.setReturnType(returnType); assertEquals(signatureBuilderImpl.hashCode(), signatureBuilderImpl2.hashCode()); diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java index 09779b678c..6e7852ba9e 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/GeneratorJavaFileTest.java @@ -21,7 +21,7 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.util.BindingTypes; import org.opendaylight.mdsal.binding.model.util.Types; -import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTypeBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.CodegenGeneratedTypeBuilder; public class GeneratorJavaFileTest { private static final String FS = File.separator; @@ -36,7 +36,7 @@ public class GeneratorJavaFileTest { types.add(t1); types.add(t2); types.add(t3); - GeneratedTypeBuilder gtb = new GeneratedTypeBuilderImpl("org.opendaylight.controller.gen", "Type4"); + GeneratedTypeBuilder gtb = new CodegenGeneratedTypeBuilder("org.opendaylight.controller.gen", "Type4"); gtb.addImplementsType(Types.augmentableTypeFor(gtb)); types.add(gtb.toInstance()); GeneratorJavaFile generator = new GeneratorJavaFile(types); @@ -54,7 +54,7 @@ public class GeneratorJavaFileTest { } private static GeneratedType createGeneratedType(String pkgName, String name) { - GeneratedTypeBuilder builder = new GeneratedTypeBuilderImpl(pkgName, name); + GeneratedTypeBuilder builder = new CodegenGeneratedTypeBuilder(pkgName, name); builder.addImplementsType(BindingTypes.DATA_OBJECT); return builder.toInstance(); } -- 2.36.6