From 2283c637bc41bcd9478439b87b69e2e18e962be0 Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Fri, 10 Mar 2017 14:17:43 +0100 Subject: [PATCH] Bug 6859: Binding generator v1 refactoring - make sure package names differ between MDSAL Binding v1 submodules after refactoring Change-Id: I6f1def44682f28a00a79ac3c787eeaca5b6755d6 Signed-off-by: Martin Ciglan --- .../api/gen/plugin/CodeGeneratorImpl.java | 2 +- .../impl/AbstractStreamWriterGenerator.java | 2 +- .../generator/impl/BindingGeneratorImpl.java | 42 +++++++++---------- .../generator/util/BindingRuntimeContext.java | 2 +- .../binding/yang/types/BaseYangTypes.java | 2 +- .../binding/yang/types/TypeProviderImpl.java | 14 +++---- .../generator/impl/BaseTypeProvider.java | 2 +- .../binding/yang/types/BaseYangTypesTest.java | 3 +- .../yang/types/TypeProviderImplTest.java | 3 +- .../binding/yang/types/TypeProviderTest.java | 6 +-- .../util/AbstractBaseType.java | 2 +- .../util/BindingGeneratorUtil.java | 2 +- .../util/BindingTypes.java | 7 ++-- .../util/ReferencedTypeImpl.java | 2 +- .../util/TypeConstants.java | 2 +- .../{generator => model}/util/Types.java | 2 +- .../type/builder/AbstractGeneratedType.java | 4 +- .../builder/AbstractGeneratedTypeBuilder.java | 4 +- .../type/builder/AbstractTypeMember.java | 2 +- .../builder/AbstractTypeMemberBuilder.java | 2 +- .../builder/AnnotationTypeBuilderImpl.java | 4 +- .../generated/type/builder/ConstantImpl.java | 2 +- .../type/builder/EnumerationBuilderImpl.java | 4 +- .../builder/GeneratedPropertyBuilderImpl.java | 2 +- .../type/builder/GeneratedPropertyImpl.java | 2 +- .../type/builder/GeneratedTOBuilderImpl.java | 2 +- .../builder/GeneratedTypeBuilderImpl.java | 2 +- .../type/builder/MethodParameterImpl.java | 2 +- .../builder/MethodSignatureBuilderImpl.java | 2 +- .../type/builder/MethodSignatureImpl.java | 2 +- .../util/package-info.java | 2 +- .../util/AbstractBaseTypeTest.java | 2 +- .../util/BindingGeneratorUtilTest.java | 5 ++- .../util/BindingTypesTest.java | 4 +- .../util/ReferencedTypeImplTest.java | 2 +- .../{generator => model}/util/TypesTest.java | 2 +- .../AbstractGeneratedTypeBuilderTest.java | 4 +- .../type/builder/AbstractTypeMemberTest.java | 2 +- .../type/builder/AnnotationBuilderTest.java | 4 +- .../type/builder/ConstantImplTest.java | 2 +- .../builder/EnumerationBuilderImplTest.java | 2 +- .../GeneratedPropertyBuilderImplTest.java | 4 +- .../builder/GeneratedPropertyImplTest.java | 4 +- .../type/builder/GeneratedPropertyTest.java | 2 +- .../builder/GeneratedTOBuilderImplTest.java | 2 +- .../type/builder/GeneratedTOBuilderTest.java | 2 +- .../builder/GeneratedTypeBuilderTest.java | 6 +-- .../type/builder/MethodParameterImplTest.java | 4 +- .../MethodSignatureBuilderImplTest.java | 2 +- .../builder/MethodSignatureBuilderTest.java | 4 +- .../type/builder/MethodSignatureImplTest.java | 4 +- .../java/api/generator/BaseTemplate.xtend | 2 +- .../java/api/generator/BuilderTemplate.xtend | 6 +-- .../java/api/generator/ClassTemplate.xtend | 2 +- .../java/api/generator/EnumTemplate.xtend | 4 +- .../java/api/generator/GeneratorUtil.java | 4 +- .../api/generator/InterfaceTemplate.xtend | 4 +- .../java/api/generator/UnionTemplate.xtend | 3 +- .../generator/YangModuleInfoTemplate.xtend | 13 +++--- .../java/api/generator/GeneratorUtilTest.java | 3 +- .../test/ClassCodeGeneratorTest.java | 4 +- .../generator/test/GeneratorJavaFileTest.java | 6 +-- 62 files changed, 124 insertions(+), 123 deletions(-) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/AbstractBaseType.java (98%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/BindingGeneratorUtil.java (99%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/BindingTypes.java (92%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/ReferencedTypeImpl.java (95%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/TypeConstants.java (92%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/Types.java (99%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AbstractGeneratedType.java (98%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AbstractGeneratedTypeBuilder.java (98%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AbstractTypeMember.java (97%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AbstractTypeMemberBuilder.java (98%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AnnotationTypeBuilderImpl.java (98%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/ConstantImpl.java (97%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/EnumerationBuilderImpl.java (98%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedPropertyBuilderImpl.java (96%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedPropertyImpl.java (96%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedTOBuilderImpl.java (99%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedTypeBuilderImpl.java (97%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodParameterImpl.java (96%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodSignatureBuilderImpl.java (97%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodSignatureImpl.java (97%) rename binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/{generator => model}/util/package-info.java (85%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/AbstractBaseTypeTest.java (98%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/BindingGeneratorUtilTest.java (99%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/BindingTypesTest.java (95%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/ReferencedTypeImplTest.java (94%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/TypesTest.java (97%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java (95%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AbstractTypeMemberTest.java (96%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/AnnotationBuilderTest.java (99%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/ConstantImplTest.java (97%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/EnumerationBuilderImplTest.java (98%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java (96%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedPropertyImplTest.java (96%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedPropertyTest.java (95%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedTOBuilderImplTest.java (98%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedTOBuilderTest.java (97%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/GeneratedTypeBuilderTest.java (98%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodParameterImplTest.java (93%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodSignatureBuilderImplTest.java (97%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodSignatureBuilderTest.java (94%) rename binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/{generator => model}/util/generated/type/builder/MethodSignatureImplTest.java (95%) diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java index 0eaa68d00b..26d935d468 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java @@ -27,10 +27,10 @@ import java.util.function.Function; import org.apache.maven.project.MavenProject; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil; import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; import org.opendaylight.mdsal.binding.java.api.generator.YangModuleInfoTemplate; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; import org.opendaylight.yangtools.yang.model.api.Module; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AbstractStreamWriterGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AbstractStreamWriterGenerator.java index 4ce81cdffe..8d459ceb3c 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AbstractStreamWriterGenerator.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AbstractStreamWriterGenerator.java @@ -24,8 +24,8 @@ import javassist.NotFoundException; import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; import org.opendaylight.mdsal.binding.generator.util.ClassCustomizer; import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; -import org.opendaylight.mdsal.binding.generator.util.Types; import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.yangtools.binding.data.codec.gen.spi.StaticConstantDefinition; import org.opendaylight.yangtools.binding.data.codec.util.AugmentableDispatchSerializer; import org.opendaylight.yangtools.util.ClassLoaderUtils; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImpl.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImpl.java index d821e74af9..6f64e70d15 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImpl.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImpl.java @@ -10,20 +10,20 @@ package org.opendaylight.mdsal.binding.generator.impl; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.computeDefaultSUID; -import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.encodeAngleBrackets; -import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.packageNameForAugmentedGeneratedType; -import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.packageNameForGeneratedType; -import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.DATA_OBJECT; -import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.DATA_ROOT; -import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.IDENTIFIABLE; -import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.IDENTIFIER; -import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.NOTIFICATION; -import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.augmentable; -import static org.opendaylight.mdsal.binding.generator.util.Types.BOOLEAN; -import static org.opendaylight.mdsal.binding.generator.util.Types.FUTURE; -import static org.opendaylight.mdsal.binding.generator.util.Types.VOID; -import static org.opendaylight.mdsal.binding.generator.util.Types.typeForClass; +import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.computeDefaultSUID; +import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.encodeAngleBrackets; +import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.packageNameForAugmentedGeneratedType; +import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.packageNameForGeneratedType; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_OBJECT; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_ROOT; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.IDENTIFIABLE; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.IDENTIFIER; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.NOTIFICATION; +import static org.opendaylight.mdsal.binding.model.util.BindingTypes.augmentable; +import static org.opendaylight.mdsal.binding.model.util.Types.BOOLEAN; +import static org.opendaylight.mdsal.binding.model.util.Types.FUTURE; +import static org.opendaylight.mdsal.binding.model.util.Types.VOID; +import static org.opendaylight.mdsal.binding.model.util.Types.typeForClass; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNode; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findNodeInSchemaContext; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule; @@ -46,13 +46,6 @@ import java.util.Set; import java.util.regex.Pattern; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.mdsal.binding.generator.util.BindingTypes; -import org.opendaylight.mdsal.binding.generator.util.ReferencedTypeImpl; -import org.opendaylight.mdsal.binding.generator.util.Types; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; @@ -67,6 +60,13 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil; +import org.opendaylight.mdsal.binding.model.util.BindingTypes; +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.GeneratedPropertyBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTOBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.mdsal.binding.yang.types.GroupingDefinitionDependencySort; import org.opendaylight.mdsal.binding.yang.types.TypeProviderImpl; import org.opendaylight.yangtools.yang.binding.BaseIdentity; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java index 540a38bd9c..cfb6e96399 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingRuntimeContext.java @@ -30,12 +30,12 @@ import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.mdsal.binding.generator.impl.BindingSchemaContextUtils; import org.opendaylight.mdsal.binding.generator.impl.ModuleContext; -import org.opendaylight.mdsal.binding.generator.util.ReferencedTypeImpl; import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.model.util.ReferencedTypeImpl; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.BindingMapping; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java index 7fbe439988..a8ee2ae8bf 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypes.java @@ -13,9 +13,9 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Map; import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding.generator.util.Types; import org.opendaylight.mdsal.binding.model.api.Restrictions; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImpl.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImpl.java index c1a4bc48e4..fa4343a7d0 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImpl.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderImpl.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.yang.types; -import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.encodeAngleBrackets; +import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.encodeAngleBrackets; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNode; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNodeForRelativeXPath; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule; @@ -36,12 +36,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.lang3.StringEscapeUtils; import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.mdsal.binding.generator.util.TypeConstants; -import org.opendaylight.mdsal.binding.generator.util.Types; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.EnumerationBuilderImpl; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.ConcreteType; import org.opendaylight.mdsal.binding.model.api.Enumeration; @@ -54,6 +48,12 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBu import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil; +import org.opendaylight.mdsal.binding.model.util.TypeConstants; +import org.opendaylight.mdsal.binding.model.util.Types; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.EnumerationBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedPropertyBuilderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java index a25cc2dd16..0f0f169fa9 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BaseTypeProvider.java @@ -12,10 +12,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding.generator.util.Types; import org.opendaylight.mdsal.binding.model.api.ConcreteType; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.yang.types.BaseYangTypes; public class BaseTypeProvider { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java index 4e177ea85b..64af70e8b4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java @@ -20,9 +20,8 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.yang.types.BaseYangTypes; +import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; 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 a175339324..c8f0656e9e 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,9 +20,8 @@ import java.io.File; import java.net.URI; import java.util.NoSuchElementException; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.yang.types.TypeProviderImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java index c3cf202bbc..fdd752336d 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/TypeProviderTest.java @@ -23,9 +23,6 @@ import org.junit.runners.JUnit4; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.mdsal.binding.generator.util.ReferencedTypeImpl; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.mdsal.binding.model.api.ConcreteType; import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; @@ -33,6 +30,9 @@ import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Restrictions; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil; +import org.opendaylight.mdsal.binding.model.util.ReferencedTypeImpl; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/AbstractBaseType.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/AbstractBaseType.java similarity index 98% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/AbstractBaseType.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/AbstractBaseType.java index 127f018b4f..546394475a 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/AbstractBaseType.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/AbstractBaseType.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import java.util.Objects; import org.opendaylight.mdsal.binding.model.api.Type; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtil.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtil.java similarity index 99% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtil.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtil.java index 64faac82e2..8c3d292b40 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtil.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtil.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableList; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingTypes.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/BindingTypes.java similarity index 92% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingTypes.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/BindingTypes.java index f5f4b4bb04..8a91172d06 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BindingTypes.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/BindingTypes.java @@ -5,10 +5,11 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; + +import static org.opendaylight.mdsal.binding.model.util.Types.parameterizedTypeFor; +import static org.opendaylight.mdsal.binding.model.util.Types.typeForClass; -import static org.opendaylight.mdsal.binding.generator.util.Types.parameterizedTypeFor; -import static org.opendaylight.mdsal.binding.generator.util.Types.typeForClass; import org.opendaylight.mdsal.binding.model.api.ConcreteType; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/ReferencedTypeImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/ReferencedTypeImpl.java similarity index 95% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/ReferencedTypeImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/ReferencedTypeImpl.java index 7ff4d7471f..a49cb564b9 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/ReferencedTypeImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/ReferencedTypeImpl.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; /** * diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/TypeConstants.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/TypeConstants.java similarity index 92% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/TypeConstants.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/TypeConstants.java index c1d1e2ded7..c7f94ac02d 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/TypeConstants.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/TypeConstants.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; /** * diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java similarity index 99% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/Types.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java index bd06eddfa0..763c1e6f39 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/Types.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import com.google.common.base.CharMatcher; import com.google.common.base.Optional; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 98% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractGeneratedType.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedType.java index 4c2b3c1fe1..1d31ea274b 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,12 +5,11 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opendaylight.mdsal.binding.generator.util.AbstractBaseType; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Enumeration; @@ -24,6 +23,7 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBu import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.util.AbstractBaseType; abstract class AbstractGeneratedType extends AbstractBaseType implements GeneratedType { diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 98% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilder.java index c1430102e1..4fb8d49390 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,13 +5,12 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.generator.util.AbstractBaseType; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Type; @@ -22,6 +21,7 @@ import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.util.AbstractBaseType; import org.opendaylight.yangtools.util.LazyCollections; abstract class AbstractGeneratedTypeBuilder> extends AbstractBaseType implements GeneratedTypeBuilderBase { diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMember.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMember.java similarity index 97% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMember.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMember.java index 6bdd0aaaab..da19915667 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMember.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMember.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.List; import java.util.Objects; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java similarity index 98% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java index 3a1c3dd52d..64771279e2 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberBuilder.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java similarity index 98% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java index 3cb70d362d..88940646e1 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -5,16 +5,16 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.generator.util.AbstractBaseType; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.model.util.AbstractBaseType; import org.opendaylight.yangtools.util.LazyCollections; final class AnnotationTypeBuilderImpl extends AbstractBaseType implements AnnotationTypeBuilder { diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 97% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/ConstantImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java index a4e724e45b..76e9a0426f 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.Objects; import org.opendaylight.mdsal.binding.model.api.Constant; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImpl.java similarity index 98% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImpl.java index b158114b59..72ebc0487f 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImpl.java @@ -5,14 +5,13 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.generator.util.AbstractBaseType; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Enumeration; @@ -23,6 +22,7 @@ import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.model.util.AbstractBaseType; import org.opendaylight.yangtools.util.LazyCollections; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 96% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImpl.java index 25395462a5..8ede78fcba 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.List; import org.opendaylight.mdsal.binding.model.api.AnnotationType; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 96% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImpl.java index 08b87d860a..96745e43f1 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.List; import org.opendaylight.mdsal.binding.model.api.AccessModifier; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImpl.java similarity index 99% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImpl.java index 0a8fc8b531..9ccdc4d3af 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImpl.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import com.google.common.base.Preconditions; import java.util.Collections; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderImpl.java similarity index 97% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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/GeneratedTypeBuilderImpl.java index ce48cb9601..f718c8b687 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderImpl.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +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.type.builder.GeneratedTypeBuilder; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodParameterImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodParameterImpl.java similarity index 96% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodParameterImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodParameterImpl.java index 068ab9cff5..a044481f17 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodParameterImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodParameterImpl.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.Objects; import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 97% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImpl.java index 994d2bc8d0..ba09b43463 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.Collections; import java.util.List; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 similarity index 97% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureImpl.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImpl.java index 723d2841ff..c3bb962075 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.util.List; import java.util.Objects; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/package-info.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/package-info.java similarity index 85% rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/package-info.java rename to binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/package-info.java index f15bfa57d6..69ae7d6469 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/package-info.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/package-info.java @@ -5,4 +5,4 @@ * 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.generator.util; \ No newline at end of file +package org.opendaylight.mdsal.binding.model.util; \ No newline at end of file diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/AbstractBaseTypeTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/AbstractBaseTypeTest.java similarity index 98% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/AbstractBaseTypeTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/AbstractBaseTypeTest.java index 8b37df8d36..ec433ee07b 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/AbstractBaseTypeTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/AbstractBaseTypeTest.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java similarity index 99% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java index 318fd4efca..d37e495ab8 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingGeneratorUtilTest.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,6 +16,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; + import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.io.File; @@ -27,11 +28,11 @@ import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; 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.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingTypesTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingTypesTest.java similarity index 95% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingTypesTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingTypesTest.java index cbd2c4e94b..181e7818a2 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingTypesTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/BindingTypesTest.java @@ -5,11 +5,11 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.opendaylight.mdsal.binding.generator.util.Types.typeForClass; +import static org.opendaylight.mdsal.binding.model.util.Types.typeForClass; import org.junit.Test; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/ReferencedTypeImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/ReferencedTypeImplTest.java similarity index 94% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/ReferencedTypeImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/ReferencedTypeImplTest.java index 237e495d76..65adcb7a3e 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/ReferencedTypeImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/ReferencedTypeImplTest.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/TypesTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java similarity index 97% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/TypesTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java index 56e8d0dd1e..7e9e87cacf 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/TypesTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/TypesTest.java @@ -5,7 +5,7 @@ * 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.generator.util; +package org.opendaylight.mdsal.binding.model.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 95% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractGeneratedTypeBuilderTest.java index 4eabf6df69..354d072612 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,12 +5,12 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import java.io.Serializable; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; public class AbstractGeneratedTypeBuilderTest { diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 96% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AbstractTypeMemberTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AbstractTypeMemberTest.java index 08102ed9f4..6720cd136f 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 99% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/AnnotationBuilderTest.java index 83dcb8698e..2b4711b035 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.AnnotationType.Parameter; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 97% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/ConstantImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java index f99788b569..051190da38 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 98% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/EnumerationBuilderImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/EnumerationBuilderImplTest.java index 51033942eb..89564b507c 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 96% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyBuilderImplTest.java index c4cf2f967d..762ccb4d3d 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,14 +5,14 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 96% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedPropertyImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyImplTest.java index af20151d43..88236d1218 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,12 +5,12 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.*; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 95% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedPropertyTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedPropertyTest.java index bceca3d594..30519ae2e7 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java similarity index 98% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java index dd67b749c8..5abf56fb97 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderImplTest.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 97% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTOBuilderTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTOBuilderTest.java index 4a6a6ff290..56c6d66956 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 98% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/GeneratedTypeBuilderTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java index 1dc0ddab04..079e702f0e 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -15,8 +15,8 @@ import static org.junit.Assert.assertTrue; import java.io.Serializable; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Enumeration; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodParameterImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodParameterImplTest.java similarity index 93% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodParameterImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodParameterImplTest.java index 331624964a..10063b2d2e 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodParameterImplTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodParameterImplTest.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,7 +13,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.Type; public class MethodParameterImplTest { diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 97% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureBuilderImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderImplTest.java index 9eff79b549..cb0957e57c 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureBuilderTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderTest.java similarity index 94% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureBuilderTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderTest.java index 615d1fbc89..f8ae966d67 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureBuilderTest.java +++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureBuilderTest.java @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 similarity index 95% rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/generated/type/builder/MethodSignatureImplTest.java rename to binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/MethodSignatureImplTest.java index e28c2ff853..dbb69c298d 100644 --- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/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 @@ -5,7 +5,7 @@ * 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.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.model.util.generated.type.builder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.Types; +import org.opendaylight.mdsal.binding.model.util.Types; import org.opendaylight.mdsal.binding.model.api.AccessModifier; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend index ce61af8971..5c5f49c07f 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend @@ -16,7 +16,6 @@ import java.util.List import java.util.Map import java.util.StringTokenizer import java.util.regex.Pattern -import org.opendaylight.mdsal.binding.generator.util.Types import org.opendaylight.mdsal.binding.model.api.ConcreteType import org.opendaylight.mdsal.binding.model.api.Constant import org.opendaylight.mdsal.binding.model.api.GeneratedProperty @@ -26,6 +25,7 @@ import org.opendaylight.mdsal.binding.model.api.MethodSignature import org.opendaylight.mdsal.binding.model.api.Restrictions import org.opendaylight.mdsal.binding.model.api.Type import org.opendaylight.mdsal.binding.model.api.TypeMember +import org.opendaylight.mdsal.binding.model.util.Types import org.opendaylight.yangtools.yang.common.QName abstract class BaseTemplate { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend index 8f51840f75..d168473450 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend @@ -19,15 +19,15 @@ import java.util.List import java.util.Map import java.util.Objects import java.util.Set -import org.opendaylight.mdsal.binding.generator.util.ReferencedTypeImpl -import org.opendaylight.mdsal.binding.generator.util.Types -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl import org.opendaylight.mdsal.binding.model.api.ConcreteType import org.opendaylight.mdsal.binding.model.api.GeneratedProperty import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject import org.opendaylight.mdsal.binding.model.api.GeneratedType import org.opendaylight.mdsal.binding.model.api.MethodSignature import org.opendaylight.mdsal.binding.model.api.Type +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.GeneratedTOBuilderImpl import org.opendaylight.yangtools.concepts.Builder import org.opendaylight.yangtools.yang.binding.Augmentable import org.opendaylight.yangtools.yang.binding.AugmentationHolder diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend index f403720f94..592764ae76 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend @@ -18,7 +18,6 @@ import java.util.Collections import java.util.List import java.util.Objects import java.util.regex.Pattern -import org.opendaylight.mdsal.binding.generator.util.TypeConstants import org.opendaylight.mdsal.binding.model.api.ConcreteType import org.opendaylight.mdsal.binding.model.api.Constant import org.opendaylight.mdsal.binding.model.api.Enumeration @@ -27,6 +26,7 @@ import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject import org.opendaylight.mdsal.binding.model.api.GeneratedType import org.opendaylight.mdsal.binding.model.api.Restrictions import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.mdsal.binding.model.util.TypeConstants import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition /** diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend index ec5ab8f605..a7737d9668 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.java.api.generator -import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.encodeAngleBrackets; - import org.opendaylight.mdsal.binding.model.api.Enumeration import org.opendaylight.mdsal.binding.model.api.GeneratedType +import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.encodeAngleBrackets + /** * Template for generating JAVA enumeration type. */ diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java index 9d9a6b5379..0b067740a1 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java @@ -14,8 +14,6 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.opendaylight.mdsal.binding.generator.util.TypeConstants; -import org.opendaylight.mdsal.binding.generator.util.Types; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; @@ -25,6 +23,8 @@ import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.api.WildcardType; +import org.opendaylight.mdsal.binding.model.util.TypeConstants; +import org.opendaylight.mdsal.binding.model.util.Types; public final class GeneratorUtil { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend index 7618f19154..e732521c94 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend @@ -8,13 +8,13 @@ package org.opendaylight.mdsal.binding.java.api.generator import java.util.List -import org.opendaylight.mdsal.binding.generator.util.TypeConstants +import org.opendaylight.mdsal.binding.model.api.AnnotationType import org.opendaylight.mdsal.binding.model.api.Constant import org.opendaylight.mdsal.binding.model.api.Enumeration import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject import org.opendaylight.mdsal.binding.model.api.GeneratedType import org.opendaylight.mdsal.binding.model.api.MethodSignature -import org.opendaylight.mdsal.binding.model.api.AnnotationType +import org.opendaylight.mdsal.binding.model.util.TypeConstants /** * Template for generating JAVA interfaces. diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend index a40e1fe0fa..fa718d366e 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend @@ -7,7 +7,8 @@ */ package org.opendaylight.mdsal.binding.java.api.generator -import static org.opendaylight.mdsal.binding.generator.util.Types.* +import static org.opendaylight.mdsal.binding.model.util.Types.BOOLEAN; +import static org.opendaylight.mdsal.binding.model.util.Types.getOuterClassName; import com.google.common.base.Preconditions; import java.beans.ConstructorProperties diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend index cb1b723c8d..edf832397f 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend @@ -7,32 +7,33 @@ */ package org.opendaylight.mdsal.binding.java.api.generator -import static org.opendaylight.yangtools.yang.binding.BindingMapping.getClassName -import static org.opendaylight.yangtools.yang.binding.BindingMapping.getRootPackageName import static org.opendaylight.yangtools.yang.binding.BindingMapping.MODEL_BINDING_PROVIDER_CLASS_NAME import static org.opendaylight.yangtools.yang.binding.BindingMapping.MODULE_INFO_CLASS_NAME +import static org.opendaylight.yangtools.yang.binding.BindingMapping.getClassName +import static org.opendaylight.yangtools.yang.binding.BindingMapping.getRootPackageName import com.google.common.base.Preconditions import com.google.common.collect.ImmutableSet -import java.io.InputStream import java.io.IOException +import java.io.InputStream import java.text.DateFormat import java.text.SimpleDateFormat -import java.util.Optional import java.util.Collections import java.util.Date import java.util.HashSet import java.util.LinkedHashMap import java.util.Map +import java.util.Optional import java.util.Set import java.util.TreeMap import java.util.function.Function -import org.opendaylight.mdsal.binding.generator.util.Types +import org.eclipse.xtend.lib.Property import org.opendaylight.mdsal.binding.model.api.ParameterizedType import org.opendaylight.mdsal.binding.model.api.Type import org.opendaylight.mdsal.binding.model.api.WildcardType -import org.opendaylight.yangtools.yang.binding.YangModuleInfo +import org.opendaylight.mdsal.binding.model.util.Types import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider +import org.opendaylight.yangtools.yang.binding.YangModuleInfo import org.opendaylight.yangtools.yang.model.api.Module import org.opendaylight.yangtools.yang.model.api.SchemaContext diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java index 885d480e1f..b1e3b82d83 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java @@ -14,15 +14,14 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; -import static org.opendaylight.mdsal.binding.generator.util.TypeConstants.PATTERN_CONSTANT_NAME; import static org.opendaylight.mdsal.binding.java.api.generator.GeneratorUtil.createImports; +import static org.opendaylight.mdsal.binding.model.util.TypeConstants.PATTERN_CONSTANT_NAME; import com.google.common.collect.ImmutableList; import java.lang.reflect.Constructor; import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.java.api.generator.GeneratorUtil; import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java index c4b5727c8a..8a750aeed0 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/test/ClassCodeGeneratorTest.java @@ -21,8 +21,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.mdsal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.mdsal.binding.generator.util.Types; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.mdsal.binding.java.api.generator.TOGenerator; import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; @@ -30,6 +28,8 @@ 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.util.Types; +import org.opendaylight.mdsal.binding.model.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; 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 dce5b9999d..09779b678c 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 @@ -16,12 +16,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.util.BindingTypes; -import org.opendaylight.mdsal.binding.generator.util.Types; -import org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; import org.opendaylight.mdsal.binding.java.api.generator.GeneratorJavaFile; 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; public class GeneratorJavaFileTest { private static final String FS = File.separator; -- 2.36.6