From cd908b7b26a557dca95705fcd0db4b9a1ae1a927 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Tue, 6 Aug 2013 13:58:29 +0200 Subject: [PATCH] Renamed base package names from org.opendaylight.controller to org.opendaylight.yangtools. Updated imports. Signed-off-by: Martin Vitez --- .../generator/api/BindingGenerator.java | 4 +- .../binding/generator/api/package-info.java | 2 +- .../generator/impl/BindingGeneratorImpl.java | 36 +++++++------- .../binding/generator/impl/package-info.java | 2 +- .../sal/binding/yang/types/BaseYangTypes.java | 8 ++-- .../GroupingDefinitionDependencySort.java | 4 +- .../binding/yang/types/TypeProviderImpl.java | 30 ++++++------ .../yang/types/UnionDependencySort.java | 2 +- .../sal/binding/yang/types/package-info.java | 2 +- .../impl/AugmentRleativeXPathTest.java | 14 +++--- .../generator/impl/AugmentedTypeTest.java | 14 +++--- .../generator/impl/BaseTypeProvider.java | 14 +++--- .../generator/impl/BinaryTypeTest.java | 6 +-- .../impl/BitAndUnionTOEnclosingTest.java | 12 ++--- .../impl/ChoiceCaseGenTypesTest.java | 17 +++---- .../generator/impl/ControllerTest.java | 6 +-- .../impl/DefinedTypesProviderTest.java | 2 +- .../generator/impl/ExtendedTypedefTest.java | 12 ++--- .../generator/impl/GenEnumResolvingTest.java | 14 +++--- .../generator/impl/GenTypesSubSetTest.java | 6 +-- .../impl/GeneratedTypesBitsTest.java | 16 +++---- .../impl/GeneratedTypesStringTest.java | 12 ++--- .../generator/impl/GeneratedTypesTest.java | 14 +++--- .../impl/MethodSignaturePattern.java | 2 +- .../generator/impl/SupportTestUtil.java | 10 ++-- .../generator/impl/UnionTypeDefTest.java | 6 +-- .../sal/binding/generator/impl/UsesTest.java | 17 +++---- .../binding/generator/spi/package-info.java | 8 ---- .../spi/BindingGeneratorServiceProvider.java | 2 +- .../binding/generator/spi/TypeProvider.java | 4 +- .../generator/spi/TypeProviderFactory.java | 2 +- .../generator/spi/YANGModuleIdentifier.java | 2 +- .../binding/generator/spi}/package-info.java | 2 +- .../generator/util/AbstractBaseType.java | 4 +- .../generator/util/BindingGeneratorUtil.java | 6 +-- .../generator/util/ReferencedTypeImpl.java | 2 +- .../binding/generator/util/TypeConstants.java | 2 +- .../binding/generator/util/Types.java | 14 +++--- .../type/builder/AbstractGeneratedType.java | 8 ++-- .../builder/AbstractGeneratedTypeBuilder.java | 12 ++--- .../type/builder/AbstractTypeMember.java | 10 ++-- .../builder/AbstractTypeMemberBuilder.java | 12 ++--- .../builder/AnnotationTypeBuilderImpl.java | 8 ++-- .../generated/type/builder/ConstantImpl.java | 6 +-- .../type/builder/EnumerationBuilderImpl.java | 14 +++--- .../builder/GeneratedPropertyBuilderImpl.java | 10 ++-- .../type/builder/GeneratedPropertyImpl.java | 10 ++-- .../type/builder/GeneratedTOBuilderImpl.java | 6 +-- .../builder/GeneratedTypeBuilderImpl.java | 10 ++-- .../type/builder/MethodParameterImpl.java | 6 +-- .../builder/MethodSignatureBuilderImpl.java | 10 ++-- .../type/builder/MethodSignatureImpl.java | 10 ++-- .../binding/generator/util}/package-info.java | 2 +- .../type/builder/AnnotationBuilderTest.java | 37 +++++++------- .../java/api/generator/BuilderGenerator.java | 11 +++-- .../java/api/generator/BuilderTemplate.xtend | 18 +++---- .../java/api/generator/ClassGenerator.java | 9 ++-- .../java/api/generator/ClassTemplate.xtend | 14 +++--- .../sal/java/api/generator/Constants.java | 2 +- .../sal/java/api/generator/EnumGenerator.java | 9 ++-- .../sal/java/api/generator/EnumTemplate.xtend | 4 +- .../java/api/generator/GeneratorJavaFile.java | 14 ++++-- .../sal/java/api/generator/GeneratorUtil.java | 48 +++++++++---------- .../api/generator/InterfaceGenerator.java | 13 ++--- .../api/generator/InterfaceTemplate.xtend | 16 +++---- .../sal/java/api/generator/package-info.java | 8 ++++ .../test/ClassCodeGeneratorTest.java | 24 +++++----- ...InnerClassForBitsAndUnionInLeavesTest.java | 14 +++--- .../generator/test/GeneratorJavaFileTest.java | 32 ++++++------- .../java/api/generator/test/package-info.java | 2 +- .../sal/binding/model/api/WildcardType.java | 5 -- .../sal/binding/model/api/AccessModifier.java | 2 +- .../sal/binding/model/api/AnnotationType.java | 2 +- .../sal/binding/model/api/CodeGenerator.java | 2 +- .../sal/binding/model/api/ConcreteType.java | 2 +- .../sal/binding/model/api/Constant.java | 2 +- .../sal/binding/model/api/Enumeration.java | 2 +- .../binding/model/api/GeneratedProperty.java | 2 +- .../api/GeneratedTransferIdentityObject.java | 2 +- .../model/api/GeneratedTransferObject.java | 2 +- .../sal/binding/model/api/GeneratedType.java | 8 ++-- .../binding/model/api/MethodSignature.java | 2 +- .../binding/model/api/ParameterizedType.java | 2 +- .../sal/binding/model/api/Type.java | 2 +- .../sal/binding/model/api/TypeMember.java | 2 +- .../sal/binding/model/api/WildcardType.java | 5 ++ .../sal/binding/model/api/package-info.java | 2 +- .../type/builder/AnnotationTypeBuilder.java | 6 +-- .../api/type/builder/ConstantBuilder.java | 6 +-- .../model/api/type/builder/EnumBuilder.java | 6 +-- .../builder/GeneratedPropertyBuilder.java | 6 +-- .../api/type/builder/GeneratedTOBuilder.java | 4 +- .../type/builder/GeneratedTypeBuilder.java | 8 ++-- .../type/builder/MethodSignatureBuilder.java | 6 +-- .../api/type/builder/TypeMemberBuilder.java | 6 +-- .../model/api/type/builder/package-info.java | 2 +- .../model/api/type/provider/package-info.java | 2 +- .../sal/api/gen/plugin/CodeGeneratorImpl.java | 16 +++---- .../samples/maven-code-gen-sample/pom.xml | 2 +- .../samples/modeling-sample/pom.xml | 2 +- model/pom.xml | 2 +- 101 files changed, 432 insertions(+), 429 deletions(-) rename code-generator/binding-generator-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/api/BindingGenerator.java (89%) rename code-generator/binding-generator-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/api/package-info.java (83%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/BindingGeneratorImpl.java (97%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/package-info.java (83%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/yang/types/BaseYangTypes.java (90%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/yang/types/GroupingDefinitionDependencySort.java (96%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/yang/types/TypeProviderImpl.java (96%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/yang/types/UnionDependencySort.java (98%) rename code-generator/binding-generator-impl/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/yang/types/package-info.java (82%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/AugmentRleativeXPathTest.java (92%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/AugmentedTypeTest.java (94%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/BaseTypeProvider.java (72%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/BinaryTypeTest.java (90%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java (92%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java (93%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/ControllerTest.java (89%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/DefinedTypesProviderTest.java (84%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/ExtendedTypedefTest.java (93%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/GenEnumResolvingTest.java (94%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/GenTypesSubSetTest.java (94%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/GeneratedTypesBitsTest.java (89%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/GeneratedTypesStringTest.java (91%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/GeneratedTypesTest.java (98%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/MethodSignaturePattern.java (84%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/SupportTestUtil.java (90%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/UnionTypeDefTest.java (90%) rename code-generator/binding-generator-impl/src/test/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/impl/UsesTest.java (97%) delete mode 100644 code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/package-info.java rename code-generator/binding-generator-spi/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/spi/BindingGeneratorServiceProvider.java (84%) rename code-generator/binding-generator-spi/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/spi/TypeProvider.java (89%) rename code-generator/binding-generator-spi/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/spi/TypeProviderFactory.java (84%) rename code-generator/binding-generator-spi/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/generator/spi/YANGModuleIdentifier.java (84%) rename code-generator/{binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util => binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi}/package-info.java (81%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/AbstractBaseType.java (91%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/BindingGeneratorUtil.java (97%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/ReferencedTypeImpl.java (93%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/TypeConstants.java (71%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/Types.java (90%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/AbstractGeneratedType.java (95%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java (94%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/AbstractTypeMember.java (91%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java (90%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java (96%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/ConstantImpl.java (94%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java (95%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java (81%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java (84%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java (97%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java (88%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/MethodParameterImpl.java (91%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java (89%) rename code-generator/binding-generator-util/src/main/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/MethodSignatureImpl.java (90%) rename code-generator/{binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator => binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util}/package-info.java (82%) rename code-generator/binding-generator-util/src/test/java/org/opendaylight/{controller => yangtools}/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java (91%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/BuilderGenerator.java (61%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/BuilderTemplate.xtend (92%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/ClassGenerator.java (71%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/ClassTemplate.xtend (95%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/Constants.java (96%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/EnumGenerator.java (71%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/EnumTemplate.xtend (85%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/GeneratorJavaFile.java (90%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/GeneratorUtil.java (93%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/InterfaceGenerator.java (68%) rename code-generator/binding-java-api-generator/src/main/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/InterfaceTemplate.xtend (89%) create mode 100644 code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/package-info.java rename code-generator/binding-java-api-generator/src/test/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/test/ClassCodeGeneratorTest.java (85%) rename code-generator/binding-java-api-generator/src/test/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java (92%) rename code-generator/binding-java-api-generator/src/test/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/test/GeneratorJavaFileTest.java (85%) rename code-generator/binding-java-api-generator/src/test/java/org/opendaylight/{controller => yangtools}/sal/java/api/generator/test/package-info.java (81%) delete mode 100644 code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/WildcardType.java rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/AccessModifier.java (87%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/AnnotationType.java (98%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/CodeGenerator.java (86%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/ConcreteType.java (88%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/Constant.java (94%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/Enumeration.java (93%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/GeneratedProperty.java (92%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/GeneratedTransferIdentityObject.java (61%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/GeneratedTransferObject.java (98%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/GeneratedType.java (97%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/MethodSignature.java (97%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/ParameterizedType.java (93%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/Type.java (93%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/TypeMember.java (96%) create mode 100644 code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/package-info.java (84%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java (94%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/ConstantBuilder.java (67%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/EnumBuilder.java (87%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java (87%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/GeneratedTOBuilder.java (96%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java (96%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/MethodSignatureBuilder.java (92%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/TypeMemberBuilder.java (90%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/builder/package-info.java (55%) rename code-generator/binding-model-api/src/main/java/org/opendaylight/{controller => yangtools}/sal/binding/model/api/type/provider/package-info.java (55%) rename code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/{controller => yangtools}/maven/sal/api/gen/plugin/CodeGeneratorImpl.java (81%) diff --git a/code-generator/binding-generator-api/src/main/java/org/opendaylight/controller/sal/binding/generator/api/BindingGenerator.java b/code-generator/binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java similarity index 89% rename from code-generator/binding-generator-api/src/main/java/org/opendaylight/controller/sal/binding/generator/api/BindingGenerator.java rename to code-generator/binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java index 4c0797069a..9ef4ccde2f 100644 --- a/code-generator/binding-generator-api/src/main/java/org/opendaylight/controller/sal/binding/generator/api/BindingGenerator.java +++ b/code-generator/binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/BindingGenerator.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.api; +package org.opendaylight.yangtools.sal.binding.generator.api; import java.util.List; import java.util.Set; -import org.opendaylight.controller.sal.binding.model.api.Type; +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; diff --git a/code-generator/binding-generator-api/src/main/java/org/opendaylight/controller/sal/binding/generator/api/package-info.java b/code-generator/binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java similarity index 83% rename from code-generator/binding-generator-api/src/main/java/org/opendaylight/controller/sal/binding/generator/api/package-info.java rename to code-generator/binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java index 237690c423..13b729648e 100644 --- a/code-generator/binding-generator-api/src/main/java/org/opendaylight/controller/sal/binding/generator/api/package-info.java +++ b/code-generator/binding-generator-api/src/main/java/org/opendaylight/yangtools/sal/binding/generator/api/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.api; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.generator.api; \ No newline at end of file diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java similarity index 97% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java index 3b5272d3f0..37dd77aaa8 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/BindingGeneratorImpl.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java @@ -5,9 +5,9 @@ * 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.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; -import static org.opendaylight.controller.binding.generator.util.BindingGeneratorUtil.*; +import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*; import java.util.ArrayList; @@ -21,22 +21,22 @@ import java.util.concurrent.Future; import javax.management.Notification; -import org.opendaylight.controller.binding.generator.util.ReferencedTypeImpl; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.MethodSignatureBuilder; -import org.opendaylight.controller.sal.binding.yang.types.GroupingDefinitionDependencySort; -import org.opendaylight.controller.sal.binding.yang.types.TypeProviderImpl; +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.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.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.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; +import org.opendaylight.yangtools.sal.binding.yang.types.GroupingDefinitionDependencySort; +import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/package-info.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/package-info.java similarity index 83% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/package-info.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/package-info.java index 741aeefd11..50cbec8f34 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/generator/impl/package-info.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.generator.impl; \ No newline at end of file diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/BaseYangTypes.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java similarity index 90% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/BaseYangTypes.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java index 38486e73f9..6f9503ae4f 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/BaseYangTypes.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java @@ -5,15 +5,15 @@ * 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.controller.sal.binding.yang.types; +package org.opendaylight.yangtools.sal.binding.yang.types; import java.math.BigInteger; import java.util.HashMap; import java.util.Map; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.controller.sal.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.Type; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public final class BaseYangTypes { diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/GroupingDefinitionDependencySort.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java similarity index 96% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/GroupingDefinitionDependencySort.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java index 2be70b18ef..c065cf3a43 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/GroupingDefinitionDependencySort.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/GroupingDefinitionDependencySort.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.yang.types; +package org.opendaylight.yangtools.sal.binding.yang.types; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -//import org.opendaylight.controller.yang.model.util.GroupingDefinition; +//import org.opendaylight.yangtools.yang.model.util.GroupingDefinition; public class GroupingDefinitionDependencySort { private static final Logger logger = LoggerFactory.getLogger(GroupingDefinitionDependencySort.class); diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/TypeProviderImpl.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java similarity index 96% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/TypeProviderImpl.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java index 7e6f93f9fb..ad1d09435b 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/TypeProviderImpl.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java @@ -5,9 +5,9 @@ * 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.controller.sal.binding.yang.types; +package org.opendaylight.yangtools.sal.binding.yang.types; -import static org.opendaylight.controller.binding.generator.util.BindingGeneratorUtil.*; +import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*; import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*; import java.util.ArrayList; @@ -18,19 +18,19 @@ import java.util.Set; import java.util.TreeMap; import org.apache.commons.lang.StringEscapeUtils; -import org.opendaylight.controller.binding.generator.util.ReferencedTypeImpl; -import org.opendaylight.controller.binding.generator.util.TypeConstants; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.EnumerationBuilderImpl; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.controller.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl; +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.GeneratedTOBuilderImpl; +import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; +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.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.GeneratedTypeBuilder; 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/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/UnionDependencySort.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java similarity index 98% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/UnionDependencySort.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java index 171e1f6e17..2558873f77 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/UnionDependencySort.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.yang.types; +package org.opendaylight.yangtools.sal.binding.yang.types; import java.util.List; import java.util.Map; diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/package-info.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java similarity index 82% rename from code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/package-info.java rename to code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java index 199dfb99ac..809503be5a 100644 --- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/controller/sal/binding/yang/types/package-info.java +++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.yang.types; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.yang.types; \ No newline at end of file diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/AugmentRleativeXPathTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRleativeXPathTest.java similarity index 92% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/AugmentRleativeXPathTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRleativeXPathTest.java index ed84df5771..0063a9d82a 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/AugmentRleativeXPathTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRleativeXPathTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -16,12 +16,12 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/AugmentedTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java similarity index 94% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/AugmentedTypeTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java index f8958c13b5..5c569d3b4f 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/AugmentedTypeTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -16,12 +16,12 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BaseTypeProvider.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java similarity index 72% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BaseTypeProvider.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java index 1ea5d16c02..f07ba14e2c 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BaseTypeProvider.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BaseTypeProvider.java @@ -5,18 +5,18 @@ * 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.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.sal.binding.generator.spi.TypeProvider; -import org.opendaylight.controller.sal.binding.model.api.ConcreteType; -import org.opendaylight.controller.sal.binding.model.api.ParameterizedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.yang.types.BaseYangTypes; +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/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BinaryTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java similarity index 90% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BinaryTypeTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java index e8093e34a6..f5880d9ccc 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BinaryTypeTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -16,8 +16,8 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; +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; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java similarity index 92% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index 1f35b7010c..5545ce63ef 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -16,11 +16,11 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java similarity index 93% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java index e283c65a8a..6d22a01dc4 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java @@ -5,13 +5,10 @@ * 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.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.opendaylight.controller.sal.binding.generator.impl.SupportTestUtil.containsInterface; -import static org.opendaylight.controller.sal.binding.generator.impl.SupportTestUtil.containsSignatures; +import static org.junit.Assert.*; +import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.*; import java.io.File; import java.util.ArrayList; @@ -20,10 +17,10 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ControllerTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java similarity index 89% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ControllerTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java index 8731d7d660..6717ebb491 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ControllerTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -17,8 +17,8 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; +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; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/DefinedTypesProviderTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/DefinedTypesProviderTest.java similarity index 84% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/DefinedTypesProviderTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/DefinedTypesProviderTest.java index 19972c9565..6a69c1e72f 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/DefinedTypesProviderTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/DefinedTypesProviderTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; public class DefinedTypesProviderTest { diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ExtendedTypedefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java similarity index 93% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ExtendedTypedefTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java index f1bcdc5055..ccdda2414c 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/ExtendedTypedefTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -9,11 +9,11 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.yang.types.BaseYangTypes; +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.yangtools.sal.binding.yang.types.BaseYangTypes; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java similarity index 94% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java index 42b68c5080..89389dd173 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenEnumResolvingTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -15,12 +15,12 @@ import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.controller.binding.generator.util.ReferencedTypeImpl; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenTypesSubSetTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java similarity index 94% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenTypesSubSetTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java index 1ac5413490..006aeea2aa 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GenTypesSubSetTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -17,8 +17,8 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; +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; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesBitsTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java similarity index 89% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesBitsTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java index 009fc9f4d3..f79d3a430e 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesBitsTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -8,13 +8,13 @@ import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature.Parameter; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesStringTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java similarity index 91% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesStringTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java index 361fd568d1..8f30354fd7 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesStringTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -9,11 +9,11 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.ParameterizedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java similarity index 98% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java index 88c4ae16cc..df24a06da5 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/GeneratedTypesTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -15,12 +15,12 @@ import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/MethodSignaturePattern.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/MethodSignaturePattern.java similarity index 84% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/MethodSignaturePattern.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/MethodSignaturePattern.java index 6e4d03a825..ac0a27b816 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/MethodSignaturePattern.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/MethodSignaturePattern.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; public class MethodSignaturePattern { final String name; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/SupportTestUtil.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java similarity index 90% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/SupportTestUtil.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java index 101abdb729..3a10c24a51 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/SupportTestUtil.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java @@ -1,14 +1,14 @@ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.List; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.ParameterizedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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; public class SupportTestUtil { diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/UnionTypeDefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java similarity index 90% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/UnionTypeDefTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java index 08ecff8063..b1ed97f1df 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/UnionTypeDefTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; import static org.junit.Assert.*; @@ -16,8 +16,8 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator; +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; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/UsesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java similarity index 97% rename from code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/UsesTest.java rename to code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java index 532d786aee..6a75b97db6 100644 --- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/controller/sal/binding/generator/impl/UsesTest.java +++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java @@ -5,13 +5,10 @@ * 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.controller.sal.binding.generator.impl; +package org.opendaylight.yangtools.sal.binding.generator.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.opendaylight.controller.sal.binding.generator.impl.SupportTestUtil.containsInterface; -import static org.opendaylight.controller.sal.binding.generator.impl.SupportTestUtil.containsSignatures; +import static org.junit.Assert.*; +import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.*; import java.io.File; import java.util.ArrayList; @@ -19,10 +16,10 @@ import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/package-info.java b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/package-info.java deleted file mode 100644 index bf15d8636d..0000000000 --- a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/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.controller.sal.binding.generator.spi; \ No newline at end of file diff --git a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/BindingGeneratorServiceProvider.java b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java similarity index 84% rename from code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/BindingGeneratorServiceProvider.java rename to code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java index 2677221f05..222d02ba59 100644 --- a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/BindingGeneratorServiceProvider.java +++ b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/BindingGeneratorServiceProvider.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.spi; +package org.opendaylight.yangtools.sal.binding.generator.spi; public interface BindingGeneratorServiceProvider { diff --git a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/TypeProvider.java b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java similarity index 89% rename from code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/TypeProvider.java rename to code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java index 6f74f7a8f2..e22d32f2ca 100644 --- a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/TypeProvider.java +++ b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProvider.java @@ -5,9 +5,9 @@ * 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.controller.sal.binding.generator.spi; +package org.opendaylight.yangtools.sal.binding.generator.spi; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public interface TypeProvider { diff --git a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/TypeProviderFactory.java b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java similarity index 84% rename from code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/TypeProviderFactory.java rename to code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java index 1b9156d4c7..0091d36697 100644 --- a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/TypeProviderFactory.java +++ b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/TypeProviderFactory.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.spi; +package org.opendaylight.yangtools.sal.binding.generator.spi; public interface TypeProviderFactory { diff --git a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/YANGModuleIdentifier.java b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/YANGModuleIdentifier.java similarity index 84% rename from code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/YANGModuleIdentifier.java rename to code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/YANGModuleIdentifier.java index 8c547f412f..1e7d98e386 100644 --- a/code-generator/binding-generator-spi/src/main/java/org/opendaylight/controller/sal/binding/generator/spi/YANGModuleIdentifier.java +++ b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/YANGModuleIdentifier.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.generator.spi; +package org.opendaylight.yangtools.sal.binding.generator.spi; import java.net.URI; import java.util.Date; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/package-info.java b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java similarity index 81% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/package-info.java rename to code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java index a5aa2a049e..4b91743f85 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/package-info.java +++ b/code-generator/binding-generator-spi/src/main/java/org/opendaylight/yangtools/sal/binding/generator/spi/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.generator.spi; \ No newline at end of file diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java similarity index 91% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java index a67e4163e9..cf3ff19dc6 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/AbstractBaseType.java @@ -5,9 +5,9 @@ * 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.controller.binding.generator.util; +package org.opendaylight.yangtools.binding.generator.util; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.Type; public class AbstractBaseType implements Type { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java similarity index 97% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java index 86e62acb86..6c8012891f 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.binding.generator.util; +package org.opendaylight.yangtools.binding.generator.util; import java.util.Arrays; import java.util.Calendar; @@ -6,8 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; +import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaNode; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/ReferencedTypeImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/ReferencedTypeImpl.java similarity index 93% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/ReferencedTypeImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/ReferencedTypeImpl.java index bffa013f84..ed1c0e9937 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/ReferencedTypeImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/ReferencedTypeImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util; +package org.opendaylight.yangtools.binding.generator.util; public final class ReferencedTypeImpl extends AbstractBaseType { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/TypeConstants.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/TypeConstants.java similarity index 71% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/TypeConstants.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/TypeConstants.java index 69443aa4d9..9154f1087b 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/TypeConstants.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/TypeConstants.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.binding.generator.util; +package org.opendaylight.yangtools.binding.generator.util; public final class TypeConstants { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/Types.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java similarity index 90% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/Types.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java index ac2630063b..d4735dba3f 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/Types.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java @@ -5,18 +5,18 @@ * 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.controller.binding.generator.util; +package org.opendaylight.yangtools.binding.generator.util; import java.util.List; import java.util.Map; import java.util.Set; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.controller.sal.binding.model.api.ConcreteType; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.ParameterizedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.WildcardType; +import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; +import org.opendaylight.yangtools.sal.binding.model.api.ConcreteType; +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.yangtools.sal.binding.model.api.WildcardType; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.BaseIdentity; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractGeneratedType.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java similarity index 95% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractGeneratedType.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java index 2144597772..1c0c52ed7f 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractGeneratedType.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedType.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.binding.generator.util.AbstractBaseType; -import org.opendaylight.controller.sal.binding.model.api.*; -import org.opendaylight.controller.sal.binding.model.api.type.builder.*; +import org.opendaylight.yangtools.binding.generator.util.AbstractBaseType; +import org.opendaylight.yangtools.sal.binding.model.api.*; +import org.opendaylight.yangtools.sal.binding.model.api.type.builder.*; import java.util.ArrayList; import java.util.Collections; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java similarity index 94% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java index c6abc86032..d47757a14c 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.binding.generator.util.AbstractBaseType; -import org.opendaylight.controller.sal.binding.model.api.AccessModifier; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.*; +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.*; import java.util.ArrayList; import java.util.List; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractTypeMember.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java similarity index 91% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractTypeMember.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java index 5719d35f57..cf0a05c130 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractTypeMember.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMember.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.AccessModifier; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.TypeMember; +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 java.util.Collections; import java.util.List; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java similarity index 90% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java index 677c5e283c..f4ca581661 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.AccessModifier; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.TypeMemberBuilder; +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 java.util.ArrayList; import java.util.List; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java similarity index 96% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java index 3b49952483..0c617152c6 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -5,15 +5,15 @@ * 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.controller.binding.generator.util.generated.type.builder; +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.controller.binding.generator.util.AbstractBaseType; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.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; final class AnnotationTypeBuilderImpl extends AbstractBaseType implements AnnotationTypeBuilder { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/ConstantImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java similarity index 94% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/ConstantImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java index 5d7ba4ee4c..b77b59a387 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/ConstantImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/ConstantImpl.java @@ -5,10 +5,10 @@ * 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.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.Constant; +import org.opendaylight.yangtools.sal.binding.model.api.Type; final class ConstantImpl implements Constant { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java similarity index 95% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java index c45c76584b..11bee9f8a9 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java @@ -5,18 +5,18 @@ * 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.controller.binding.generator.util.generated.type.builder; +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.controller.binding.generator.util.AbstractBaseType; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.controller.sal.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.Enumeration; +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; public final class EnumerationBuilderImpl extends AbstractBaseType implements EnumBuilder { private final String packageName; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java similarity index 81% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java index 888608540c..e92564e2bd 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; +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 java.util.List; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java similarity index 84% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java index 6d11bfdc81..38902cf0a8 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedPropertyImpl.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.AccessModifier; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.Type; +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 java.util.List; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java similarity index 97% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java index 571bc4aaae..02c0ff6493 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java @@ -5,10 +5,10 @@ * 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.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.*; -import org.opendaylight.controller.sal.binding.model.api.type.builder.*; +import org.opendaylight.yangtools.sal.binding.model.api.*; +import org.opendaylight.yangtools.sal.binding.model.api.type.builder.*; import java.util.ArrayList; import java.util.Collections; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java similarity index 88% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java index a3ffbda4f5..1bc0b05103 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.*; +import org.opendaylight.yangtools.sal.binding.model.api.Constant; +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.*; import java.util.List; diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodParameterImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java similarity index 91% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodParameterImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java index b5c1881555..4e3b6e1f3f 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodParameterImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodParameterImpl.java @@ -5,10 +5,10 @@ * 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.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature.Parameter; +import org.opendaylight.yangtools.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature.Parameter; final class MethodParameterImpl implements Parameter { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java similarity index 89% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java index 92a46ff367..f5782ad10b 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java @@ -5,15 +5,15 @@ * 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.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; import java.util.ArrayList; import java.util.List; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.MethodSignatureBuilder; +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; final class MethodSignatureBuilderImpl extends AbstractTypeMemberBuilder implements MethodSignatureBuilder { diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodSignatureImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java similarity index 90% rename from code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodSignatureImpl.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java index 5be1cc933b..1351df3ad4 100644 --- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/MethodSignatureImpl.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/MethodSignatureImpl.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import org.opendaylight.controller.sal.binding.model.api.AccessModifier; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; +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 java.util.Collections; import java.util.List; diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/package-info.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/package-info.java similarity index 82% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/package-info.java rename to code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/package-info.java index ac84b77260..81a6bc2f4c 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/package-info.java +++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.java.api.generator; \ No newline at end of file +package org.opendaylight.yangtools.binding.generator.util; \ No newline at end of file diff --git a/code-generator/binding-generator-util/src/test/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java b/code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java similarity index 91% rename from code-generator/binding-generator-util/src/test/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java rename to code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java index 0f2daa86c3..63f91d5755 100644 --- a/code-generator/binding-generator-util/src/test/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java +++ b/code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/AnnotationBuilderTest.java @@ -5,26 +5,23 @@ * 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.controller.binding.generator.util.generated.type.builder; +package org.opendaylight.yangtools.binding.generator.util.generated.type.builder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.MethodSignatureBuilder; +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.GeneratedTransferObject; +import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder; +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; public class AnnotationBuilderTest { @@ -105,14 +102,14 @@ public class AnnotationBuilderTest { final List annotations = genType.getMethodDefinitions() .get(0).getAnnotations(); assertEquals(2, annotations.size()); - + int annotCount = 0; for (final AnnotationType annotation : annotations) { if (annotation.getPackageName().equals("org.springframework.jmx.export.annotation") && annotation.getName().equals("ManagedAttribute")) { annotCount++; assertEquals(4, annotation.getParameters().size()); - + assertNotNull(annotation.getParameter("description")); assertNotNull(annotation.getParameter("currencyTimeLimit")); assertNotNull(annotation.getParameter("defaultValue")); @@ -125,7 +122,7 @@ public class AnnotationBuilderTest { if (annotation.getPackageName().equals("org.springframework.jmx.export.annotation") && annotation.getName().equals("ManagedOperation")) { annotCount++; - + assertEquals(1, annotation.getParameters().size()); assertNotNull(annotation.getParameter("types")); assertEquals(3, annotation.getParameter("types").getValues().size()); @@ -171,14 +168,14 @@ public class AnnotationBuilderTest { final List annotations = genTransObj.getProperties() .get(0).getAnnotations(); assertEquals(2, annotations.size()); - + int annotCount = 0; for (final AnnotationType annotation : annotations) { if (annotation.getPackageName().equals("org.springframework.jmx.export.annotation") && annotation.getName().equals("ManagedAttribute")) { annotCount++; assertEquals(4, annotation.getParameters().size()); - + assertNotNull(annotation.getParameter("description")); assertNotNull(annotation.getParameter("currencyTimeLimit")); assertNotNull(annotation.getParameter("defaultValue")); @@ -191,7 +188,7 @@ public class AnnotationBuilderTest { if (annotation.getPackageName().equals("org.springframework.jmx.export.annotation") && annotation.getName().equals("ManagedOperation")) { annotCount++; - + assertEquals(1, annotation.getParameters().size()); assertNotNull(annotation.getParameter("types")); assertEquals(3, annotation.getParameter("types").getValues().size()); diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/BuilderGenerator.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java similarity index 61% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/BuilderGenerator.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java index ec99f1edac..8f3a70ef3d 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/BuilderGenerator.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderGenerator.java @@ -1,13 +1,14 @@ -package org.opendaylight.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import org.opendaylight.controller.sal.binding.model.api.CodeGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.java.api.generator.BuilderTemplate; +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; public final class BuilderGenerator implements CodeGenerator { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/BuilderTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend similarity index 92% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/BuilderTemplate.xtend rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend index 6fe9c1b32d..96c7445e9b 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/BuilderTemplate.xtend +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend @@ -1,17 +1,17 @@ -package org.opendaylight.controller.sal.java.api.generator +package org.opendaylight.yangtools.sal.java.api.generator import java.util.LinkedHashSet import java.util.List import java.util.Map import java.util.Set -import org.opendaylight.controller.binding.generator.util.ReferencedTypeImpl -import org.opendaylight.controller.binding.generator.util.Types -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.controller.sal.binding.model.api.GeneratedType -import org.opendaylight.controller.sal.binding.model.api.MethodSignature -import org.opendaylight.controller.sal.binding.model.api.Type +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.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.yangtools.yang.binding.Augmentable class BuilderTemplate { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/ClassGenerator.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassGenerator.java similarity index 71% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/ClassGenerator.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassGenerator.java index 17940a0daf..063559a88b 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/ClassGenerator.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassGenerator.java @@ -5,15 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import org.opendaylight.controller.sal.binding.model.api.CodeGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.java.api.generator.ClassTemplate; +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; public final class ClassGenerator implements CodeGenerator { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/ClassTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend similarity index 95% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/ClassTemplate.xtend rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend index 47a94eb9f4..fb5bff3cc0 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/ClassTemplate.xtend +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend @@ -1,13 +1,13 @@ -package org.opendaylight.controller.sal.java.api.generator +package org.opendaylight.yangtools.sal.java.api.generator import java.util.List import java.util.Map -import org.opendaylight.controller.binding.generator.util.TypeConstants -import org.opendaylight.controller.sal.binding.model.api.Constant -import org.opendaylight.controller.sal.binding.model.api.Enumeration -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.controller.sal.binding.model.api.Type +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.GeneratedProperty +import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject +import org.opendaylight.yangtools.sal.binding.model.api.Type class ClassTemplate { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/Constants.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/Constants.java similarity index 96% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/Constants.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/Constants.java index 8f5c456f87..05b093b31c 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/Constants.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/Constants.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; final class Constants { public static final String IFC = "interface"; diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/EnumGenerator.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java similarity index 71% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/EnumGenerator.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java index f2acefd169..0c54fe8842 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/EnumGenerator.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumGenerator.java @@ -5,15 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import org.opendaylight.controller.sal.binding.model.api.CodeGenerator; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.java.api.generator.EnumTemplate; +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; public class EnumGenerator implements CodeGenerator { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/EnumTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend similarity index 85% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/EnumTemplate.xtend rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend index 62e24ab53e..e762ed7267 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/EnumTemplate.xtend +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend @@ -1,6 +1,6 @@ -package org.opendaylight.controller.sal.java.api.generator +package org.opendaylight.yangtools.sal.java.api.generator -import org.opendaylight.controller.sal.binding.model.api.Enumeration +import org.opendaylight.yangtools.sal.binding.model.api.Enumeration class EnumTemplate { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java similarity index 90% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java index a7496e8c96..8f114b3536 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorJavaFile.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorJavaFile.java @@ -5,15 +5,23 @@ * 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.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; -import java.io.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opendaylight.controller.sal.binding.model.api.*; +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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java similarity index 93% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java index 34e9abd4b1..7a7da13123 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java @@ -5,32 +5,32 @@ * 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.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; -import static org.opendaylight.controller.sal.java.api.generator.Constants.COMMA; +import static org.opendaylight.yangtools.sal.java.api.generator.Constants.COMMA; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.opendaylight.controller.binding.generator.util.TypeConstants; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.ParameterizedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.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.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 { private GeneratorUtil() { } - + public static Map createImports(GeneratedType genType) { if (genType == null) { throw new IllegalArgumentException("Generated Type cannot be NULL!"); @@ -97,7 +97,7 @@ public final class GeneratorUtil { return imports; } - + public static void putTypeIntoImports(final GeneratedType parentGenType, final Type type, final Map imports) { if (parentGenType == null) { @@ -139,7 +139,7 @@ public final class GeneratorUtil { } } } - + public static boolean isConstantInTO(String constName, GeneratedTransferObject genTO) { if (constName == null || genTO == null) throw new IllegalArgumentException(); @@ -152,7 +152,7 @@ public final class GeneratorUtil { } return false; } - + public static Map createChildImports(GeneratedType genType) { Map childImports = new LinkedHashMap<>(); List childGeneratedTypes = genType.getEnclosedTypes(); @@ -219,7 +219,7 @@ public final class GeneratorUtil { return builder.toString(); } } - + private static String getParameters(final GeneratedType parentGenType, final Type[] pTypes, Map availableImports) { final StringBuilder builder = new StringBuilder(); for (int i = 0; i < pTypes.length; i++) { @@ -245,11 +245,11 @@ public final class GeneratorUtil { } return builder.toString(); } - + /** * The method returns reference to highest (top parent) Generated Transfer * Object. - * + * * @param childTransportObject * is generated transfer object which can be extended by other * generated transfer object @@ -267,11 +267,11 @@ public final class GeneratorUtil { return getTopParrentTransportObject(childTransportObject.getExtends()); } } - + /** * The method selects from input list of properties only those which have * read only attribute set to true. - * + * * @param properties * contains list of properties of generated transfer object * @return subset of properties which have read only attribute @@ -288,12 +288,12 @@ public final class GeneratorUtil { } return readOnlyProperties; } - + /** * The method returns the list of the properties of all extending generated * transfer object from genTO to highest parent generated * transfer object - * + * * @param genTO * @return the list of all properties from actual to highest parent * generated transfer object. In case when extension exists the @@ -309,5 +309,5 @@ public final class GeneratorUtil { } return propertiesOfAllParents; } - + } diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java similarity index 68% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java index 381b157578..088c9d6e6e 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceGenerator.java +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceGenerator.java @@ -5,16 +5,17 @@ * 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.controller.sal.java.api.generator; +package org.opendaylight.yangtools.sal.java.api.generator; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import org.opendaylight.controller.sal.binding.model.api.CodeGenerator; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.java.api.generator.InterfaceTemplate; +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; public final class InterfaceGenerator implements CodeGenerator { @@ -28,5 +29,5 @@ public final class InterfaceGenerator implements CodeGenerator { } return writer; } - + } diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend similarity index 89% rename from code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceTemplate.xtend rename to code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend index fb9d606272..f70afadb10 100644 --- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/InterfaceTemplate.xtend +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend @@ -1,14 +1,14 @@ -package org.opendaylight.controller.sal.java.api.generator +package org.opendaylight.yangtools.sal.java.api.generator import java.util.List import java.util.Map -import org.opendaylight.controller.binding.generator.util.TypeConstants -import org.opendaylight.controller.sal.binding.model.api.Constant -import org.opendaylight.controller.sal.binding.model.api.Enumeration -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject -import org.opendaylight.controller.sal.binding.model.api.GeneratedType -import org.opendaylight.controller.sal.binding.model.api.MethodSignature -import org.opendaylight.controller.sal.binding.model.api.Type +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.Type import java.util.LinkedHashMap class InterfaceTemplate { diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/package-info.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/package-info.java new file mode 100644 index 0000000000..7d6ee7573c --- /dev/null +++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/package-info.java @@ -0,0 +1,8 @@ +/* + * 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.java.api.generator; \ No newline at end of file diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/ClassCodeGeneratorTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java similarity index 85% rename from code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/ClassCodeGeneratorTest.java rename to code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java index 3f41f1e134..82ace1c0d7 100644 --- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/ClassCodeGeneratorTest.java +++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/ClassCodeGeneratorTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.java.api.generator.test; +package org.opendaylight.yangtools.sal.java.api.generator.test; import static org.junit.Assert.*; @@ -11,17 +11,17 @@ import java.util.Set; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.controller.binding.generator.util.Types; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.controller.sal.java.api.generator.ClassGenerator; +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.ClassGenerator; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java similarity index 92% rename from code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java rename to code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java index 6943dbf85f..2446b7c952 100644 --- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java +++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GenerateInnerClassForBitsAndUnionInLeavesTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.java.api.generator.test; +package org.opendaylight.yangtools.sal.java.api.generator.test; import static org.junit.Assert.assertTrue; @@ -8,12 +8,12 @@ import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser; diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java similarity index 85% rename from code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java rename to code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java index 3b03a0633b..b2e0985708 100644 --- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/GeneratorJavaFileTest.java +++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.java.api.generator.test; +package org.opendaylight.yangtools.sal.java.api.generator.test; import static org.junit.Assert.*; @@ -26,16 +26,16 @@ import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.controller.sal.java.api.generator.GeneratorJavaFile; -import org.opendaylight.controller.sal.java.api.generator.InterfaceGenerator; +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.impl.BindingGeneratorImpl; +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.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile; +import org.opendaylight.yangtools.sal.java.api.generator.InterfaceGenerator; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; @@ -74,11 +74,11 @@ public class GeneratorJavaFileTest { public void test() throws IOException { final Set types = new HashSet(); GeneratedType t1 = createGeneratedType( - "org.opendaylight.controller.gen", "Type1"); + "org.opendaylight.yangtools.gen", "Type1"); GeneratedType t2 = createGeneratedType( - "org.opendaylight.controller.gen", "Type2"); + "org.opendaylight.yangtools.gen", "Type2"); GeneratedType t3 = createGeneratedType( - "org.opendaylight.controller.gen", "Type3"); + "org.opendaylight.yangtools.gen", "Type3"); types.add(t1); types.add(t2); types.add(t3); @@ -87,7 +87,7 @@ public class GeneratorJavaFileTest { generator.generateToFile(new File(PATH)); String[] files = new File(PATH + FS + "org" + FS + "opendaylight" + FS - + "controller" + FS + "gen").list(); + + "yangtools" + FS + "gen").list(); List filesList = Arrays.asList(files); assertEquals(6, files.length); @@ -147,7 +147,7 @@ public class GeneratorJavaFileTest { List filesList = getJavaFiles(new File(GENERATOR_OUTPUT_PATH)); File current = new File(System.getProperty("user.dir")); File parentPath = current.getParentFile().getParentFile(); - File f = new File(parentPath,"yang/yang-binding/src/main/java/org/opendaylight/controller/yang/binding/DataObject.java" + File f = new File(parentPath,"yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java" ); filesList.add(f); diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/package-info.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/package-info.java similarity index 81% rename from code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/package-info.java rename to code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/package-info.java index 82d666839e..d5156348c3 100644 --- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/controller/sal/java/api/generator/test/package-info.java +++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.java.api.generator.test; \ No newline at end of file +package org.opendaylight.yangtools.sal.java.api.generator.test; \ No newline at end of file diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/WildcardType.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/WildcardType.java deleted file mode 100644 index ad08c2f4dd..0000000000 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/WildcardType.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opendaylight.controller.sal.binding.model.api; - -public interface WildcardType extends Type { - -} diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/AccessModifier.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java similarity index 87% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/AccessModifier.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java index 52529e254e..12b7ed52bd 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/AccessModifier.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AccessModifier.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; /** * Enum definition which provides four access modifiers that are described diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/AnnotationType.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java similarity index 98% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/AnnotationType.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java index eec0339d0f..4b6402763f 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/AnnotationType.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/AnnotationType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.util.List; diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/CodeGenerator.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java similarity index 86% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/CodeGenerator.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java index 092efc066b..58bfb1ea31 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/CodeGenerator.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/CodeGenerator.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.io.IOException; import java.io.Writer; diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/ConcreteType.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java similarity index 88% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/ConcreteType.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java index 7af50a7a62..f57f6e52ca 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/ConcreteType.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ConcreteType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; /** * The Concrete Type is marker interface that encapsulates definition of java diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Constant.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java similarity index 94% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Constant.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java index 921a473341..1fbf325424 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Constant.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Constant.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; /** * Interface Contact is designed to hold and model java constant. In Java diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Enumeration.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java similarity index 93% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Enumeration.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java index 4115424ac8..1bc2f76057 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Enumeration.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Enumeration.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.util.List; diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedProperty.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java similarity index 92% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedProperty.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java index 119823d7a4..63afd0e9b0 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedProperty.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedProperty.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; /** * Generated Property extends interface {@link MethodSignature} interface. diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedTransferIdentityObject.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java similarity index 61% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedTransferIdentityObject.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java index 80bed83fdd..0143ea9c4d 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedTransferIdentityObject.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferIdentityObject.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; public interface GeneratedTransferIdentityObject extends GeneratedTransferObject { diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedTransferObject.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java similarity index 98% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedTransferObject.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java index c848dcd68f..c68a993b43 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedTransferObject.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedTransferObject.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.util.List; diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedType.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java similarity index 97% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedType.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java index 7a1a8f4f27..e215994048 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/GeneratedType.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/GeneratedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.util.List; @@ -28,7 +28,7 @@ import java.util.List; *
  • 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. @@ -82,7 +82,7 @@ public interface GeneratedType extends Type { /** * Returns List of all Enumerator definitions associated with Generated * Type. - * + * * @return List of all Enumerator definitions associated with Generated * Type. */ @@ -97,7 +97,7 @@ public interface GeneratedType extends Type { /** * Returns List of Method Definitions associated with Generated Type. - * + * * @return List of Method Definitions associated with Generated Type. */ public List getMethodDefinitions(); diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/MethodSignature.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java similarity index 97% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/MethodSignature.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java index 88542e86f2..186b540055 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/MethodSignature.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/MethodSignature.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.util.List; diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/ParameterizedType.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java similarity index 93% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/ParameterizedType.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java index 86c4f5af04..adf2cbbcdb 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/ParameterizedType.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/ParameterizedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; /** * Represents an instance of simple parametrized type such as List. diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Type.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java similarity index 93% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Type.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java index c564ab46e4..c5872d3edb 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/Type.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/Type.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; /** * The Type interface defines the base type for all types defined in java. diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/TypeMember.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java similarity index 96% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/TypeMember.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java index e2176ff66d..8003cfd890 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/TypeMember.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/TypeMember.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; +package org.opendaylight.yangtools.sal.binding.model.api; import java.util.List; diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java new file mode 100644 index 0000000000..eeafccd48c --- /dev/null +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/WildcardType.java @@ -0,0 +1,5 @@ +package org.opendaylight.yangtools.sal.binding.model.api; + +public interface WildcardType extends Type { + +} diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/package-info.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java similarity index 84% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/package-info.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java index d969a6fb9f..64d4119dbc 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/package-info.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.model.api; \ No newline at end of file diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java similarity index 94% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java index 543c47b55d..260bdc2451 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/AnnotationTypeBuilder.java @@ -5,12 +5,12 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; import java.util.List; -import org.opendaylight.controller.sal.binding.model.api.AnnotationType; -import org.opendaylight.controller.sal.binding.model.api.Type; +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 diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/ConstantBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java similarity index 67% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/ConstantBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java index fd643783ed..8f320a25fc 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/ConstantBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/ConstantBuilder.java @@ -5,10 +5,10 @@ * 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.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.Constant; +import org.opendaylight.yangtools.sal.binding.model.api.Type; /** * diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/EnumBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java similarity index 87% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/EnumBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java index 5f3d84c1d6..4342cb93d1 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/EnumBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/EnumBuilder.java @@ -5,10 +5,10 @@ * 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.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.Enumeration; +import org.opendaylight.yangtools.sal.binding.model.api.Type; /** * Enum Builder is interface that contains methods to build and instantiate diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java similarity index 87% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java index f1df1fbc3b..b9a5dc3714 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedPropertyBuilder.java @@ -5,10 +5,10 @@ * 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.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty; -import org.opendaylight.controller.sal.binding.model.api.Type; +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 diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedTOBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java similarity index 96% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedTOBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java index d6cc2f55d6..c693232d24 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedTOBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTOBuilder.java @@ -5,9 +5,9 @@ * 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.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject; /** * Generated Transfer Object Builder is interface that contains methods to build diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java similarity index 96% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java index 5a0cc123fa..acf8043a35 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/GeneratedTypeBuilder.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.Constant; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.Constant; +import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.sal.binding.model.api.Type; /** * Generated Type Builder interface is helper interface for building and diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/MethodSignatureBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java similarity index 92% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/MethodSignatureBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java index 70ea9bbb00..4785410a6e 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/MethodSignatureBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/MethodSignatureBuilder.java @@ -6,10 +6,10 @@ * Copyright (c) 2013 by Cisco Systems, Inc. * All rights reserved. */ -package org.opendaylight.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.MethodSignature; -import org.opendaylight.controller.sal.binding.model.api.Type; +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 diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/TypeMemberBuilder.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java similarity index 90% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/TypeMemberBuilder.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java index de19360dc2..360a141a06 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/TypeMemberBuilder.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/TypeMemberBuilder.java @@ -1,7 +1,7 @@ -package org.opendaylight.controller.sal.binding.model.api.type.builder; +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; -import org.opendaylight.controller.sal.binding.model.api.AccessModifier; -import org.opendaylight.controller.sal.binding.model.api.Type; +import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.sal.binding.model.api.Type; /** * diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/package-info.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java similarity index 55% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/package-info.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java index ff2c06e757..f35ec1ff48 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/builder/package-info.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/builder/package-info.java @@ -6,4 +6,4 @@ * Copyright (c) 2013 by Cisco Systems, Inc. * All rights reserved. */ -package org.opendaylight.controller.sal.binding.model.api.type.builder; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.model.api.type.builder; \ No newline at end of file diff --git a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/provider/package-info.java b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/provider/package-info.java similarity index 55% rename from code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/provider/package-info.java rename to code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/provider/package-info.java index 6fcb1a82ca..87f96f5444 100644 --- a/code-generator/binding-model-api/src/main/java/org/opendaylight/controller/sal/binding/model/api/type/provider/package-info.java +++ b/code-generator/binding-model-api/src/main/java/org/opendaylight/yangtools/sal/binding/model/api/type/provider/package-info.java @@ -6,4 +6,4 @@ * Copyright (c) 2013 by Cisco Systems, Inc. * All rights reserved. */ -package org.opendaylight.controller.sal.binding.model.api.type.provider; \ No newline at end of file +package org.opendaylight.yangtools.sal.binding.model.api.type.provider; \ No newline at end of file diff --git a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java similarity index 81% rename from code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java rename to code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java index 4ce8adcec9..5266f2b4c8 100644 --- a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/controller/maven/sal/api/gen/plugin/CodeGeneratorImpl.java +++ b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.maven.sal.api.gen.plugin; +package org.opendaylight.yangtools.maven.sal.api.gen.plugin; import java.io.File; import java.io.IOException; @@ -17,13 +17,13 @@ import java.util.Set; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; -import org.opendaylight.controller.sal.binding.generator.api.BindingGenerator; -import org.opendaylight.controller.sal.binding.generator.impl.BindingGeneratorImpl; -import org.opendaylight.controller.sal.binding.model.api.Enumeration; -import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.controller.sal.binding.model.api.GeneratedType; -import org.opendaylight.controller.sal.binding.model.api.Type; -import org.opendaylight.controller.sal.java.api.generator.GeneratorJavaFile; +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.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.yangtools.sal.java.api.generator.GeneratorJavaFile; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang2sources.spi.CodeGenerator; diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml index 01546945a5..bb9cd1bd1d 100644 --- a/code-generator/samples/maven-code-gen-sample/pom.xml +++ b/code-generator/samples/maven-code-gen-sample/pom.xml @@ -24,7 +24,7 @@ - org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl target/generated-sources/sal diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml index 742ac4ec06..d91b6b75b7 100644 --- a/code-generator/samples/modeling-sample/pom.xml +++ b/code-generator/samples/modeling-sample/pom.xml @@ -24,7 +24,7 @@ - org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl target/generated-sources/sal diff --git a/model/pom.xml b/model/pom.xml index 06fa951eb6..7067230e2a 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -37,7 +37,7 @@ - org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl target/generated-sources/sal -- 2.36.6