From e1a105e7a638007a62c0d9ca6bbef415f94b397f Mon Sep 17 00:00:00 2001 From: Jakub Toth Date: Tue, 21 Feb 2017 12:02:34 +0100 Subject: [PATCH] Bug 6859 #1 Binding generator v1 refactoring Based on transfer of Binding generator v1 from Yangtools project to MDSAL in past, we need to finalize this process by refactoring package naming: org.opendaylight.yangtools -> org.mdsal.binding org.opendaylight.yangtools.sal -> org.mdsal.binding This refactoring is done in subsequent steps, covering all necessary modules. Based on experience, this should also help users to address possible Binding generator v1 issues in MDSAL project, not in Yangtools. - mdsal-binding-generator-api module refactoring Change-Id: I11537d580c8df500b80104d158de6eef515afb1e Signed-off-by: Jakub Toth --- .../sal/api/gen/plugin/CodeGeneratorImpl.java | 4 +- .../impl/AbstractStreamWriterGenerator.java | 2 +- ...entableDataNodeContainerEmitterSource.java | 2 +- .../DataNodeContainerSerializerSource.java | 8 +- .../gen/impl/DataObjectSerializerSource.java | 4 +- .../codec/gen/impl/StreamWriterGenerator.java | 2 +- .../data/codec/gen/spi/AbstractSource.java | 3 +- .../data/codec/impl/BindingCodecContext.java | 2 +- .../codec/impl/DataObjectCodecContext.java | 4 +- ...issingClassInLoadingStrategyException.java | 2 +- .../generator/api/BindingGenerator.java | 2 - .../generator/api/ClassLoadingStrategy.java | 1 - .../binding/generator/spi/TypeProvider.java | 4 +- .../binding/model/api/AccessModifier.java | 5 +- .../binding/model/api/CodeGenerator.java | 4 +- .../mdsal/binding/model/api/Enumeration.java | 1 - .../api/GeneratedTransferIdentityObject.java | 3 +- .../model/api/GeneratedTransferObject.java | 1 - .../mdsal/binding/model/api/Restrictions.java | 4 - .../mdsal/binding/model/api/Type.java | 1 - .../mdsal/binding/model/api/WildcardType.java | 1 - .../type/builder/AnnotationTypeBuilder.java | 1 - .../api/type/builder/ConstantBuilder.java | 2 +- .../builder/GeneratedTypeBuilderBase.java | 1 - .../api/type/builder/TypeMemberBuilder.java | 12 +- .../generator/api/BindingGenerator.java | 55 ----- .../generator/api/ClassLoadingStrategy.java | 21 -- .../generator/api/ModuleInfoRegistry.java | 17 -- .../binding/generator/api/package-info.java | 8 - .../spi/BindingGeneratorServiceProvider.java | 17 -- .../binding/generator/spi/TypeProvider.java | 56 ----- .../generator/spi/TypeProviderFactory.java | 20 -- .../binding/generator/spi/package-info.java | 8 - .../sal/binding/model/api/AccessModifier.java | 19 -- .../sal/binding/model/api/AnnotationType.java | 103 -------- .../model/api/BaseTypeWithRestrictions.java | 19 -- .../sal/binding/model/api/CodeGenerator.java | 50 ---- .../sal/binding/model/api/ConcreteType.java | 21 -- .../sal/binding/model/api/Constant.java | 66 ----- .../sal/binding/model/api/DocumentedType.java | 54 ----- .../sal/binding/model/api/Enumeration.java | 76 ------ .../binding/model/api/GeneratedProperty.java | 33 --- .../api/GeneratedTransferIdentityObject.java | 17 -- .../model/api/GeneratedTransferObject.java | 90 ------- .../sal/binding/model/api/GeneratedType.java | 119 --------- .../binding/model/api/MethodSignature.java | 71 ------ .../binding/model/api/ParameterizedType.java | 40 ---- .../sal/binding/model/api/Restrictions.java | 28 --- .../yangtools/sal/binding/model/api/Type.java | 47 ---- .../sal/binding/model/api/TypeMember.java | 76 ------ .../sal/binding/model/api/WildcardType.java | 20 -- .../sal/binding/model/api/package-info.java | 8 - .../type/builder/AnnotationTypeBuilder.java | 92 ------- .../api/type/builder/ConstantBuilder.java | 23 -- .../model/api/type/builder/EnumBuilder.java | 69 ------ .../builder/GeneratedPropertyBuilder.java | 48 ---- .../api/type/builder/GeneratedTOBuilder.java | 102 -------- .../type/builder/GeneratedTypeBuilder.java | 30 --- .../builder/GeneratedTypeBuilderBase.java | 226 ------------------ .../type/builder/MethodSignatureBuilder.java | 72 ------ .../api/type/builder/TypeMemberBuilder.java | 83 ------- .../model/api/type/builder/package-info.java | 8 - .../generator/impl/BindingGeneratorImpl.java | 32 +-- .../impl/GeneratedClassLoadingStrategy.java | 4 +- .../binding/generator/impl/ModuleContext.java | 8 +- .../impl/ModuleInfoBackedContext.java | 4 +- .../generator/util/BindingRuntimeContext.java | 12 +- .../sal/binding/yang/types/BaseYangTypes.java | 8 +- .../binding/yang/types/TypeProviderImpl.java | 26 +- .../impl/AugmentRelativeXPathTest.java | 12 +- .../generator/impl/AugmentedTypeTest.java | 12 +- .../generator/impl/BaseTypeProvider.java | 8 +- .../generator/impl/BinaryTypeTest.java | 4 +- .../impl/BindingGeneratorImplTest.java | 6 +- .../impl/BitAndUnionTOEnclosingTest.java | 10 +- .../binding/generator/impl/Bug4145Test.java | 2 +- .../binding/generator/impl/Bug6135Test.java | 6 +- .../impl/ChoiceCaseGenTypesTest.java | 8 +- .../generator/impl/ControllerTest.java | 4 +- .../generator/impl/ExtendedTypedefTest.java | 8 +- .../generator/impl/GenEnumResolvingTest.java | 10 +- .../generator/impl/GenTypesSubSetTest.java | 4 +- ...InnerClassForBitsAndUnionInLeavesTest.java | 10 +- .../impl/GeneratedTypesBitsTest.java | 14 +- .../impl/GeneratedTypesLeafrefTest.java | 12 +- .../impl/GeneratedTypesStringTest.java | 10 +- .../generator/impl/GeneratedTypesTest.java | 12 +- .../generator/impl/IdentityrefTypeTest.java | 10 +- .../generator/impl/SupportTestUtil.java | 12 +- .../generator/impl/UnionTypeDefTest.java | 4 +- .../sal/binding/generator/impl/UsesTest.java | 8 +- .../binding/yang/types/BaseYangTypesTest.java | 4 +- .../yang/types/TypeProviderImplTest.java | 2 +- .../binding/yang/types/TypeProviderTest.java | 206 ++++++++-------- .../mdsal/binding/generator/util/Types.java | 12 +- .../generator/util/AbstractBaseType.java | 2 +- .../generator/util/BindingGeneratorUtil.java | 14 +- .../binding/generator/util/BindingTypes.java | 7 +- .../binding/generator/util/Types.java | 24 +- .../type/builder/AbstractGeneratedType.java | 27 +-- .../builder/AbstractGeneratedTypeBuilder.java | 20 +- .../type/builder/AbstractTypeMember.java | 8 +- .../builder/AbstractTypeMemberBuilder.java | 10 +- .../builder/AnnotationTypeBuilderImpl.java | 4 +- .../generated/type/builder/ConstantImpl.java | 4 +- .../type/builder/EnumerationBuilderImpl.java | 20 +- .../builder/GeneratedPropertyBuilderImpl.java | 9 +- .../type/builder/GeneratedPropertyImpl.java | 9 +- .../type/builder/GeneratedTOBuilderImpl.java | 16 +- .../builder/GeneratedTypeBuilderImpl.java | 4 +- .../type/builder/MethodParameterImpl.java | 4 +- .../builder/MethodSignatureBuilderImpl.java | 8 +- .../type/builder/MethodSignatureImpl.java | 8 +- .../api/generator/AbstractRangeGenerator.java | 4 +- .../AlphabeticallyTypeMemberComparator.java | 2 +- .../sal/java/api/generator/BaseTemplate.xtend | 18 +- .../java/api/generator/BuilderGenerator.java | 8 +- .../java/api/generator/BuilderTemplate.xtend | 12 +- .../java/api/generator/ClassTemplate.xtend | 16 +- .../sal/java/api/generator/EnumGenerator.java | 6 +- .../sal/java/api/generator/EnumTemplate.xtend | 4 +- .../java/api/generator/GeneratorJavaFile.java | 6 +- .../sal/java/api/generator/GeneratorUtil.java | 18 +- .../api/generator/InterfaceGenerator.java | 16 +- .../api/generator/InterfaceTemplate.xtend | 12 +- .../java/api/generator/LengthGenerator.java | 2 +- .../sal/java/api/generator/TOGenerator.java | 6 +- .../sal/java/api/generator/TypeUtils.java | 8 +- .../api/generator/UnionBuilderTemplate.xtend | 4 +- .../java/api/generator/UnionTemplate.xtend | 6 +- .../generator/YangModuleInfoTemplate.xtend | 6 +- .../api/generator/BuilderGeneratorTest.java | 9 +- .../java/api/generator/EnumGeneratorTest.java | 2 +- .../java/api/generator/GeneratorUtilTest.java | 16 +- .../api/generator/InterfaceGeneratorTest.java | 2 +- .../sal/java/api/generator/TypeUtilsTest.java | 8 +- ...AugmentToUsesInAugmentCompilationTest.java | 2 +- .../generator/test/BaseCompilationTest.java | 2 +- .../java/api/generator/test/Bug1276Test.java | 2 +- .../java/api/generator/test/Bug5151Test.java | 2 +- .../java/api/generator/test/Bug532Test.java | 2 +- .../test/CascadeUsesCompilationTest.java | 3 +- .../test/ClassCodeGeneratorTest.java | 14 +- .../api/generator/test/CompilationTest.java | 2 +- .../generator/test/EncodingInJavaDocTest.java | 3 +- .../generator/test/GeneratorJavaFileTest.java | 5 +- .../test/NestedGroupingCompilationTest.java | 3 +- .../test/TypedefCompilationTest.java | 3 +- .../test/UnionTypedefUnusedImportTest.java | 3 +- .../test/UnionWithIdentityrefTest.java | 2 +- 150 files changed, 497 insertions(+), 2432 deletions(-) delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ClassLoadingStrategy.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ModuleInfoRegistry.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/BaseTypeWithRestrictions.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/DocumentedType.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Restrictions.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java delete mode 100644 binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java diff --git a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java index d6077e9514..20794bea2d 100644 --- a/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java +++ b/binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java @@ -25,10 +25,10 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; import org.apache.maven.project.MavenProject; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.sal.java.api.generator.YangModuleInfoTemplate; import org.opendaylight.yangtools.yang.binding.BindingMapping; 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 e41c4f8594..2ec1d4848c 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 @@ -21,13 +21,13 @@ import javassist.CtField; import javassist.CtMethod; import javassist.Modifier; import javassist.NotFoundException; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.binding.data.codec.gen.spi.StaticConstantDefinition; import org.opendaylight.yangtools.binding.data.codec.util.AugmentableDispatchSerializer; import org.opendaylight.yangtools.binding.generator.util.Types; import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext; import org.opendaylight.yangtools.sal.binding.generator.util.ClassCustomizer; import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.util.ClassLoaderUtils; import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter; import org.opendaylight.yangtools.yang.binding.DataContainer; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AugmentableDataNodeContainerEmitterSource.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AugmentableDataNodeContainerEmitterSource.java index 7614e77632..4d81394683 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AugmentableDataNodeContainerEmitterSource.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/AugmentableDataNodeContainerEmitterSource.java @@ -7,7 +7,7 @@ */ package org.opendaylight.yangtools.binding.data.codec.gen.impl; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.binding.DataObjectSerializerImplementation; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataNodeContainerSerializerSource.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataNodeContainerSerializerSource.java index 791fe7e541..52ba9c9bbf 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataNodeContainerSerializerSource.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataNodeContainerSerializerSource.java @@ -11,11 +11,11 @@ package org.opendaylight.yangtools.binding.data.codec.gen.impl; import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.Map; +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.yangtools.binding.data.codec.util.ChoiceDispatchSerializer; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.binding.BindingSerializer; import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerSource.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerSource.java index 54df9d80a9..20f65f50ac 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerSource.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/DataObjectSerializerSource.java @@ -8,10 +8,10 @@ package org.opendaylight.yangtools.binding.data.codec.gen.impl; import com.google.common.base.Preconditions; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.data.codec.gen.spi.AbstractSource; -import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java index 46c6ab2580..01328127df 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/impl/StreamWriterGenerator.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.binding.data.codec.gen.impl; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.binding.data.codec.util.AugmentableDispatchSerializer; import org.opendaylight.yangtools.binding.data.codec.util.ChoiceDispatchSerializer; import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.DataObjectSerializerImplementation; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/spi/AbstractSource.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/spi/AbstractSource.java index 4d19b4ea70..131997e990 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/spi/AbstractSource.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/gen/spi/AbstractSource.java @@ -13,8 +13,7 @@ import com.google.common.collect.UnmodifiableIterator; import java.util.Collections; import java.util.HashSet; import java.util.Set; - -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; public abstract class AbstractSource { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java index 31d3375336..78a957979c 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingCodecContext.java @@ -24,11 +24,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeNode; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.binding.data.codec.impl.NodeCodecContext.CodecContextFactory; import org.opendaylight.yangtools.concepts.Codec; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.util.ClassLoaderUtils; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataObjectCodecContext.java index 6d8d85590f..d635e28983 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataObjectCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/DataObjectCodecContext.java @@ -30,8 +30,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.AugmentationHolder; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingClassInLoadingStrategyException.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingClassInLoadingStrategyException.java index aca197e475..f844a4849b 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingClassInLoadingStrategyException.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/MissingClassInLoadingStrategyException.java @@ -7,7 +7,7 @@ */ package org.opendaylight.yangtools.binding.data.codec.impl; -import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; /** * diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java index 7a4b7c255f..ebc168ccc4 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/BindingGenerator.java @@ -9,14 +9,12 @@ package org.opendaylight.mdsal.binding.generator.api; import java.util.List; import java.util.Set; - import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * Transform Schema Context to Generated types. - * */ public interface BindingGenerator { diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java index 926bbeca67..92b9970d08 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/api/ClassLoadingStrategy.java @@ -14,5 +14,4 @@ public interface ClassLoadingStrategy { Class loadClass(Type type) throws ClassNotFoundException; Class loadClass(String fullyQualifiedName) throws ClassNotFoundException; - } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/spi/TypeProvider.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/spi/TypeProvider.java index e30ba58ee5..24f11cef0f 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/spi/TypeProvider.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/generator/spi/TypeProvider.java @@ -15,6 +15,9 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public interface TypeProvider { + @Deprecated + Type javaTypeForYangType(String type); + /** * Resolve of yang Type Definition to it's java counter part. * If the Type Definition contains one of yang primitive types the method @@ -46,5 +49,4 @@ public interface TypeProvider { String getConstructorPropertyName(SchemaNode node); String getParamNameFromType(TypeDefinition type); - } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java index 7ee3078a52..be3cf27421 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java @@ -12,8 +12,5 @@ package org.opendaylight.mdsal.binding.model.api; * in Java programming language (Default, Private, Protected, Public). */ public enum AccessModifier { - DEFAULT, - PRIVATE, - PUBLIC, - PROTECTED + DEFAULT, PRIVATE, PUBLIC, PROTECTED } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java index 7703616e94..3e1923f266 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java @@ -7,10 +7,8 @@ */ package org.opendaylight.mdsal.binding.model.api; -import org.opendaylight.yangtools.sal.binding.model.api.Type; - /** - * Transformas data to concrete code in a programming language. + * Transformates virtual data to the concrete code in programming language. */ public interface CodeGenerator { diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java index fafb72be79..df76cfff6e 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.model.api; import java.util.List; - import org.opendaylight.yangtools.yang.model.api.DocumentedNode; /** diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferIdentityObject.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferIdentityObject.java index 780a4207dd..41d510f836 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferIdentityObject.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferIdentityObject.java @@ -7,6 +7,7 @@ */ package org.opendaylight.mdsal.binding.model.api; -public interface GeneratedTransferIdentityObject extends GeneratedTransferObject { +public interface GeneratedTransferIdentityObject extends + GeneratedTransferObject { } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java index 342d818be5..264447ab0a 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java @@ -21,7 +21,6 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; * definitions. For this purpose retrieve definitions through * {@link #getEqualsIdentifiers ()}, {@link #getHashCodeIdentifiers()} and * {@link #getToStringIdentifiers ()}. - * */ public interface GeneratedTransferObject extends GeneratedType { diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java index aece6ab83e..7673934aff 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.model.api; import java.util.List; - import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; @@ -16,11 +15,8 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; public interface Restrictions { List getLengthConstraints(); - List getPatternConstraints(); - List getRangeConstraints(); - boolean isEmpty(); } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java index c9db863c84..6f5c0cb312 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java @@ -12,7 +12,6 @@ package org.opendaylight.mdsal.binding.model.api; * Type defined in java MUST contain name and package name, except of primitive * types like int, byte etc. In case of mapping of primitive type the package * name MUST be left as empty string. - * */ public interface Type { /** diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java index d9396fedaf..ad95a5a215 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java @@ -11,7 +11,6 @@ package org.opendaylight.mdsal.binding.model.api; * * Marker interface which assign to object property that it is bounded wildcard * type. - * */ public interface WildcardType extends Type { diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java index 35b6ad9fa1..75ace89bf8 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.model.api.type.builder; import java.util.List; - import org.opendaylight.mdsal.binding.model.api.AnnotationType; import org.opendaylight.mdsal.binding.model.api.Type; diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java index 52af4456eb..0e955dfd2d 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java @@ -12,7 +12,7 @@ import org.opendaylight.mdsal.binding.model.api.Type; public interface ConstantBuilder { - void assignValue(Object value); + void assignValue(final Object value); Constant toInstance(Type definingType); } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java index 2ab39ebf40..bf12720289 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java @@ -8,7 +8,6 @@ package org.opendaylight.mdsal.binding.model.api.type.builder; import java.util.List; - import org.opendaylight.mdsal.binding.model.api.Constant; import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.common.QName; diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java index c1f218351c..32542ad2b7 100644 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java +++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java @@ -25,7 +25,7 @@ public interface TypeMemberBuilder> { * Name of Annotation Type * @return new instance of Annotation Type Builder. */ - AnnotationTypeBuilder addAnnotation(String packageName, String name); + AnnotationTypeBuilder addAnnotation(final String packageName, final String name); /** * Returns the name of property. @@ -42,7 +42,7 @@ public interface TypeMemberBuilder> { * @param returnType * Return Type of property. */ - T setReturnType(Type returnType); + T setReturnType(final Type returnType); AccessModifier getAccessModifier(); @@ -52,7 +52,7 @@ public interface TypeMemberBuilder> { * @param modifier * Access Modifier value. */ - T setAccessModifier(AccessModifier modifier); + T setAccessModifier(final AccessModifier modifier); /** * Adds String definition of comment into Method Signature definition.
@@ -62,7 +62,7 @@ public interface TypeMemberBuilder> { * @param comment * Comment String. */ - T setComment(String comment); + T setComment(final String comment); /** * Sets the flag final for method signature. If this is set the method will @@ -73,7 +73,7 @@ public interface TypeMemberBuilder> { * @param isFinal * Is Final */ - T setFinal(boolean isFinal); + T setFinal(final boolean isFinal); - T setStatic(boolean isStatic); + T setStatic(final boolean isStatic); } diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java deleted file mode 100644 index 3995b947cd..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.api; - -import java.util.List; -import java.util.Set; - -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -/** - * Transform Schema Context to Generated types. - * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.api.BindingGenerator} instead. - */ -@Deprecated -public interface BindingGenerator { - - /** - * Generate Types from whole Schema Context.
- * The method will return List of All Generated Types that could be - * Generated from Schema Context. - * - * - * @param context - * Schema Context - * @return List of Generated Types - * - * @see SchemaContext - */ - List generateTypes(final SchemaContext context); - - /** - * Generate Types from Schema Context restricted by sub set of specified - * Modules. The Schema Context MUST contain all of the sub modules otherwise - * the there is no guarantee that result List of Generated Types will - * contain correct Generated Types. - * - * @param context - * Schema Context - * @param modules - * Sub Set of Modules - * @return List of Generated Types restricted by sub set of Modules - * - * @see Module - * @see SchemaContext - * - */ - List generateTypes(final SchemaContext context, final Set modules); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ClassLoadingStrategy.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ClassLoadingStrategy.java deleted file mode 100644 index 01285130a2..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ClassLoadingStrategy.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.api; - -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy} instead. - */ -@Deprecated -public interface ClassLoadingStrategy { - - Class loadClass(Type type) throws ClassNotFoundException; - - Class loadClass(String fullyQualifiedName) throws ClassNotFoundException; -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ModuleInfoRegistry.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ModuleInfoRegistry.java deleted file mode 100644 index 8a1f9cb6fd..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/ModuleInfoRegistry.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.yangtools.sal.binding.generator.api; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.api.ModuleInfoRegistry} instead. - */ -@Deprecated -public interface ModuleInfoRegistry extends org.opendaylight.mdsal.binding.generator.api.ModuleInfoRegistry { - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java deleted file mode 100644 index 13b729648e..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.api; \ No newline at end of file diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java deleted file mode 100644 index 73e6ecd2a4..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.spi; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.spi.BindingGeneratorServiceProvider} instead. - */ -@Deprecated -public interface BindingGeneratorServiceProvider { - - void registerTypeProvider(final TypeProvider provider); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java deleted file mode 100644 index 87c4640ffa..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.spi; - -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.spi.TypeProvider} instead. - */ -@Deprecated -public interface TypeProvider { - - @Deprecated - Type javaTypeForYangType(String type); - - /** - * Resolve of yang Type Definition to it's java counter part. - * If the Type Definition contains one of yang primitive types the method - * will return java.lang. counterpart. (For example if yang type is int32 - * the java counterpart is java.lang.Integer). In case that Type - * Definition contains extended type defined via yang typedef statement - * the method SHOULD return Generated Type or Generated Transfer Object - * if that Type is correctly referenced to resolved imported yang module. - * The method will return null value in situations that - * TypeDefinition can't be resolved (either due missing yang import or - * incorrectly specified type). - * - * - * @param type Type Definition to resolve from - * @return Resolved Type - */ - Type javaTypeForSchemaDefinitionType(final TypeDefinition type, final SchemaNode parentNode); - - Type javaTypeForSchemaDefinitionType(final TypeDefinition type, final SchemaNode parentNode, final Restrictions restrictions); - - /** - * Returns string containing code for creation of new type instance. - * - * @param node - * @return - */ - String getTypeDefaultConstruction(LeafSchemaNode node); - - String getConstructorPropertyName(SchemaNode node); - - String getParamNameFromType(TypeDefinition type); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java deleted file mode 100644 index 55b41067f9..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.spi; - -import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.spi.TypeProviderFactory} instead. - */ -@Deprecated -//FIXME not implemented anywhere -public interface TypeProviderFactory { - - TypeProvider providerFor(ModuleIdentifier module); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java deleted file mode 100644 index 65b4db26c4..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.generator.spi; \ No newline at end of file diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java deleted file mode 100644 index ddc819032f..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * Enum definition which provides four access modifiers that are described - * in Java programming language (Default, Private, Protected, Public). - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.AccessModifier} instead. - */ -@Deprecated -public enum AccessModifier { - DEFAULT, PRIVATE, PUBLIC, PROTECTED -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java deleted file mode 100644 index 94e139c991..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; - -/** - * The Annotation Type interface is designed to hold information about - * annotation for any type that could be annotated in Java.
- * For sake of simplicity the Annotation Type is not designed to model exact - * behaviour of annotation mechanism, but just to hold information needed to - * model annotation over java Type definition. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.AnnotationType} instead. - */ -@Deprecated -public interface AnnotationType extends Type { - - /** - * Returns the List of Annotations.
- * Each Annotation Type MAY have defined multiple Annotations. - * - * @return the List of Annotations. - */ - List getAnnotations(); - - /** - * Returns Parameter Definition assigned for given parameter name.
- * If Annotation does not contain parameter with specified param name, the - * method MAY return null value. - * - * @param paramName - * Parameter Name - * @return Parameter Definition assigned for given parameter name. - */ - Parameter getParameter(final String paramName); - - /** - * Returns List of all parameters assigned to Annotation Type. - * - * @return List of all parameters assigned to Annotation Type. - */ - List getParameters(); - - /** - * Returns List of parameter names. - * - * @return List of parameter names. - */ - List getParameterNames(); - - /** - * Returns true if annotation contains parameters. - * - * @return true if annotation contains parameters. - */ - boolean containsParameters(); - - /** - * Annotation Type parameter interface. For simplicity the Parameter - * contains values and value types as Strings. Every annotation which - * contains parameters could contain either single parameter or array of - * parameters. To model this purposes the by contract if the parameter - * contains single parameter the {@link #getValues()} method will return - * empty List and {@link #getValue()} MUST always return non- - * null parameter. If the Parameter holds List of values the - * singular {@link #getValue()} parameter MAY return null - * value. - */ - interface Parameter { - - /** - * Returns the Name of the parameter. - * - * @return the Name of the parameter. - */ - String getName(); - - /** - * Returns value in String format if Parameter contains singular value, - * otherwise MAY return null. - * - * @return value in String format if Parameter contains singular value. - */ - String getValue(); - - /** - * Returns List of Parameter assigned values in order in which they were - * assigned for given parameter name.
- * If there are multiple values assigned for given parameter name the - * method MUST NOT return empty List. - * - * @return List of Parameter assigned values in order in which they were - * assigned for given parameter name. - */ - List getValues(); - } -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/BaseTypeWithRestrictions.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/BaseTypeWithRestrictions.java deleted file mode 100644 index e855018d7e..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/BaseTypeWithRestrictions.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * The BaseTypeWithRestrictions is marker interface that encapsulates definition of java - * concrete type only with changed restriction values. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.BaseTypeWithRestrictions} instead. - */ -@Deprecated -public interface BaseTypeWithRestrictions extends ConcreteType { - -} \ No newline at end of file diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java deleted file mode 100644 index e7c08f23d2..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * Transformates virtual data to the concrete code in programming language. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.CodeGenerator} instead. - */ -@Deprecated -public interface CodeGenerator { - - /** - * Generates code for type. - * - * @param type - * Input type to be processed - * @return generated JAVA code - */ - String generate(Type type); - - /** - * Checks if the concrete instance of type fit to concrete - * implementation of this interface. - * - * (e. g. method return true if in EnumGenerator (which - * implements this interface) has input parameter of type Enumeration (which - * is subtype of Type) - * - * @param type - * Input type to be processed - * @return true if type is acceptable for processing. - */ - boolean isAcceptable(Type type); - - /** - * Returns name of type parameter. - * - * @param type - * Input type to be processed - * @return name of generated unit - */ - String getUnitName(Type type); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java deleted file mode 100644 index b41b5bd37d..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * The Concrete Type is marker interface that encapsulates definition of java - * concrete type. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.ConcreteType} instead. - */ -@Deprecated -public interface ConcreteType extends Type { - - Restrictions getRestrictions(); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java deleted file mode 100644 index 5f9905c11f..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * Interface Contact is designed to hold and model java constant. In Java there - * are no constant keywords instead of the constant is defined as static final - * field with assigned value. For this purpose the Constant interface contains - * methods {@link #getType()} to provide wrapped return Type of Constant, - * {@link #getName()} the Name of constant and the {@link #getValue()} for - * providing of value assigned to Constant. To determine of which type the - * constant value is it is recommended firstly to retrieve Type from constant. - * The Type interface holds base information like java package name and java - * type name (e.g. fully qualified name). From this string user should be able - * to determine to which type can be {@link #getValue()} type typecasted to - * unbox and provide value assigned to constant. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.Constant} instead. - */ -@Deprecated -public interface Constant { - - /** - * Returns the Type that declares constant. - * - * @return the Type that declares constant. - */ - Type getDefiningType(); - - /** - * Returns the return Type (or just Type) of the Constant. - * - * @return the return Type (or just Type) of the Constant. - */ - Type getType(); - - /** - * Returns the name of constant.
- * By conventions the name SHOULD be in CAPITALS separated with underscores. - * - * @return the name of constant. - */ - String getName(); - - /** - * Returns boxed value that is assigned for context. - * - * @return boxed value that is assigned for context. - */ - Object getValue(); - - /** - * Returns Constant definition in formatted string.
- *
- * The expected string SHOULD be in format: public final - * static [Type] CONSTANT_NAME = [value]; - * - * @return Constant definition in formatted string. - */ - String toFormattedString(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/DocumentedType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/DocumentedType.java deleted file mode 100644 index 8530775440..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/DocumentedType.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import org.opendaylight.yangtools.yang.common.QName; - -/** - * Implementing this interface allows an object to hold information which are - * essential for generating java doc from type definition. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.DocumentedType} instead. - */ -@Deprecated -public interface DocumentedType { - - /** - * Returns a string that contains a human-readable textual description of - * type definition. - * - * @return a human-readable textual description of type definition. - */ - String getDescription(); - - /** - * Returns a string that is used to specify a textual cross-reference to an - * external document, either another module that defines related management - * information, or a document that provides additional information relevant - * to this definition. - * - * @return a textual cross-reference to an external document. - */ - String getReference(); - - /** - * Returns a list of QNames which represent schema path in schema tree from - * actual concrete type to the root. - * - * @return a schema path in schema tree from actual concrete schema node - * identifier to the root. - */ - Iterable getSchemaPath(); - - /** - * Returns the name of the module, in which generated type was specified. - * - * @return the name of the module, in which generated type was specified. - */ - String getModuleName(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java deleted file mode 100644 index 3cef2a2f4b..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; - -import org.opendaylight.yangtools.yang.model.api.DocumentedNode; - -/** - * Interface provide methods for reading data of enumeration class. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.Enumeration} instead. - */ -@Deprecated -public interface Enumeration extends GeneratedType { - - /** - * - * Returns list of annotation definitions associated with enumeration type. - * - * @return list of annotation definitions associated with enumeration type. - * - */ - @Override - List getAnnotations(); - - @Override - Type getParentType(); - - /** - * Returns list of the couples - name and value. - * - * @return list of the enumeration pairs. - */ - List getValues(); - - /** - * Formats enumeration according to rules of the programming language. - * - * @return string with source code in some programming language - */ - String toFormattedString(); - - /** - * Interface is used for reading enumeration item. It means item's name and - * its value. - */ - interface Pair extends DocumentedNode.WithStatus { - - /** - * Returns the name of the enumeration item as it is specified in the input yang. - * - * @return the name of the enumeration item as it is specified in the input yang. - */ - String getName(); - - /** - * Returns the binding representation for the name of the enumeration item. - * - * @return the binding representation for the name of the enumeration item. - */ - String getMappedName(); - - /** - * Returns value of the enumeration item. - * - * @return the value of the enumeration item. - */ - int getValue(); - } -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java deleted file mode 100644 index b18c40bdac..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * Generated Property extends interface {@link MethodSignature} interface.
- * The Generated Property interface is designed to store information of fields - * (or members) declared in Java Transfer Objects (or any java classes) and - * their access counterparts (getters and setters). - * - * @see MethodSignature - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.GeneratedProperty} instead. - */ -@Deprecated -public interface GeneratedProperty extends TypeMember { - - String getValue(); - - /** - * Returns true if the property si declared as read-only.
- * If the property has flag isReadOnly == true the property - * SHOULD be generated as getter only. - * - * @return true if the property si declared as read-only. - */ - boolean isReadOnly(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java deleted file mode 100644 index f8973cc587..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.GeneratedTransferIdentityObject} instead. - */ -@Deprecated -public interface GeneratedTransferIdentityObject extends - GeneratedTransferObject { - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java deleted file mode 100644 index 223a4312aa..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; - -/** - * Generated Transfer Object extends {@link GeneratedType} and is designed to - * represent Java Class. The Generated Transfer Object contains declarations of - * member fields stored in List of Properties. The Generated Transfer Object can - * be extended by exactly ONE Generated Transfer Object as Java don't allow - * multiple inheritance. For retrieval of implementing Generated Types use - * {@link #getImplements()} method.
- * Every transfer object SHOULD contain equals, hashCode and toString - * definitions. For this purpose retrieve definitions through - * {@link #getEqualsIdentifiers ()}, {@link #getHashCodeIdentifiers()} and - * {@link #getToStringIdentifiers ()}. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject} instead. - */ -@Deprecated -public interface GeneratedTransferObject extends GeneratedType { - - GeneratedProperty getSUID(); - - /** - * Returns the Generated Transfer Object from which this GTO is derived, or - * null if this GTO is not derived from a GTO -- e.g. it is either an union - * or it is derived from a concrete type. - * - * @return Generated Transfer Object or null if this GTO is - * not derived from another GTO. - */ - GeneratedTransferObject getSuperType(); - - /** - * Returns List of Properties that are designated to define equality for - * Generated Transfer Object. - * - * @return List of Properties that are designated to define equality for - * Generated Transfer Object. - */ - List getEqualsIdentifiers(); - - /** - * Returns List of Properties that are designated to define identity for - * Generated Transfer Object. - * - * @return List of Properties that are designated to define identity for - * Generated Transfer Object. - */ - List getHashCodeIdentifiers(); - - /** - * Returns List of Properties that will be members of toString definition - * for Generated Transfer Object. - * - * @return List of Properties that will be members of toString definition - * for Generated Transfer Object. - */ - List getToStringIdentifiers(); - - boolean isTypedef(); - - /** - * Returns Base type of Java representation of YANG typedef if set, otherwise it returns null - * - * @return Base type of Java representation of YANG typedef if set, otherwise it returns null - */ - TypeDefinition getBaseType(); - - /** - * Return boolean value which describe whether Generated Transfer Object - * was/wasn't created from union YANG type. - * - * @return true value if Generated Transfer Object was created from union - * YANG type. - */ - boolean isUnionType(); - - boolean isUnionTypeBuilder(); - - Restrictions getRestrictions(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java deleted file mode 100644 index d1d8ac0957..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; - -/** - * Every Java interface has to be specified with: - *
    - *
  • package that belongs into
    • - *
  • interface name (with commentary that SHOULD be - * present to proper define interface and base contracts specified for - * interface)
    • - *
  • Each Generated Type can define list of types that Generated Type can - * implement to extend it's definition (i.e. interface extends list of - * interfaces or java class implements list of interfaces)
    • - *
  • Each Generated Type can contain multiple enclosed definitions of - * Generated Types (i.e. interface can contain N enclosed interface definitions - * or enclosed classes)
    • - *
  • enum and constant definitions (i.e. each - * constant definition is by default defined as public static final - * + type (either primitive or object) and constant name
    • - *
  • method definitions with specified input parameters (with - * types) and return values
    • - *
- * - * By the definition of the interface constant, enum, enclosed types and method - * definitions MUST be public, so there is no need to specify the scope of - * visibility. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.GeneratedType} instead. - */ -@Deprecated -public interface GeneratedType extends Type, DocumentedType { - - /** - * Returns the parent type if Generated Type is defined as enclosing type, - * otherwise returns null - * - * @return the parent type if Generated Type is defined as enclosing type, - * otherwise returns null - */ - Type getParentType(); - - /** - * Returns comment string associated with Generated Type. - * - * @return comment string associated with Generated Type. - */ - String getComment(); - - /** - * Returns List of annotation definitions associated with generated type. - * - * @return List of annotation definitions associated with generated type. - */ - List getAnnotations(); - - /** - * Returns true if The Generated Type is defined as abstract. - * - * @return true if The Generated Type is defined as abstract. - */ - boolean isAbstract(); - - /** - * Returns List of Types that Generated Type will implement. - * - * @return List of Types that Generated Type will implement. - */ - List getImplements(); - - /** - * Returns List of enclosing Generated Types. - * - * @return List of enclosing Generated Types. - */ - List getEnclosedTypes(); - - /** - * Returns List of all Enumerator definitions associated with Generated - * Type. - * - * @return List of all Enumerator definitions associated with Generated - * Type. - */ - List getEnumerations(); - - /** - * Returns List of Constant definitions associated with Generated Type. - * - * @return List of Constant definitions associated with Generated Type. - */ - List getConstantDefinitions(); - - /** - * Returns List of Method Definitions associated with Generated Type. - * - * List does not contains getters and setters for properties. - * - * @return List of Method Definitions associated with Generated Type. - */ - List getMethodDefinitions(); - - /** - * Returns List of Properties that are declared for Generated Transfer - * Object. - * - * @return List of Properties that are declared for Generated Transfer - * Object. - */ - List getProperties(); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java deleted file mode 100644 index c7f61e784b..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; - -/** - * The Method Signature interface contains simplified meta model for java method - * definition. Each method MUST be defined by name, return type, parameters and - * access modifier.
- * Additionally method MAY contain associated annotations and comment. By - * contract if method does not contain any comments or annotation definitions - * the {@link #getComment()} SHOULD rather return empty string and - * {@link #getAnnotations()} SHOULD rather return empty list than - * null values.
- * The defining Type contains the reference to Generated Type that declares - * Method Signature. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.MethodSignature} instead. - */ -@Deprecated -public interface MethodSignature extends TypeMember { - - /** - * Returns true if the method signature is defined as abstract.
- * By default in java all method declarations in interface are defined as - * abstract, but the user don't need necessary to declare abstract keyword - * in front of each method.
- * The abstract methods are allowed in Class definitions but only when the - * class is declared as abstract. - * - * @return true if the method signature is defined as abstract. - */ - boolean isAbstract(); - - /** - * Returns the List of parameters that method declare. If the method does - * not contain any parameters, the method will return empty List. - * - * @return the List of parameters that method declare. - */ - List getParameters(); - - /** - * The Parameter interface is designed to hold the information of method - * Parameter(s). The parameter is defined by his Name which MUST be unique - * as java does not allow multiple parameters with same names for one method - * and Type that is associated with parameter. - */ - interface Parameter { - - /** - * Returns the parameter name. - * - * @return the parameter name. - */ - String getName(); - - /** - * Returns Type that is bounded to parameter name. - * - * @return Type that is bounded to parameter name. - */ - Type getType(); - } -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java deleted file mode 100644 index 0e797a562c..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * Represents an instance of simple parametrized type such as List<String>. - * - * The parametrized Type is designed to be used to store information of Java - * Generic Type. The array of {@link #getActualTypeArguments()} holds - * information of all generic parameters defined for Parameterized Type. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType} instead. - */ -@Deprecated -public interface ParameterizedType extends Type { - - /** - * Returns array of Types that are defined for Parameterized Type. - *
- * (for example if ParameterizedType encapsulates java generic Map that - * specifies two parameters Map<K,V> and the K is java.lang.Integer and V - * is defined as GeneratedType the array will contain two Types to store - * the information of generic parameters.) - * - * @return array of Types that are defined for Parameterized Type. - */ - Type[] getActualTypeArguments(); - - /** - * Returns the Raw Type definition of Parameterized Type. - * - * @return the Raw Type definition of Parameterized Type. - */ - Type getRawType(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Restrictions.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Restrictions.java deleted file mode 100644 index fee396941a..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Restrictions.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; - -import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; -import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; -import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; - -/** - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.Restrictions} instead. - */ -@Deprecated -public interface Restrictions { - - List getLengthConstraints(); - List getPatternConstraints(); - List getRangeConstraints(); - boolean isEmpty(); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java deleted file mode 100644 index 02355c6867..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * The Type interface defines the base type for all types defined in java. Each - * Type defined in java MUST contain name and package name, except of primitive - * types like int, byte etc. In case of mapping of primitive type the package - * name MUST be left as empty string. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.Type} instead. - */ -@Deprecated -public interface Type { - /** - * Returns name of the package that interface belongs to. - * - * @return name of the package that interface belongs to - */ - String getPackageName(); - - /** - * Returns name of the interface. - * - * @return name of the interface. - */ - String getName(); - - /** - * Returns fully qualified name of Type.
- * The fully qualified name of Type MUST be returned in following format: - *
    - *
  • If does not contains package name: [type name] (e.g. int, byte, - * byte[],...)
    • - *
  • If Type contains package name: [package name].[type name] (e.g - * java.lang.Byte, org.opendaylight.controller.gen.GenType)
    • - *
- * - * @return fully qualified name of Type. - */ - String getFullyQualifiedName(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java deleted file mode 100644 index 89d33e3f72..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -import java.util.List; - -/** - * Common interface for variables and methods in class. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.TypeMember} instead. - */ -@Deprecated -public interface TypeMember { - - /** - * Returns comment string associated with member. - * - * @return comment string associated with member. - */ - String getComment(); - - /** - * Returns List of annotation definitions associated with generated type. - * - * @return List of annotation definitions associated with generated type. - */ - List getAnnotations(); - - /** - * Returns the access modifier of member. - * - * @return the access modifier of member. - */ - AccessModifier getAccessModifier(); - - /** - * Returns true if member is declared as static. - * - * @return true if member is declared as static. - */ - boolean isStatic(); - - /** - * Returns true if member is declared as final. - * - * @return true if member is declared as final. - */ - boolean isFinal(); - - /** - * Get the returning Type of member. - * - * @return the returning Type of member. - */ - Type getReturnType(); - - /** - * Returns the name of member. - * - * @return the name of member. - */ - String getName(); - - /** - * Returns the Type that declares member. - * - * @return the Type that declares member. - */ - Type getDefiningType(); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java deleted file mode 100644 index b7d8946c8d..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; - -/** - * - * Marker interface which assign to object property that it is bounded wildcard - * type. - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.WildcardType} instead. - */ -@Deprecated -public interface WildcardType extends Type { - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java deleted file mode 100644 index 64d4119dbc..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api; \ No newline at end of file diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java deleted file mode 100644 index 5262d73148..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import java.util.List; - -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -/** - * Annotation Type Builder Interface serves for creation and instantiation of - * immutable copy of Annotation Type. The Annotation Type Builder extends from - * {@link Type} interface. The Annotation Type contains set of methods which are - * capable to provide information about other Annotation Types and Annotation - * Parameters. - * - * @see AnnotationType - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder} instead. - */ -@Deprecated -public interface AnnotationTypeBuilder extends Type { - - /** - * The method creates new AnnotationTypeBuilder containing specified package - * name an annotation name.
- * Neither the package name or annotation name can contain null - * references. In case that any of parameters contains null the - * method SHOULD thrown {@link IllegalArgumentException} - * - * @param packageName - * Package Name of Annotation Type - * @param name - * Name of Annotation Type - * @return new instance of Annotation Type Builder. - */ - AnnotationTypeBuilder addAnnotation(final String packageName, final String name); - - /** - * Adds the parameter into List of parameters for Annotation Type.
- * If there is already stored parameter with the same name as the new - * parameter, the value of the old one will be simply overwritten by the - * newer parameter.
- * Neither the param name or value can contain null references. - * In case that any of parameters contains null the method - * SHOULD thrown {@link IllegalArgumentException} - * - * @param paramName - * Parameter Name - * @param value - * Parameter Value - * @return true if the parameter has been successfully assigned - * for Annotation Type - */ - boolean addParameter(final String paramName, String value); - - /** - * Adds the parameter with specified List of parameter values into List of - * parameters for Annotation Type.
- * If there is already stored parameter with the same name as the new - * parameter, the value of the old one will be simply overwritten by the - * newer parameter.
- * Neither the param name or value can contain null references. - * In case that any of parameters contains null the method - * SHOULD thrown {@link IllegalArgumentException} - * - * @param paramName - * Parameter Name - * @param values - * List of Values bounded to Parameter Name - * @return true if the parameter has been successfully assigned - * for Annotation Type - */ - boolean addParameters(final String paramName, List values); - - /** - * Returns new immutable instance of Annotation Type - * with values assigned in current instance of Annotation Type Builder.
- * The return Annotation Type instance is immutable thus no additional - * modification to Annotation Type Builder will have an impact to - * instantiated Annotation Type.
- * For this purpose call this method after all additions are complete. - * - * @return new immutable instance of Annotation Type. - */ - AnnotationType toInstance(); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java deleted file mode 100644 index 52866fdfad..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -/** - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.ConstantBuilder} instead. - */ -@Deprecated -public interface ConstantBuilder { - - void assignValue(final Object value); - - Constant toInstance(Type definingType); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java deleted file mode 100644 index 29849cdba9..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; - -/** - * Enum Builder is interface that contains methods to build and instantiate - * Enumeration definition. - * - * @see Enumeration - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder} instead. - */ -@Deprecated -public interface EnumBuilder extends Type { - - /** - * The method creates new AnnotationTypeBuilder containing specified package - * name an annotation name.
- * Neither the package name or annotation name can contain null - * references. In case that any of parameters contains null the - * method SHOULD thrown {@link IllegalArgumentException} - * - * @param packageName - * Package Name of Annotation Type - * @param name - * Name of Annotation Type - * @return new instance of Annotation Type Builder. - */ - AnnotationTypeBuilder addAnnotation(final String packageName, final String name); - - /** - * - * @param name - * @param value - */ - void addValue(final String name, final int value, final String description); - - /** - * - * @param definingType - * @return - */ - Enumeration toInstance(final Type definingType); - - /** - * Updates this builder with data from enumTypeDef. - * Specifically this data represents list of value-name pairs. - * - * @param enumTypeDef - * enum type definition as source of enum data for - * enumBuilder - */ - void updateEnumPairsFromEnumTypeDef(final EnumTypeDefinition enumTypeDef); - - /** - * @param description - */ - void setDescription(final String description); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java deleted file mode 100644 index 746e8f9927..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -/** - * Generated Property Builder is interface that contains methods to build and - * instantiate Generated Property definition. - * - * @see GeneratedProperty - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder} instead. - */ -@Deprecated -public interface GeneratedPropertyBuilder extends TypeMemberBuilder { - - GeneratedPropertyBuilder setValue(String value); - - /** - * Sets isReadOnly flag for property. If property is marked as read only it - * is the same as set property in java as final. - * - * @param isReadOnly - * Read Only property flag. - */ - GeneratedPropertyBuilder setReadOnly(final boolean isReadOnly); - - /** - * Returns new immutable instance of Generated Property.
- * The definingType param cannot be null. The - * every member in Java MUST be declared and defined inside the scope of - * class definition. In case that defining Type will be passed - * as null reference the method SHOULD thrown - * {@link IllegalArgumentException}. - * - * @param definingType - * Defining Type of Generated Property - * @return new immutable instance of Generated Property. - */ - GeneratedProperty toInstance(final Type definingType); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java deleted file mode 100644 index 33f7d4f6ba..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; - -/** - * Generated Transfer Object Builder is interface that contains methods to build - * and instantiate Generated Transfer Object definition. - * - * @see GeneratedTransferObject - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder} instead. - */ -@Deprecated -public interface GeneratedTOBuilder extends GeneratedTypeBuilderBase { - - /** - * Add Generated Transfer Object from which will be extended current - * Generated Transfer Object.
- * By definition Java does not allow multiple inheritance, hence if there is - * already definition of Generated Transfer Object the extending object will - * be overwritten by lastly added Generated Transfer Object.
- * If Generated Transfer Object is null the method SHOULD throw - * {@link IllegalArgumentException} - * - * @param genTransObj - * Generated Transfer Object - * @return This instance of builder - */ - GeneratedTOBuilder setExtendsType(final GeneratedTransferObject genTransObj); - - /** - * Add Property that will be part of equals definition.
- * If Generated Property Builder is null the method SHOULD - * throw {@link IllegalArgumentException} - * - * @param property - * Generated Property Builder - * @return This instance of builder - */ - GeneratedTOBuilder addEqualsIdentity(final GeneratedPropertyBuilder property); - - /** - * Add Property that will be part of hashCode definition.
- * If Generated Property Builder is null the method SHOULD - * throw {@link IllegalArgumentException} - * - * @param property - * Generated Property Builder - * @return This instance of builder - */ - GeneratedTOBuilder addHashIdentity(final GeneratedPropertyBuilder property); - - /** - * Add Property that will be part of toString definition.
- * If Generated Property Builder is null the method SHOULD - * throw {@link IllegalArgumentException} - * - * @param property - * Generated Property Builder - * @return This instance of builder - */ - GeneratedTOBuilder addToStringProperty(final GeneratedPropertyBuilder property); - - void setRestrictions(Restrictions restrictions); - - /** - * Returns instance of GeneratedTransferObject which data are - * build from the data of this builder - * - * @return generated transfer object instance - */ - GeneratedTransferObject toInstance(); - - void setTypedef(boolean isTypedef); - - /** - * Sets the base type for Java representation of YANG typedef - * - * @param typeDef - * Type Definition - */ - void setBaseType(TypeDefinition typeDef); - - /** - * - * @param isUnion - */ - void setIsUnion(boolean isUnion); - - void setIsUnionBuilder(boolean isUnionTypeBuilder); - - void setSUID(GeneratedPropertyBuilder suid); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java deleted file mode 100644 index c6783f7cc1..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; - -/** - * Generated Type Builder interface is helper interface for building and - * defining the GeneratedType. - * - * @see GeneratedType - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder} instead. - */ -@Deprecated -public interface GeneratedTypeBuilder extends GeneratedTypeBuilderBase { - - /** - * Returns the new immutable instance of Generated Type. - * - * @return the new immutable instance of Generated Type. - */ - GeneratedType toInstance(); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java deleted file mode 100644 index 674dfc0842..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import java.util.List; - -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.yang.common.QName; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase} instead. - */ -@Deprecated -public interface GeneratedTypeBuilderBase> extends Type { - - /** - * Adds new Enclosing Transfer Object into definition of Generated Type and - * returns new Instance of Generated TO Builder.
- * There is no need of specifying of Package Name because enclosing Type is - * already defined inside Generated Type with specific package name.
- * The name of enclosing Type cannot be same as Name of parent type and if - * there is already defined enclosing type with the same name, the new - * enclosing type will simply overwrite the older definition.
- * If the name of enclosing type is null the method SHOULD - * throw {@link IllegalArgumentException} - * - * @param name - * Name of Enclosing Type - * @return new Instance of Generated Type Builder. - */ - GeneratedTOBuilder addEnclosingTransferObject(String name); - - /** - * Adds new Enclosing Transfer Object genTOBuilder into - * definition of Generated Type - * - *
- * There is no need of specifying of Package Name because enclosing Type is - * already defined inside Generated Type with specific package name.
- * The name of enclosing Type cannot be same as Name of parent type and if - * there is already defined enclosing type with the same name, the new - * enclosing type will simply overwrite the older definition.
- * If the parameter genTOBuilder of enclosing type is - * null the method SHOULD throw - * {@link IllegalArgumentException} - * - * @param genTOBuilder - * Name of Enclosing Type - */ - T addEnclosingTransferObject(GeneratedTOBuilder genTOBuilder); - - /** - * Adds String definition of comment into Method Signature definition.
- * The comment String MUST NOT contain anny comment specific chars (i.e. - * "/**" or "//") just plain String text description. - * - * @param comment - * Comment String. - */ - T addComment(String comment); - - /** - * The method creates new AnnotationTypeBuilder containing specified package - * name an annotation name.
- * Neither the package name or annotation name can contain null - * references. In case that any of parameters contains null the - * method SHOULD thrown {@link IllegalArgumentException} - * - * @param packageName - * Package Name of Annotation Type - * @param name - * Name of Annotation Type - * @return new instance of Annotation Type Builder. - */ - AnnotationTypeBuilder addAnnotation(String packageName, String name); - - boolean isAbstract(); - - /** - * Sets the abstract flag to define Generated Type as - * abstract type. - * - * @param isAbstract - * abstract flag - */ - T setAbstract(boolean isAbstract); - - List getImplementsTypes(); - - /** - * Add Type to implements. - * - * @param genType - * Type to implement - * @return true if the addition of type is successful. - */ - T addImplementsType(Type genType); - - /** - * Adds Constant definition and returns new Constant instance.
- * By definition Constant MUST be defined by return Type, Name and assigned - * value. The name SHOULD be defined with capital letters. Neither of method - * parameters can be null and the method SHOULD throw - * {@link IllegalArgumentException} if the contract is broken. - * - * @param type - * Constant Type - * @param name - * Name of Constant - * @param value - * Assigned Value - * @return new Constant instance. - */ - Constant addConstant(Type type, String name, Object value); - - /** - * Adds new Enumeration definition for Generated Type Builder and returns - * Enum Builder for specifying all Enum parameters.
- * If there is already Enumeration stored with the same name, the old enum - * will be simply overwritten byt new enum definition.
- * Name of Enumeration cannot be null, if it is - * null the method SHOULD throw - * {@link IllegalArgumentException} - * - * @param name - * Enumeration Name - * @return new instance of Enumeration Builder. - */ - EnumBuilder addEnumeration(String name); - - List getMethodDefinitions(); - - /** - * Add new Method Signature definition for Generated Type Builder and - * returns Method Signature Builder for specifying all Method parameters.
- * Name of Method cannot be null, if it is null - * the method SHOULD throw {@link IllegalArgumentException}
- * By Default the MethodSignatureBuilder SHOULD be pre-set as - * {@link MethodSignatureBuilder#setAbstract(boolean)}, - * {TypeMemberBuilder#setFinal(boolean)} and - * {TypeMemberBuilder#setAccessModifier(boolean)} - * - * @param name - * Name of Method - * @return new instance of Method Signature Builder. - */ - MethodSignatureBuilder addMethod(String name); - - /** - * Checks if GeneratedTypeBuilder contains method with name - * methodName - * - * @param methodName - * is method name - */ - boolean containsMethod(String methodName); - - List getProperties(); - - /** - * Add new Generated Property definition for Generated Transfer Object - * Builder and returns Generated Property Builder for specifying Property.
- * Name of Property cannot be null, if it is null - * the method SHOULD throw {@link IllegalArgumentException} - * - * @param name - * Name of Property - * @return new instance of Generated Property Builder. - */ - GeneratedPropertyBuilder addProperty(String name); - - /** - * Check whether GeneratedTOBuilder contains property with name - * name - * - * @param name - * of property which existance is checked - * @return true if property name exists in list of properties. - */ - boolean containsProperty(String name); - - /** - * Set a string that contains a human-readable textual description of type - * definition. - * - * @param description - * a string that contains a human-readable textual description of - * type definition. - */ - void setDescription(String description); - - /** - * Set the name of the module, in which generated type was specified. - * - * @param moduleName - * the name of the module - */ - void setModuleName(String moduleName); - - /** - * Set a list of QNames which represent schema path in schema tree from - * actual concrete type to the root. - * - * @param schemaPath - * a list of QNames which represent schema path in schema tree - */ - void setSchemaPath(Iterable schemaPath); - - /** - * Set a string that is used to specify a textual cross-reference to an - * external document, either another module that defines related management - * information, or a document that provides additional information relevant - * to this definition. - * - * @param reference - * a textual cross-reference to an external document. - */ - void setReference(String reference); - -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java deleted file mode 100644 index 5e49295f72..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -/** - * Method Signature Builder serves solely for building Method Signature and - * returning the new instance of Method Signature.
- * By definition of {@link MethodSignature} the Method in java MUST contain - * Name, Return Type and Access Modifier. By default the Access Modifier can be - * set to public. The Method Signature builder does not contain method for - * addName due to enforce reason that MethodSignatureBuilder SHOULD be - * instantiated only once with defined method name.
- * The methods as {@link #addAnnotation(String, String)} and - * {@link #setComment(String)} can be used as optional because not all methods - * MUST contain annotation or comment definitions. - * - * - * @see MethodSignature - * - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder} instead. - */ -@Deprecated -public interface MethodSignatureBuilder extends TypeMemberBuilder { - - /** - * Sets the flag for declaration of method as abstract or non abstract. If - * the flag isAbstract == true The instantiated Method - * Signature MUST have return value for {@link MethodSignature#isAbstract()} - * also equals to true. - * - * @param isAbstract - * is abstract flag - */ - MethodSignatureBuilder setAbstract(boolean isAbstract); - - /** - * Adds Parameter into the List of method parameters. Neither the Name or - * Type of parameter can be null. - * - *
- * In case that any of parameters are defined as null the - * method SHOULD throw an {@link IllegalArgumentException} - * - * @param type - * Parameter Type - * @param name - * Parameter Name - */ - MethodSignatureBuilder addParameter(final Type type, final String name); - - /** - * Returns new immutable instance of Method Signature.
- * The definingType param cannot be null. The - * every method in Java MUST be declared and defined inside the scope of - * class or interface definition. In case that - * defining Type will be passed as null reference the method - * SHOULD thrown {@link IllegalArgumentException}. - * - * @param definingType - * Defining Type of Method Signature - * @return new immutable instance of Method Signature. - */ - MethodSignature toInstance(final Type definingType); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java deleted file mode 100644 index dda30bac6b..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; - -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -/** - * @deprecated Use {@link org.opendaylight.mdsal.binding.model.api.type.builder.TypeMemberBuilder} instead. - */ -@Deprecated -public interface TypeMemberBuilder> { - - /** - * The method creates new AnnotationTypeBuilder containing specified package - * name an annotation name.
- * Neither the package name or annotation name can contain null - * references. In case that any of parameters contains null the - * method SHOULD thrown {@link IllegalArgumentException} - * - * @param packageName - * Package Name of Annotation Type - * @param name - * Name of Annotation Type - * @return new instance of Annotation Type Builder. - */ - AnnotationTypeBuilder addAnnotation(final String packageName, final String name); - - /** - * Returns the name of property. - * - * @return the name of property. - */ - String getName(); - - /** - * Adds return Type into Builder definition for Generated Property.
- * The return Type MUST NOT be null, otherwise the method - * SHOULD throw {@link IllegalArgumentException} - * - * @param returnType - * Return Type of property. - */ - T setReturnType(final Type returnType); - - AccessModifier getAccessModifier(); - - /** - * Sets the access modifier of property. - * - * @param modifier - * Access Modifier value. - */ - T setAccessModifier(final AccessModifier modifier); - - /** - * Adds String definition of comment into Method Signature definition.
- * The comment String MUST NOT contain anny comment specific chars (i.e. - * "/**" or "//") just plain String text description. - * - * @param comment - * Comment String. - */ - T setComment(final String comment); - - /** - * Sets the flag final for method signature. If this is set the method will - * be prohibited from overriding.
- * This setting is irrelevant for methods designated to be defined in - * interface definitions because interface can't have final method. - * - * @param isFinal - * Is Final - */ - T setFinal(final boolean isFinal); - - T setStatic(final boolean isStatic); -} diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java deleted file mode 100644 index f46cc4c355..0000000000 --- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.sal.binding.model.api.type.builder; \ No newline at end of file diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java index d9d3b2e118..f3c89a5499 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java @@ -44,6 +44,22 @@ import java.util.List; import java.util.Map; 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.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.Constant; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +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.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil; import org.opendaylight.yangtools.binding.generator.util.BindingTypes; import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl; @@ -51,22 +67,6 @@ import org.opendaylight.yangtools.binding.generator.util.Types; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.sal.binding.yang.types.GroupingDefinitionDependencySort; import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl; import org.opendaylight.yangtools.yang.binding.BaseIdentity; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedClassLoadingStrategy.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedClassLoadingStrategy.java index d8f3b73798..76d6ef69cf 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedClassLoadingStrategy.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedClassLoadingStrategy.java @@ -7,8 +7,8 @@ */ package org.opendaylight.yangtools.sal.binding.generator.impl; -import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.util.ClassLoaderUtils; public abstract class GeneratedClassLoadingStrategy implements ClassLoadingStrategy { diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleContext.java index 5ac14335f4..2e6a58abbc 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleContext.java @@ -20,10 +20,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java index 8ca069fc16..6e78f214e9 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java @@ -17,10 +17,10 @@ import java.io.InputStream; import java.lang.ref.WeakReference; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; +import org.opendaylight.mdsal.binding.generator.api.ModuleInfoRegistry; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; import org.opendaylight.yangtools.concepts.ObjectRegistration; -import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.generator.api.ModuleInfoRegistry; import org.opendaylight.yangtools.util.ClassLoaderUtils; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.binding.util.BindingReflections; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java index 88fadd29ee..614208f91f 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/BindingRuntimeContext.java @@ -26,17 +26,17 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; +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.yangtools.binding.generator.util.ReferencedTypeImpl; import org.opendaylight.yangtools.concepts.Immutable; -import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy; import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl; import org.opendaylight.yangtools.sal.binding.generator.impl.BindingSchemaContextUtils; import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleContext; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java index 26325c16b8..21f827734f 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java @@ -12,10 +12,10 @@ import com.google.common.collect.ImmutableMap.Builder; 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.model.api.Restrictions; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.generator.util.Types; -import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public final class BaseYangTypes { /** * mapping of basic built-in YANG types (keys) to JAVA - * {@link org.opendaylight.yangtools.sal.binding.model.api.Type Type}. This + * {@link org.opendaylight.mdsal.binding.model.api.Type Type}. This * map is filled with mapping data in static initialization block */ private static final Map TYPE_MAP; diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java index 18a10f111a..9068082886 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java @@ -34,25 +34,25 @@ import java.util.TreeMap; 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.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.ConcreteType; +import org.opendaylight.mdsal.binding.model.api.Enumeration; +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +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.EnumBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil; import org.opendaylight.yangtools.binding.generator.util.TypeConstants; import org.opendaylight.yangtools.binding.generator.util.Types; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.EnumerationBuilderImpl; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; 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/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java index c590313e41..ed8e875c25 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java @@ -14,12 +14,12 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java index b291f90046..ee303b1e97 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java @@ -14,12 +14,12 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java index f07ba14e2c..95fad66ec4 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java @@ -11,11 +11,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.opendaylight.mdsal.binding.generator.spi.TypeProvider; +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.yangtools.binding.generator.util.Types; -import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes; public class BaseTypeProvider { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java index c546fe8724..de52d00016 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Type; 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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImplTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImplTest.java index cc1f05f6ef..e650ea346b 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImplTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImplTest.java @@ -19,9 +19,9 @@ import java.io.InputStream; import java.net.URISyntaxException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.ParameterizedType; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index 757fcf6d11..c6d4249d19 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.Type; 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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug4145Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug4145Test.java index 65b88b125b..a2e8032556 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug4145Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug4145Test.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug6135Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug6135Test.java index 963bb83a12..fa17cb0759 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug6135Test.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/Bug6135Test.java @@ -16,9 +16,9 @@ import java.net.URISyntaxException; import java.util.List; import org.junit.Ignore; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Enumeration; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java index 121e8cb959..76c76831b8 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java @@ -16,10 +16,10 @@ import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestU import java.io.IOException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.Type; 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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java index 0747a808f0..6eae1aaecf 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java index 567375e53f..cd60ae36da 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java @@ -15,10 +15,10 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java index 6739ae8d7a..52a6d1fa1a 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java @@ -16,11 +16,11 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Enumeration; +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.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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java index 89f6feaeff..b15fc2887d 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java @@ -16,8 +16,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java index 09339c7f1a..7826bb8d7c 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java @@ -13,11 +13,11 @@ import java.io.File; import java.net.URI; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java index 1b60ba8fad..371a6d4b76 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java @@ -16,13 +16,13 @@ import java.io.File; import java.net.URI; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature.Parameter; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.api.MethodSignature.Parameter; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java index 045f6feef8..c6fdc12305 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java @@ -19,12 +19,12 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java index b2480a6353..25fcb505b7 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java @@ -17,11 +17,11 @@ import java.util.ArrayList; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Constant; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.ParameterizedType; +import org.opendaylight.mdsal.binding.model.api.Type; 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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java index 103f6a7f99..0f4d0fdc68 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java @@ -15,12 +15,12 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java index 2f32c1f99d..2c1b6711ef 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java @@ -17,11 +17,11 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java index 27c155f15b..b3821c6a1f 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java @@ -11,12 +11,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.List; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +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.ParameterizedType; +import org.opendaylight.mdsal.binding.model.api.Type; public class SupportTestUtil { diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java index d1dc6ffea3..1d5d569320 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertNotNull; import java.io.File; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java index 9a1801de7f..7bd20394be 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java @@ -19,10 +19,10 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.Type; 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-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypesTest.java index 7aeaa7bf71..1ff4f3a8e2 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypesTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypesTest.java @@ -19,9 +19,9 @@ import java.util.List; 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.model.api.Type; import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.yangtools.sal.binding.model.api.Type; 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/yangtools/sal/binding/yang/types/TypeProviderImplTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImplTest.java index 450096d108..afe413126d 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImplTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImplTest.java @@ -20,8 +20,8 @@ import java.io.File; import java.net.URI; import java.util.NoSuchElementException; import org.junit.Test; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; -import org.opendaylight.yangtools.sal.binding.model.api.Type; 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/yangtools/sal/binding/yang/types/TypeProviderTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java index 0298debbab..de2be733de 100644 --- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java +++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java @@ -22,17 +22,17 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil; -import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl; -import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; +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; +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.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -72,17 +72,17 @@ public class TypeProviderTest { @Before public void setUp() throws SourceException, ReactorException { MockitoAnnotations.initMocks(this); - schemaContext = TypeProviderModel.createTestContext(); - assertNotNull(schemaContext); - schemaModules = schemaContext.getModules(); - assertNotNull(schemaModules); - testTypeProviderModule = resolveModule(TypeProviderModel.TEST_TYPE_PROVIDER_MODULE_NAME); - assertNotNull(testTypeProviderModule); + this.schemaContext = TypeProviderModel.createTestContext(); + assertNotNull(this.schemaContext); + this.schemaModules = this.schemaContext.getModules(); + assertNotNull(this.schemaModules); + this.testTypeProviderModule = resolveModule(TypeProviderModel.TEST_TYPE_PROVIDER_MODULE_NAME); + assertNotNull(this.testTypeProviderModule); } private Module resolveModule(final String moduleName) { assertNotNull(moduleName); - for (Module m : schemaModules) { + for (final Module m : this.schemaModules) { if (moduleName.equals(m.getName())) { return m; } @@ -98,38 +98,38 @@ public class TypeProviderTest { @Test(expected = IllegalArgumentException.class) public void putReferencedTypeWithNullSchemaPathParamTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); ((TypeProviderImpl) provider).putReferencedType(null, null); - ((TypeProviderImpl) provider).putReferencedType(schemaPath, null); + ((TypeProviderImpl) provider).putReferencedType(this.schemaPath, null); } @Test(expected = IllegalArgumentException.class) public void putReferencedTypeWithNullRefTypeParamTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); - ((TypeProviderImpl) provider).putReferencedType(schemaPath, null); + ((TypeProviderImpl) provider).putReferencedType(this.schemaPath, null); } @Test public void getAdditionalTypesTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); assertNotNull(((TypeProviderImpl) provider).getAdditionalTypes()); } @Test(expected = IllegalArgumentException.class) public void javaTypeForSchemaDefinitionTypeNullTypedefTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); provider.javaTypeForSchemaDefinitionType(null, null, null); } @Test(expected = IllegalArgumentException.class) public void javaTypeForSchemaDefinitionTypeTypedefNullQNameTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); - TestIntegerTypeDefinition testTypedef = new TestIntegerTypeDefinition(); + final TestIntegerTypeDefinition testTypedef = new TestIntegerTypeDefinition(); provider.javaTypeForSchemaDefinitionType(testTypedef, null, null); } @@ -163,8 +163,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionExtTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "yang-int8-type"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "yang-int8-type"); final TypeDefinition leafType = leaf.getType(); final Type result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -180,8 +180,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionRestrictedExtTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "restricted-int8-type"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "restricted-int8-type"); final TypeDefinition leafType = leaf.getType(); final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(leafType); @@ -204,7 +204,7 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionEmptyStringPatternTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module testTypeProvider = resolveModule("test-type-provider"); final TypeDefinition emptyPatternString = resolveTypeDefinitionFromModule(testTypeProvider, "empty-pattern-string"); @@ -238,8 +238,8 @@ public class TypeProviderTest { @Ignore @Test public void bug1862RestrictedTypedefTransformationTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "bug-1862-restricted-typedef"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "bug-1862-restricted-typedef"); final TypeDefinition leafType = leaf.getType(); final Restrictions restrictions = BindingGeneratorUtil.getRestrictions(leafType); @@ -251,8 +251,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionEnumExtTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "resolve-enum-leaf"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "resolve-enum-leaf"); TypeDefinition leafType = leaf.getType(); Type result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); assertNotNull(result); @@ -266,7 +266,7 @@ public class TypeProviderTest { assertEquals("A", enumValues.get(0).getMappedName()); assertEquals("B", enumValues.get(1).getMappedName()); - leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "resolve-direct-use-of-enum"); + leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "resolve-direct-use-of-enum"); leafType = leaf.getType(); result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); assertNotNull(result); @@ -278,8 +278,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionLeafrefExtTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "bar", "leafref-value"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "bar", "leafref-value"); TypeDefinition leafType = leaf.getType(); final Type leafrefResolvedType1 = provider.javaTypeForSchemaDefinitionType(leafType, leaf); assertNotNull(leafrefResolvedType1); @@ -300,7 +300,7 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionLeafrefToEnumTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); setReferencedTypeForTypeProvider(provider); @@ -310,7 +310,7 @@ public class TypeProviderTest { final DataSchemaNode enumNode = module.getDataChildByName(leafNode); assertNotNull("leaf enum is not present in root of module " + module.getName(), enumNode); assertTrue(enumNode instanceof LeafSchemaNode); - LeafSchemaNode leaf = (LeafSchemaNode) enumNode; + final LeafSchemaNode leaf = (LeafSchemaNode) enumNode; final TypeDefinition leafType = leaf.getType(); final Type leafrefResolvedType1 = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -321,8 +321,8 @@ public class TypeProviderTest { final DataSchemaNode enumListNode = module.getDataChildByName(leafListNode); assertNotNull("leaf-list enums is not present in root of module "+ module.getName(), enumNode); assertTrue(enumListNode instanceof LeafListSchemaNode); - LeafListSchemaNode leafList = (LeafListSchemaNode) enumListNode; - TypeDefinition leafListType = leafList.getType(); + final LeafListSchemaNode leafList = (LeafListSchemaNode) enumListNode; + final TypeDefinition leafListType = leafList.getType(); final Type leafrefResolvedType2 = provider.javaTypeForSchemaDefinitionType(leafListType, leafList); assertNotNull(leafrefResolvedType2); @@ -330,7 +330,7 @@ public class TypeProviderTest { } private void setReferencedTypeForTypeProvider(final TypeProvider provider) { - final LeafSchemaNode enumLeafNode = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", + final LeafSchemaNode enumLeafNode = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "resolve-direct-use-of-enum"); final TypeDefinition enumLeafTypedef = enumLeafNode.getType(); Type enumType = provider.javaTypeForSchemaDefinitionType(enumLeafTypedef, enumLeafNode); @@ -338,7 +338,7 @@ public class TypeProviderTest { Type refType = new ReferencedTypeImpl(enumType.getPackageName(), enumType.getName()); ((TypeProviderImpl) provider).putReferencedType(enumLeafNode.getPath(), refType); - final LeafListSchemaNode enumListNode = provideLeafListNodeFromTopLevelContainer(testTypeProviderModule, "foo", + final LeafListSchemaNode enumListNode = provideLeafListNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "list-of-enums"); final TypeDefinition enumLeafListTypedef = enumListNode.getType(); enumType = provider.javaTypeForSchemaDefinitionType(enumLeafListTypedef, enumListNode); @@ -349,14 +349,14 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionConditionalLeafrefTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); final Module module = resolveModule("test-type-provider-b"); final QName leafrefNode = QName.create(module.getQNameModule(), "conditional-leafref"); final DataSchemaNode condLeaf = module.getDataChildByName(leafrefNode); assertNotNull("leaf conditional-leafref is not present in root of module "+ module.getName(), condLeaf); assertTrue(condLeaf instanceof LeafSchemaNode); - LeafSchemaNode leaf = (LeafSchemaNode) condLeaf; + final LeafSchemaNode leaf = (LeafSchemaNode) condLeaf; final TypeDefinition leafType = leaf.getType(); final Type resultType = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -368,14 +368,14 @@ public class TypeProviderTest { @Test(expected = IllegalArgumentException.class) public void javaTypeForSchemaDefinitionInvalidLeafrefPathTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); final Module module = resolveModule("test-type-provider-b"); final QName leafrefNode = QName.create(module.getQNameModule(), "unreslovable-leafref"); final DataSchemaNode condLeaf = module.getDataChildByName(leafrefNode); assertNotNull("leaf unreslovable-leafref is not present in root of module "+ module.getName(), condLeaf); assertTrue(condLeaf instanceof LeafSchemaNode); - LeafSchemaNode leaf = (LeafSchemaNode) condLeaf; + final LeafSchemaNode leaf = (LeafSchemaNode) condLeaf; final TypeDefinition leafType = leaf.getType(); provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -383,33 +383,33 @@ public class TypeProviderTest { @Test(expected = IllegalArgumentException.class) public void provideTypeForLeafrefWithNullLeafrefTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); provider.provideTypeForLeafref(null, null); } @Test(expected = IllegalArgumentException.class) public void provideTypeForLeafrefWithNullLeafrefTypePathStatementTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final LeafrefTypeWithNullXpath leafrePath = new LeafrefTypeWithNullXpath(); - provider.provideTypeForLeafref(leafrePath, schemaNode); + provider.provideTypeForLeafref(leafrePath, this.schemaNode); } @Test(expected = IllegalStateException.class) public void provideTypeForLeafrefWithNullParentModuleTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); - LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "bar", "leafref-value"); - TypeDefinition leafType = leaf.getType(); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "bar", "leafref-value"); + final TypeDefinition leafType = leaf.getType(); assertTrue(leafType instanceof LeafrefTypeDefinition); - doReturn(null).when(schemaNode).getPath(); - provider.provideTypeForLeafref((LeafrefTypeDefinition) leafType, schemaNode); + doReturn(null).when(this.schemaNode).getPath(); + provider.provideTypeForLeafref((LeafrefTypeDefinition) leafType, this.schemaNode); } @Test public void javaTypeForSchemaDefinitionIdentityrefExtTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "crypto"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "crypto"); final TypeDefinition leafType = leaf.getType(); final Type result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -419,8 +419,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionForExtUnionWithSimpleTypesTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "use-of-unions", "simple-int-types-union"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "use-of-unions", "simple-int-types-union"); final TypeDefinition leafType = leaf.getType(); final Type result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -432,8 +432,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionForExtComplexUnionWithInnerUnionTypesTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "use-of-unions", "complex-union"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "use-of-unions", "complex-union"); final TypeDefinition leafType = leaf.getType(); final Type result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -445,8 +445,8 @@ public class TypeProviderTest { @Test public void javaTypeForSchemaDefinitionForExtUnionWithInnerUnionAndSimpleTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "use-of-unions", "complex-string-int-union"); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "use-of-unions", "complex-string-int-union"); final TypeDefinition leafType = leaf.getType(); final Type result = provider.javaTypeForSchemaDefinitionType(leafType, leaf); @@ -458,7 +458,7 @@ public class TypeProviderTest { @Test public void provideGeneratedTOBuilderForUnionTypeDefWithInnerUnionTypesTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module testTypeProvider = resolveModule("test-type-provider"); final TypeDefinition unionTypeDef = resolveTypeDefinitionFromModule(testTypeProvider, "complex-union"); @@ -492,7 +492,7 @@ public class TypeProviderTest { @Test public void provideGeneratedTOBuilderForUnionTypeDefWithInnerUnionAndSimpleTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module testTypeProvider = resolveModule("test-type-provider"); final TypeDefinition unionTypeDef = resolveTypeDefinitionFromModule(testTypeProvider, "complex-string-int-union"); @@ -504,13 +504,13 @@ public class TypeProviderTest { assertNotNull(unionTypeBuilder); - GeneratedTransferObject unionType = unionTypeBuilder.toInstance(); + final GeneratedTransferObject unionType = unionTypeBuilder.toInstance(); assertEquals("ComplexStringIntUnionType", unionType.getName()); } @Test public void generatedTypeForExtendedDefinitionTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module baseYangTypes = resolveModule("base-yang-types"); final Set> typeDefs = baseYangTypes.getTypeDefinitions(); @@ -534,8 +534,8 @@ public class TypeProviderTest { Type yangBits = null; Type yangInstanceIdentifier = null; - for (TypeDefinition typedef : typeDefs) { - Type type = provider.generatedTypeForExtendedDefinitionType(typedef, typedef); + for (final TypeDefinition typedef : typeDefs) { + final Type type = provider.generatedTypeForExtendedDefinitionType(typedef, typedef); if (type instanceof GeneratedTransferObject) { if (type.getName().equals("YangBoolean")) { yangBoolean = type; @@ -601,83 +601,83 @@ public class TypeProviderTest { @Test(expected = IllegalArgumentException.class) public void generatedTypeForExtendedDefinitionTypeWithTypedefNullTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); provider.generatedTypeForExtendedDefinitionType(null, null); } @Test(expected = IllegalArgumentException.class) public void generatedTypeForExtendedDefinitionTypeWithTypedefQNameNullTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); - TestIntegerTypeDefinition testInt = new TestIntegerTypeDefinition(); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); + final TestIntegerTypeDefinition testInt = new TestIntegerTypeDefinition(); provider.generatedTypeForExtendedDefinitionType(testInt, testInt); } @Test public void generatedTypeForExtendedDefinitionTypeWithInnerExtendedTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module baseYangTypes = resolveModule("test-type-provider"); - TypeDefinition extYangInt8Typedef = resolveTypeDefinitionFromModule(baseYangTypes, "extended-yang-int8"); + final TypeDefinition extYangInt8Typedef = resolveTypeDefinitionFromModule(baseYangTypes, "extended-yang-int8"); assertNotNull(extYangInt8Typedef); - Type extType = provider.generatedTypeForExtendedDefinitionType(extYangInt8Typedef, extYangInt8Typedef); + final Type extType = provider.generatedTypeForExtendedDefinitionType(extYangInt8Typedef, extYangInt8Typedef); assertNotNull(extType); assertTrue(extType instanceof GeneratedTransferObject); } @Test public void generatedTypeForExtendedDefinitionTypeWithLeafrefBaseTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module baseYangTypes = resolveModule("test-type-provider"); - TypeDefinition barItemLeafrefId = resolveTypeDefinitionFromModule(baseYangTypes, "bar-item-leafref-id"); + final TypeDefinition barItemLeafrefId = resolveTypeDefinitionFromModule(baseYangTypes, "bar-item-leafref-id"); assertNotNull(barItemLeafrefId); - Type extType = provider.generatedTypeForExtendedDefinitionType(barItemLeafrefId, barItemLeafrefId); + final Type extType = provider.generatedTypeForExtendedDefinitionType(barItemLeafrefId, barItemLeafrefId); assertEquals(null, extType); } @Test public void generatedTypeForExtendedDefinitionTypeWithIdentityrefBaseTypeTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final Module baseYangTypes = resolveModule("test-type-provider"); - TypeDefinition aesIdentityrefType = resolveTypeDefinitionFromModule(baseYangTypes, "aes-identityref-type"); + final TypeDefinition aesIdentityrefType = resolveTypeDefinitionFromModule(baseYangTypes, "aes-identityref-type"); assertNotNull(aesIdentityrefType); - Type extType = provider.generatedTypeForExtendedDefinitionType(aesIdentityrefType, aesIdentityrefType); + final Type extType = provider.generatedTypeForExtendedDefinitionType(aesIdentityrefType, aesIdentityrefType); assertEquals(null, extType); } @Test(expected = IllegalArgumentException.class) public void provideGeneratedTOBuilderForBitsTypeDefinitionWithNullTypedefTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); provider.provideGeneratedTOBuilderForBitsTypeDefinition("", null, "", ""); } @Test(expected = IllegalArgumentException.class) public void provideGeneratedTOBuilderForBitsTypeDefinitionWithBasePackageNullTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "yang-int8-type"); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "yang-int8-type"); final TypeDefinition leafType = leaf.getType(); provider.provideGeneratedTOBuilderForBitsTypeDefinition(null, leafType, "", ""); } @Test public void provideGeneratedTOBuilderForBitsTypeDefinitionWithNonBitsTypedefTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "yang-int8-type"); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "yang-int8-type"); final TypeDefinition leafType = leaf.getType(); - Type type = provider.provideGeneratedTOBuilderForBitsTypeDefinition("", leafType, "", ""); + final Type type = provider.provideGeneratedTOBuilderForBitsTypeDefinition("", leafType, "", ""); assertEquals(null, type); } @Test public void getConstructorPropertyNameTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "yang-int8-type"); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "yang-int8-type"); final TypeDefinition leafType = leaf.getType(); final String ctorPropertyName = provider.getConstructorPropertyName(leafType); @@ -689,9 +689,9 @@ public class TypeProviderTest { @Test public void getParamNameFromTypeTest() { - final TypeProvider provider = new TypeProviderImpl(schemaContext); + final TypeProvider provider = new TypeProviderImpl(this.schemaContext); - final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "foo", "yang-int8-type"); + final LeafSchemaNode leaf = provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "foo", "yang-int8-type"); final TypeDefinition leafType = leaf.getType(); final String paramName = provider.getParamNameFromType(leafType); @@ -700,9 +700,9 @@ public class TypeProviderTest { @Test public void addUnitsToGenTOTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); - GeneratedTOBuilder builder = new GeneratedTOBuilderImpl("test.package", "TestBuilder"); + final GeneratedTOBuilder builder = new GeneratedTOBuilderImpl("test.package", "TestBuilder"); TypeProviderImpl.addUnitsToGenTO(builder, null); GeneratedTransferObject genTO = builder.toInstance(); @@ -722,40 +722,40 @@ public class TypeProviderTest { @Test(expected = NullPointerException.class) public void getTypeDefaultConstructionLeafTypeNullTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); - TestLeafSchemaNode leafSchemaNode = new TestLeafSchemaNode(); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); + final TestLeafSchemaNode leafSchemaNode = new TestLeafSchemaNode(); provider.getTypeDefaultConstruction(leafSchemaNode, null); } @Test(expected = NullPointerException.class) public void getTypeDefaultConstructionDefaultValueNullTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); final LeafSchemaNode leaf = provideLeafForGetDefaultConstructionTestCase("yang-boolean"); provider.getTypeDefaultConstruction(leaf, null); } private LeafSchemaNode provideLeafForGetDefaultConstructionTestCase(final String leafName) { - return provideLeafNodeFromTopLevelContainer(testTypeProviderModule, "construction-type-test", + return provideLeafNodeFromTopLevelContainer(this.testTypeProviderModule, "construction-type-test", leafName); } @Test(expected = UnsupportedOperationException.class) public void getTypeDefaultConstructionDefaultValueForInstanceIdentifierTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); - LeafSchemaNode leaf = provideLeafForGetDefaultConstructionTestCase("foo-container-id"); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafForGetDefaultConstructionTestCase("foo-container-id"); provider.getTypeDefaultConstruction(leaf, "NAN"); } @Test(expected = UnsupportedOperationException.class) public void getTypeDefaultConstructionDefaultValueForIdentityrefTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); - LeafSchemaNode leaf = provideLeafForGetDefaultConstructionTestCase("aes-identityref-type"); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); + final LeafSchemaNode leaf = provideLeafForGetDefaultConstructionTestCase("aes-identityref-type"); provider.getTypeDefaultConstruction(leaf, "NAN"); } @Test public void getTypeDefaultConstructionDefaultValueTest() { - final TypeProviderImpl provider = new TypeProviderImpl(schemaContext); + final TypeProviderImpl provider = new TypeProviderImpl(this.schemaContext); LeafSchemaNode leaf = provideLeafForGetDefaultConstructionTestCase("yang-boolean"); String result = provider.getTypeDefaultConstruction(leaf, "true"); 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/generator/util/Types.java index 3e08b42cc0..1964d32a8e 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/generator/util/Types.java @@ -65,7 +65,7 @@ public final class Types { /** * Creates the instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.ConcreteType + * {@link org.opendaylight.mdsal.binding.model.api.ConcreteType * ConcreteType} which represents JAVA void type. * * @return ConcreteType instance which represents JAVA @@ -77,7 +77,7 @@ public final class Types { /** * Creates the instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.ConcreteType + * {@link org.opendaylight.mdsal.binding.model.api.ConcreteType * ConcreteType} which represents primitive JAVA type for which package * doesn't exist. * @@ -156,7 +156,7 @@ public final class Types { /** * Creates instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType + * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType * ParameterizedType} * * @param type @@ -172,7 +172,7 @@ public final class Types { /** * Creates instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.WildcardType + * {@link org.opendaylight.mdsal.binding.model.api.WildcardType * WildcardType} * * @param packageName @@ -188,7 +188,7 @@ public final class Types { /** * Creates instance of - * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType + * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType * ParameterizedType} where raw type is * {@link org.opendaylight.yangtools.yang.binding.Augmentable} and actual * parameter is valueType. @@ -206,7 +206,7 @@ public final class Types { /** * Creates instance of - * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType + * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType * ParameterizedType} where raw type is * {@link org.opendaylight.yangtools.yang.binding.Augmentation} and actual * parameter is valueType. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java index f8cf91463b..c9835d3c88 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.binding.generator.util; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; /** * It is used only as ancestor for other Types diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java index 6df9cdd782..5e8ab2a7d2 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java @@ -22,13 +22,13 @@ import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.TypeMemberBuilder; +import org.opendaylight.mdsal.binding.model.api.AccessModifier; +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.GeneratedPropertyBuilder; +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.api.type.builder.TypeMemberBuilder; import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingTypes.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingTypes.java index 531825c4cb..b9c17c8d02 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingTypes.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingTypes.java @@ -9,10 +9,9 @@ package org.opendaylight.yangtools.binding.generator.util; import static org.opendaylight.yangtools.binding.generator.util.Types.parameterizedTypeFor; import static org.opendaylight.yangtools.binding.generator.util.Types.typeForClass; - -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +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.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.BaseIdentity; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java index a9014bc88e..a124778bd7 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java @@ -21,12 +21,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Future; import javax.annotation.Nullable; -import org.opendaylight.yangtools.sal.binding.model.api.BaseTypeWithRestrictions; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.WildcardType; +import org.opendaylight.mdsal.binding.model.api.BaseTypeWithRestrictions; +import org.opendaylight.mdsal.binding.model.api.ConcreteType; +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.WildcardType; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; @@ -69,7 +69,7 @@ public final class Types { /** * Creates the instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.ConcreteType + * {@link org.opendaylight.mdsal.binding.model.api.ConcreteType * ConcreteType} which represents JAVA void type. * * @return ConcreteType instance which represents JAVA @@ -81,7 +81,7 @@ public final class Types { /** * Creates the instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.ConcreteType + * {@link org.opendaylight.mdsal.binding.model.api.ConcreteType * ConcreteType} which represents primitive JAVA type for which package * doesn't exist. * @@ -160,7 +160,7 @@ public final class Types { /** * Creates instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType + * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType * ParameterizedType} * * @param type @@ -176,7 +176,7 @@ public final class Types { /** * Creates instance of type - * {@link org.opendaylight.yangtools.sal.binding.model.api.WildcardType + * {@link org.opendaylight.mdsal.binding.model.api.WildcardType * WildcardType} * * @param packageName @@ -192,7 +192,7 @@ public final class Types { /** * Creates instance of - * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType + * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType * ParameterizedType} where raw type is * {@link org.opendaylight.yangtools.yang.binding.Augmentable} and actual * parameter is valueType. @@ -210,7 +210,7 @@ public final class Types { /** * Creates instance of - * {@link org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType + * {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType * ParameterizedType} where raw type is * {@link org.opendaylight.yangtools.yang.binding.Augmentation} and actual * parameter is valueType. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java index 950198a689..320949a8aa 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java @@ -10,21 +10,20 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder import java.util.ArrayList; import java.util.Collections; import java.util.List; - +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.GeneratedProperty; +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.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.binding.generator.util.AbstractBaseType; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.AbstractGeneratedType} instead. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java index 904848c645..a9e528cdbb 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java @@ -11,17 +11,17 @@ import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; import java.util.Objects; +import org.opendaylight.mdsal.binding.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.Constant; +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.api.type.builder.GeneratedPropertyBuilder; +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.yangtools.binding.generator.util.AbstractBaseType; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; /** diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java index 16bdf2e1da..bd05cc334c 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java @@ -9,10 +9,10 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder import java.util.List; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.TypeMember; +import org.opendaylight.mdsal.binding.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.TypeMember; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.AbstractTypeMember} instead. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java index ffe9f93f26..1b54d8ba06 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java @@ -13,11 +13,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.TypeMemberBuilder; +import org.opendaylight.mdsal.binding.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +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.TypeMemberBuilder; import org.opendaylight.yangtools.util.LazyCollections; /** diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java index d299c464a6..2917a8e219 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -12,9 +12,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; import org.opendaylight.yangtools.binding.generator.util.AbstractBaseType; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; import org.opendaylight.yangtools.util.LazyCollections; /** diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java index a9dbe11e9d..7d4a8cd775 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Constant; +import org.opendaylight.mdsal.binding.model.api.Type; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.ConstantImpl} instead. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java index a0cb98a3a2..6fb8249176 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java @@ -12,17 +12,17 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; +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.GeneratedProperty; +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.api.Enumeration.Pair; +import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; import org.opendaylight.yangtools.binding.generator.util.AbstractBaseType; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration.Pair; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder; 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/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java index 764d635187..4a32ea8be7 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java @@ -8,11 +8,10 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; import java.util.List; - -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl} instead. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java index 10885693bb..0c21a04384 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java @@ -8,11 +8,10 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; import java.util.List; - -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.api.Type; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.GeneratedPropertyImpl} instead. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java index 2129f14e88..c289ae2bf1 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java @@ -10,14 +10,14 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +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.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java index 6dfe20a1a1..2f4a8db52d 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java @@ -7,8 +7,8 @@ */ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; /** diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java index ca91f943b0..f70a1e72b2 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java @@ -8,8 +8,8 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature.Parameter; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.MethodParameterImpl} instead. diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java index d73b52b5ad..cf5a24830d 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java @@ -10,10 +10,10 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +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; import org.opendaylight.yangtools.util.LazyCollections; /** diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java index 184132946b..5d21010b6b 100644 --- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java +++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java @@ -9,10 +9,10 @@ package org.opendaylight.yangtools.binding.generator.util.generated.type.builder import java.util.List; import java.util.Objects; -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.MethodSignature; +import org.opendaylight.mdsal.binding.model.api.Type; /** * @deprecated Use {@link org.opendaylight.mdsal.binding.generator.util.generated.type.builder.MethodSignatureImpl} instead. diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AbstractRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AbstractRangeGenerator.java index 8933d9448c..67265a2f1e 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AbstractRangeGenerator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AbstractRangeGenerator.java @@ -13,8 +13,8 @@ import com.google.common.collect.ImmutableMap.Builder; import java.util.Collection; import java.util.Map; import javax.annotation.Nonnull; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.ConcreteType; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AlphabeticallyTypeMemberComparator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AlphabeticallyTypeMemberComparator.java index 058ba9a343..ca3ba99568 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AlphabeticallyTypeMemberComparator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/AlphabeticallyTypeMemberComparator.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.sal.java.api.generator; import java.util.Comparator; -import org.opendaylight.yangtools.sal.binding.model.api.TypeMember; +import org.opendaylight.mdsal.binding.model.api.TypeMember; /** * Alphabetically type member {@link Comparator} which provides sorting by name for type members diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend index 530d53a063..8f385f08f5 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend @@ -17,15 +17,15 @@ import java.util.Map import java.util.StringTokenizer import java.util.regex.Pattern import org.opendaylight.yangtools.binding.generator.util.Types -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType -import org.opendaylight.yangtools.sal.binding.model.api.Constant -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions -import org.opendaylight.yangtools.sal.binding.model.api.Type -import org.opendaylight.yangtools.sal.binding.model.api.TypeMember +import org.opendaylight.mdsal.binding.model.api.ConcreteType +import org.opendaylight.mdsal.binding.model.api.Constant +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.Restrictions +import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.mdsal.binding.model.api.TypeMember import org.opendaylight.yangtools.yang.common.QName abstract class BaseTemplate { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java index ce5d9383ad..52014d0809 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.sal.java.api.generator; -import org.opendaylight.yangtools.sal.binding.model.api.CodeGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.CodeGenerator; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend index b51d77b120..b1d5b40853 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend @@ -23,12 +23,12 @@ import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl import org.opendaylight.yangtools.binding.generator.util.Types import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl import org.opendaylight.yangtools.concepts.Builder -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature -import org.opendaylight.yangtools.sal.binding.model.api.Type +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.yangtools.yang.binding.Augmentable import org.opendaylight.yangtools.yang.binding.AugmentationHolder import org.opendaylight.yangtools.yang.binding.DataObject diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend index d0edc24741..c40d4a9b43 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend @@ -19,14 +19,14 @@ import java.util.List import java.util.Objects import java.util.regex.Pattern import org.opendaylight.yangtools.binding.generator.util.TypeConstants -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType -import org.opendaylight.yangtools.sal.binding.model.api.Constant -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType -import org.opendaylight.yangtools.sal.binding.model.api.Restrictions -import org.opendaylight.yangtools.sal.binding.model.api.Type +import org.opendaylight.mdsal.binding.model.api.ConcreteType +import org.opendaylight.mdsal.binding.model.api.Constant +import org.opendaylight.mdsal.binding.model.api.Enumeration +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.Restrictions +import org.opendaylight.mdsal.binding.model.api.Type import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition /** diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java index 6cee013b1e..4ece502fe7 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java @@ -7,9 +7,9 @@ */ package org.opendaylight.yangtools.sal.java.api.generator; -import org.opendaylight.yangtools.sal.binding.model.api.CodeGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.CodeGenerator; +import org.opendaylight.mdsal.binding.model.api.Enumeration; +import org.opendaylight.mdsal.binding.model.api.Type; /** * diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend index 4f0acce4f6..3bb58301b0 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend @@ -9,8 +9,8 @@ package org.opendaylight.yangtools.sal.java.api.generator import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.encodeAngleBrackets; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType +import org.opendaylight.mdsal.binding.model.api.Enumeration +import org.opendaylight.mdsal.binding.model.api.GeneratedType /** * Template for generating JAVA enumeration type. diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java index 253a0b6961..e493929cde 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java @@ -18,9 +18,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.opendaylight.yangtools.sal.binding.model.api.CodeGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.CodeGenerator; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonatype.plexus.build.incremental.BuildContext; diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java index 74a503e2cd..0583926111 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java @@ -14,17 +14,17 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.Constant; +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.ParameterizedType; +import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.WildcardType; import org.opendaylight.yangtools.binding.generator.util.TypeConstants; import org.opendaylight.yangtools.binding.generator.util.Types; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.WildcardType; public final class GeneratorUtil { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java index d3c6a3fd23..0ddc440864 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java @@ -7,17 +7,11 @@ */ package org.opendaylight.yangtools.sal.java.api.generator; -/** - * - * Transformator of the data from the virtual form to JAVA source code. The result source code represents JAVA interface. For - * generating of the source code is used the template written in XTEND language. - * - */ -import org.opendaylight.yangtools.sal.binding.model.api.CodeGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.CodeGenerator; +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.Type; public final class InterfaceGenerator implements CodeGenerator { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend index 9b95ffa51e..4c69d08a67 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend @@ -9,12 +9,12 @@ package org.opendaylight.yangtools.sal.java.api.generator import java.util.List import org.opendaylight.yangtools.binding.generator.util.TypeConstants -import org.opendaylight.yangtools.sal.binding.model.api.Constant -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature -import org.opendaylight.yangtools.sal.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 /** * Template for generating JAVA interfaces. diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/LengthGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/LengthGenerator.java index 089eafd2b7..8a64b67099 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/LengthGenerator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/LengthGenerator.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; final class LengthGenerator { diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TOGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TOGenerator.java index a17927ef9a..3bc1bc407a 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TOGenerator.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TOGenerator.java @@ -7,9 +7,9 @@ */ package org.opendaylight.yangtools.sal.java.api.generator; -import org.opendaylight.yangtools.sal.binding.model.api.CodeGenerator; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.CodeGenerator; +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.model.api.Type; /** * diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtils.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtils.java index 928c8e9bc0..41feb92a7d 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtils.java +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtils.java @@ -9,10 +9,10 @@ package org.opendaylight.yangtools.sal.java.api.generator; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +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.Type; /** * Random utility methods for dealing with {@link Type} objects. diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionBuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionBuilderTemplate.xtend index 13c9fc309b..4a84a67517 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionBuilderTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionBuilderTemplate.xtend @@ -7,8 +7,8 @@ */ package org.opendaylight.yangtools.sal.java.api.generator -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject +import org.opendaylight.mdsal.binding.model.api.AccessModifier /** * Template for generating JAVA class. diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend index 7ff03a66f6..29d8b2e51a 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/UnionTemplate.xtend @@ -10,9 +10,9 @@ package org.opendaylight.yangtools.sal.java.api.generator import static org.opendaylight.yangtools.binding.generator.util.Types.* import com.google.common.base.Preconditions; import java.beans.ConstructorProperties -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.yangtools.sal.binding.model.api.Enumeration +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty +import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject +import org.opendaylight.mdsal.binding.model.api.Enumeration import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition /** diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend index eaecfd41ee..c40abe4b20 100644 --- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend +++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend @@ -28,9 +28,9 @@ import java.util.Set import java.util.TreeMap import java.util.function.Function import org.opendaylight.yangtools.binding.generator.util.Types -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType -import org.opendaylight.yangtools.sal.binding.model.api.Type -import org.opendaylight.yangtools.sal.binding.model.api.WildcardType +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.yangtools.yang.binding.YangModelBindingProvider import org.opendaylight.yangtools.yang.model.api.Module diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java index 4f56de880c..a040aba6c7 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGeneratorTest.java @@ -16,12 +16,11 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.MethodSignature; +import org.opendaylight.mdsal.binding.model.api.Type; @SuppressWarnings("deprecation") public class BuilderGeneratorTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGeneratorTest.java index 360bf953f9..71292117ab 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGeneratorTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; public class EnumGeneratorTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtilTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtilTest.java index 0c68898f6b..5c71ce4c61 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtilTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtilTest.java @@ -22,14 +22,14 @@ import java.lang.reflect.Constructor; import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.AnnotationType; -import org.opendaylight.yangtools.sal.binding.model.api.Constant; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature; -import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.model.api.Constant; +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.ParameterizedType; +import org.opendaylight.mdsal.binding.model.api.Type; public class GeneratorUtilTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGeneratorTest.java index 1648be551f..47a733bf0d 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGeneratorTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; public class InterfaceGeneratorTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtilsTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtilsTest.java index 78d7f4feae..0267b992b8 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtilsTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/TypeUtilsTest.java @@ -14,10 +14,10 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableList; import java.lang.reflect.Constructor; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +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.Type; public class TypeUtilsTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java index 3bcec704b0..9e1440ac33 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/AugmentToUsesInAugmentCompilationTest.java @@ -15,7 +15,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/BaseCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/BaseCompilationTest.java index 465ff0c016..acdda1096a 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/BaseCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/BaseCompilationTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.BeforeClass; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl; public abstract class BaseCompilationTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug1276Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug1276Test.java index 1ae8b2c5f9..369fbbf9a6 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug1276Test.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug1276Test.java @@ -18,7 +18,7 @@ import java.net.URLClassLoader; import java.util.Arrays; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug5151Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug5151Test.java index 9189600478..ae4838e4b1 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug5151Test.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug5151Test.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import java.util.Scanner; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug532Test.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug532Test.java index 4259f08a64..32cebaf732 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug532Test.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/Bug532Test.java @@ -27,7 +27,7 @@ import java.net.URLClassLoader; import java.util.List; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java index b00bb26aaa..ad5cb10d60 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CascadeUsesCompilationTest.java @@ -23,6 +23,7 @@ import static org.opendaylight.yangtools.sal.java.api.generator.test.Compilation import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.cleanUp; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.testCompilation; + import com.google.common.collect.ImmutableSet; import java.io.File; import java.lang.reflect.Constructor; @@ -31,7 +32,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java index 17b038b9f5..1e62762404 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java @@ -19,16 +19,16 @@ import java.util.ArrayList; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; +import org.opendaylight.mdsal.binding.generator.api.BindingGenerator; +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.Type; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.yangtools.binding.generator.util.Types; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.Type; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.yangtools.sal.java.api.generator.TOGenerator; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java index 725630a0c6..802224cca5 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java @@ -31,7 +31,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/EncodingInJavaDocTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/EncodingInJavaDocTest.java index ccc04956f7..7a995490c1 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/EncodingInJavaDocTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/EncodingInJavaDocTest.java @@ -14,11 +14,12 @@ import static org.opendaylight.yangtools.sal.java.api.generator.test.Compilation import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.cleanUp; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.testCompilation; + import com.google.common.collect.ImmutableSet; import java.io.File; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java index 90c48eadee..553e8cd104 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java @@ -15,13 +15,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; - import org.junit.Test; +import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.binding.generator.util.BindingTypes; import org.opendaylight.yangtools.binding.generator.util.Types; import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; -import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; -import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; public class GeneratorJavaFileTest { diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/NestedGroupingCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/NestedGroupingCompilationTest.java index 6431e387f5..abe556f6be 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/NestedGroupingCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/NestedGroupingCompilationTest.java @@ -18,13 +18,14 @@ import static org.opendaylight.yangtools.sal.java.api.generator.test.Compilation import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.cleanUp; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.testCompilation; + import com.google.common.collect.ImmutableSet; import java.io.File; import java.net.URL; import java.net.URLClassLoader; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java index eeb6dd4cb2..3da8edee7d 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.sal.java.api.generator.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; import java.io.File; @@ -22,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionTypedefUnusedImportTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionTypedefUnusedImportTest.java index e77882cb5f..c3e984940b 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionTypedefUnusedImportTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionTypedefUnusedImportTest.java @@ -15,6 +15,7 @@ import static org.opendaylight.yangtools.sal.java.api.generator.test.Compilation import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.cleanUp; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.getSourceFiles; import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.testCompilation; + import java.io.File; import java.io.IOException; import java.net.URISyntaxException; @@ -25,7 +26,7 @@ import java.nio.file.Paths; import java.util.HashSet; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionWithIdentityrefTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionWithIdentityrefTest.java index 7509d5c01a..bc5baeef3e 100644 --- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionWithIdentityrefTest.java +++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/UnionWithIdentityrefTest.java @@ -20,7 +20,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.List; import org.junit.Test; -import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; -- 2.36.6