From: Robert Varga Date: Thu, 20 Jun 2024 12:27:23 +0000 (+0200) Subject: Rename opendaylight.mdsal.binding.model.api X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F112236%2F2;p=yangtools.git Rename opendaylight.mdsal.binding.model.api Rename opendaylight.mdsal.binding.model.api to opendaylight.yangtools.binding.model.api. JIRA: YANGTOOLS-1576 Change-Id: I699ea8c7bc97128f87bd9159b8683e282a955645 Signed-off-by: Robert Varga --- diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBaseTemplate.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBaseTemplate.java index 25853fe39e..3c1e4da4a8 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBaseTemplate.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBaseTemplate.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.java.api.generator; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; /** * Intermediate Java-based parts under {@link BaseTemplate}. diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBuilderTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBuilderTemplate.xtend index 442eb77eb8..c411348da5 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBuilderTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBuilderTemplate.xtend @@ -12,11 +12,11 @@ import java.util.Collection import java.util.Comparator import java.util.List import java.util.Set -import org.opendaylight.mdsal.binding.model.api.AnnotationType -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.AnnotationType +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.Type import org.opendaylight.mdsal.binding.model.ri.BindingTypes import org.opendaylight.yangtools.binding.lib.contract.Naming diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java index 7d0e3170ca..88c12fa8f5 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractJavaGeneratedType.java @@ -20,13 +20,13 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.Enumeration.Pair; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.WildcardType; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.Enumeration.Pair; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.WildcardType; /** * Abstract class representing a generated type, either top-level or nested. It takes care of tracking references diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java index 50e9798df8..f4caa6b913 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractRangeGenerator.java @@ -14,8 +14,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import java.util.function.Function; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AlphabeticallyTypeMemberComparator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AlphabeticallyTypeMemberComparator.java index e0fd371187..43925eda56 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AlphabeticallyTypeMemberComparator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AlphabeticallyTypeMemberComparator.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.binding.java.api.generator; import java.io.Serial; import java.io.Serializable; import java.util.Comparator; -import org.opendaylight.mdsal.binding.model.api.TypeMember; +import org.opendaylight.yangtools.binding.model.api.TypeMember; /** * Alphabetically type member {@link Comparator} which provides sorting by name for type members (variables and methods) diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend index 1adf462210..8972c6ea88 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BaseTemplate.xtend @@ -20,16 +20,16 @@ import java.util.Map.Entry import java.util.StringTokenizer import java.util.regex.Pattern import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.AnnotationType -import org.opendaylight.mdsal.binding.model.api.ConcreteType -import org.opendaylight.mdsal.binding.model.api.Constant -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.JavaTypeName -import org.opendaylight.mdsal.binding.model.api.MethodSignature -import org.opendaylight.mdsal.binding.model.api.Restrictions -import org.opendaylight.mdsal.binding.model.api.Type -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment +import org.opendaylight.yangtools.binding.model.api.AnnotationType +import org.opendaylight.yangtools.binding.model.api.ConcreteType +import org.opendaylight.yangtools.binding.model.api.Constant +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.JavaTypeName +import org.opendaylight.yangtools.binding.model.api.MethodSignature +import org.opendaylight.yangtools.binding.model.api.Restrictions +import org.opendaylight.yangtools.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment import org.opendaylight.mdsal.binding.model.ri.TypeConstants import org.opendaylight.yangtools.binding.lib.BaseIdentity import org.opendaylight.yangtools.binding.lib.contract.Naming diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java index 4c145796d5..cb27e49d30 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratedProperty.java @@ -10,13 +10,13 @@ package org.opendaylight.mdsal.binding.java.api.generator; import static java.util.Objects.requireNonNull; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; final class BuilderGeneratedProperty implements GeneratedProperty { private final MethodSignature getter; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGenerator.java index 30bbff63d0..8089afc6fb 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGenerator.java @@ -8,18 +8,18 @@ package org.opendaylight.mdsal.binding.java.api.generator; import com.google.common.annotations.VisibleForTesting; -import org.opendaylight.mdsal.binding.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTypeBuilder; import org.opendaylight.yangtools.binding.lib.Augmentable; import org.opendaylight.yangtools.binding.lib.Augmentation; import org.opendaylight.yangtools.binding.lib.YangData; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.CodeGenerator; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; /** * Transformator of the data from the virtual form to JAVA programming language. The result source code represent java diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend index e3679745c7..611d6195ae 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderImplTemplate.xtend @@ -20,12 +20,12 @@ import static org.opendaylight.yangtools.binding.lib.contract.Naming.NONNULL_PRE import java.util.Collection import java.util.List import java.util.Optional -import org.opendaylight.mdsal.binding.model.api.AnnotationType -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.MethodSignature -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.AnnotationType +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.MethodSignature +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics +import org.opendaylight.yangtools.binding.model.api.Type import org.opendaylight.mdsal.binding.model.ri.Types import org.opendaylight.yangtools.binding.lib.AbstractAugmentable diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend index 6a08f112ab..c7a2fbb663 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend @@ -24,14 +24,14 @@ import java.util.HashSet import java.util.List import java.util.Map import java.util.Set -import org.opendaylight.mdsal.binding.model.api.AnnotationType -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.JavaTypeName -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.AnnotationType +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.JavaTypeName +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType +import org.opendaylight.yangtools.binding.model.api.Type import org.opendaylight.mdsal.binding.model.ri.TypeConstants import org.opendaylight.mdsal.binding.model.ri.Types import org.opendaylight.yangtools.binding.lib.contract.Naming diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByTypeMemberComparator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByTypeMemberComparator.java index 213bbcbc94..e203b4e7a2 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByTypeMemberComparator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ByTypeMemberComparator.java @@ -16,16 +16,16 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMember; import org.opendaylight.mdsal.binding.model.ri.BaseYangTypes; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.TypeConstants; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMember; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend index 3dde3a09b5..8f66ef4bc3 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend @@ -40,14 +40,14 @@ import java.util.List import java.util.Map import java.util.Set import javax.management.ConstructorParameters -import org.opendaylight.mdsal.binding.model.api.ConcreteType -import org.opendaylight.mdsal.binding.model.api.Constant -import org.opendaylight.mdsal.binding.model.api.Enumeration -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject -import org.opendaylight.mdsal.binding.model.api.JavaTypeName -import org.opendaylight.mdsal.binding.model.api.Restrictions -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.ConcreteType +import org.opendaylight.yangtools.binding.model.api.Constant +import org.opendaylight.yangtools.binding.model.api.Enumeration +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject +import org.opendaylight.yangtools.binding.model.api.JavaTypeName +import org.opendaylight.yangtools.binding.model.api.Restrictions +import org.opendaylight.yangtools.binding.model.api.Type import org.opendaylight.mdsal.binding.model.ri.TypeConstants import org.opendaylight.mdsal.binding.model.ri.Types import org.opendaylight.yangtools.binding.lib.contract.Naming diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/CodeGeneratorGeneratedFile.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/CodeGeneratorGeneratedFile.java index f362d3f421..cabf8c486f 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/CodeGeneratorGeneratedFile.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/CodeGeneratorGeneratedFile.java @@ -12,8 +12,8 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects.ToStringHelper; import java.io.IOException; import java.io.Writer; -import org.opendaylight.mdsal.binding.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.CodeGenerator; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.plugin.generator.api.AbstractGeneratedTextFile; import org.opendaylight.yangtools.plugin.generator.api.GeneratedFileLifecycle; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGenerator.java index a1615ad78a..9280abc0cd 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGenerator.java @@ -7,9 +7,9 @@ */ package org.opendaylight.mdsal.binding.java.api.generator; -import org.opendaylight.mdsal.binding.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.CodeGenerator; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.Type; /** * Transformator of the data from the virtual form to JAVA source code. The result source code represents JAVA diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend index 3fe6a82d2c..420073e5ef 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend @@ -10,9 +10,9 @@ package org.opendaylight.mdsal.binding.java.api.generator import static extension org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil.encodeAngleBrackets import static org.opendaylight.mdsal.binding.model.ri.Types.STRING; -import org.opendaylight.mdsal.binding.model.api.Enumeration -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.JavaTypeName +import org.opendaylight.yangtools.binding.model.api.Enumeration +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.JavaTypeName import org.opendaylight.yangtools.binding.lib.EnumTypeObject /** diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/FeatureTemplate.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/FeatureTemplate.java index e17bfe6eb9..93691fbc95 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/FeatureTemplate.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/FeatureTemplate.java @@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.java.api.generator; import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.YangFeature; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.common.QName; final class FeatureTemplate extends ClassTemplate { diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java index 2c6c5a487d..fc8d6a5160 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtil.java @@ -14,20 +14,20 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.WildcardType; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Single; import org.opendaylight.mdsal.binding.model.ri.TypeConstants; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.WildcardType; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition.Single; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; public final class GeneratorUtil { diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGenerator.java index f6eff74e54..c30e6affe2 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGenerator.java @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.java.api.generator; -import org.opendaylight.mdsal.binding.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.CodeGenerator; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; public final class InterfaceGenerator implements CodeGenerator { diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend index 973c7e2a13..20eec2ced8 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend @@ -27,14 +27,14 @@ import java.util.Locale import java.util.Map.Entry import java.util.Set import org.gaul.modernizer_maven_annotations.SuppressModernizer -import org.opendaylight.mdsal.binding.model.api.AnnotationType -import org.opendaylight.mdsal.binding.model.api.Constant -import org.opendaylight.mdsal.binding.model.api.Enumeration -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.JavaTypeName -import org.opendaylight.mdsal.binding.model.api.MethodSignature -import org.opendaylight.mdsal.binding.model.api.ParameterizedType -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.AnnotationType +import org.opendaylight.yangtools.binding.model.api.Constant +import org.opendaylight.yangtools.binding.model.api.Enumeration +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.JavaTypeName +import org.opendaylight.yangtools.binding.model.api.MethodSignature +import org.opendaylight.yangtools.binding.model.api.ParameterizedType +import org.opendaylight.yangtools.binding.model.api.Type import org.opendaylight.mdsal.binding.model.ri.Types import org.opendaylight.mdsal.binding.model.ri.TypeConstants diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java index 0096a5f0f2..bfe3c0881d 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileGenerator.java @@ -21,11 +21,11 @@ import java.util.Map; import java.util.ServiceLoader; import java.util.Set; import org.opendaylight.mdsal.binding.generator.BindingGenerator; -import org.opendaylight.mdsal.binding.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.YangModelBindingProvider; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.CodeGenerator; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.plugin.generator.api.FileGenerator; import org.opendaylight.yangtools.plugin.generator.api.FileGeneratorException; import org.opendaylight.yangtools.plugin.generator.api.GeneratedFile; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java index 51d0f08483..5e3577540f 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java @@ -37,23 +37,23 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.xtext.xbase.lib.StringExtensions; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Multiple; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition.Single; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.yangtools.binding.lib.Augmentable; import org.opendaylight.yangtools.binding.lib.CodeHelpers; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition.Multiple; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition.Single; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java index 978192fbca..72312b6f88 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java @@ -13,8 +13,8 @@ import java.util.Collection; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ListKeyTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ListKeyTemplate.xtend index 7f3c8bcb92..c4effc8d46 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ListKeyTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ListKeyTemplate.xtend @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.java.api.generator -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty -import org.opendaylight.mdsal.binding.model.api.GeneratedType -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty +import org.opendaylight.yangtools.binding.model.api.GeneratedType +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type import org.opendaylight.mdsal.binding.model.ri.BindingTypes /** diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java index 8f4b2ffa71..c0a72086b4 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/NestedJavaGeneratedType.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.Optional; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; /** * A type which is nested inside some other type. It defers import decisions to its enclosing type, eventually arriving diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TOGenerator.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TOGenerator.java index 6a4843dc44..59eecd61cf 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TOGenerator.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TOGenerator.java @@ -7,10 +7,10 @@ */ package org.opendaylight.mdsal.binding.java.api.generator; -import org.opendaylight.mdsal.binding.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; +import org.opendaylight.yangtools.binding.model.api.CodeGenerator; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; /** * Transformator of the data from the virtual form to JAVA source code. The result source code represents JAVA class. diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TopLevelJavaGeneratedType.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TopLevelJavaGeneratedType.java index 540a044c91..fb1ac66789 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TopLevelJavaGeneratedType.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TopLevelJavaGeneratedType.java @@ -14,8 +14,8 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; /** * This class tracks types generated into a single Java compilation unit (file) and manages imports of that compilation diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtils.java b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtils.java index e2e4da7438..a8487f183f 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtils.java +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtils.java @@ -10,11 +10,11 @@ package org.opendaylight.mdsal.binding.java.api.generator; import static com.google.common.base.Preconditions.checkArgument; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.TypeConstants; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; /** * Random utility methods for dealing with {@link Type} objects. diff --git a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend index 29dcc77e84..c55604dfed 100644 --- a/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend +++ b/binding/binding-codegen/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/UnionTemplate.xtend @@ -19,9 +19,9 @@ import static extension org.opendaylight.mdsal.binding.model.ri.BindingTypes.isB import static extension org.opendaylight.mdsal.binding.model.ri.BindingTypes.isIdentityType import java.util.Base64; -import org.opendaylight.mdsal.binding.model.api.Enumeration -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject -import org.opendaylight.mdsal.binding.model.api.Type +import org.opendaylight.yangtools.binding.model.api.Enumeration +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject +import org.opendaylight.yangtools.binding.model.api.Type /** * Template for generating JAVA class. diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java index 0b1a316a75..5d93e6d85c 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BaseCompilationTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Optional; import org.junit.BeforeClass; import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingGenerator; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.plugin.generator.api.GeneratedFile; import org.opendaylight.yangtools.plugin.generator.api.GeneratedFilePath; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java index 52eca4aa35..5893b1acdc 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderGeneratorTest.java @@ -19,11 +19,11 @@ import java.util.stream.Collectors; import org.eclipse.xtend2.lib.StringConcatenation; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingGenerator; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BuilderGeneratorTest { diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ClassCodeGeneratorTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ClassCodeGeneratorTest.java index 1c9c481f1f..c02e06447f 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ClassCodeGeneratorTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/ClassCodeGeneratorTest.java @@ -16,14 +16,14 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingGenerator; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ClassCodeGeneratorTest { diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGeneratorTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGeneratorTest.java index 480544f011..38cfc15c9e 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGeneratorTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/EnumGeneratorTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Type; public class EnumGeneratorTest { @Test diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorJavaFileTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorJavaFileTest.java index 8c5ee643c2..00c3e8357b 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorJavaFileTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorJavaFileTest.java @@ -15,11 +15,11 @@ import java.util.Arrays; import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; public class GeneratorJavaFileTest extends BaseCompilationTest { private static final String FS = File.separator; diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java index 5ec0dff1d5..01136d7fb4 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorUtilTest.java @@ -24,15 +24,15 @@ import java.lang.reflect.InvocationTargetException; import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; public class GeneratorUtilTest { private static final JavaTypeName ANNOTATION = JavaTypeName.create("tst.package", "tstAnnotationName"); diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGeneratorTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGeneratorTest.java index f572a4613d..df4d045fce 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGeneratorTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceGeneratorTest.java @@ -16,12 +16,12 @@ import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; public class InterfaceGeneratorTest { private static final String TEST = "test"; @@ -144,4 +144,4 @@ public class InterfaceGeneratorTest { doReturn(annotationJavaType).when(annotationType).getIdentifier(); doReturn(ImmutableList.of(annotationType)).when(methSign).getAnnotations(); } -} \ No newline at end of file +} diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/PresenceContainerTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/PresenceContainerTest.java index f578d73274..39980f7e86 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/PresenceContainerTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/PresenceContainerTest.java @@ -16,8 +16,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.XMLNamespace; diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/SpecializingLeafrefTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/SpecializingLeafrefTest.java index eba3d1cc83..441258f921 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/SpecializingLeafrefTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/SpecializingLeafrefTest.java @@ -30,12 +30,12 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; public class SpecializingLeafrefTest extends BaseCompilationTest { private static final ParameterizedType SET_STRING_TYPE = Types.setTypeFor(Types.STRING); diff --git a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtilsTest.java b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtilsTest.java index 2121b5313e..5ac7fd9598 100644 --- a/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtilsTest.java +++ b/binding/binding-codegen/src/test/java/org/opendaylight/mdsal/binding/java/api/generator/TypeUtilsTest.java @@ -13,10 +13,10 @@ import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableList; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; public class TypeUtilsTest { diff --git a/binding/binding-data-codec-api/src/main/java/module-info.java b/binding/binding-data-codec-api/src/main/java/module-info.java index 71cc77ceb4..5a2af3b2c3 100644 --- a/binding/binding-data-codec-api/src/main/java/module-info.java +++ b/binding/binding-data-codec-api/src/main/java/module-info.java @@ -8,9 +8,9 @@ module org.opendaylight.mdsal.binding.dom.codec.api { exports org.opendaylight.mdsal.binding.dom.codec.api; + requires transitive org.opendaylight.yangtools.binding.lib; requires transitive org.opendaylight.yangtools.yang.data.api; requires transitive org.opendaylight.yangtools.yang.model.api; - requires transitive org.opendaylight.yangtools.binding.lib; requires transitive org.opendaylight.mdsal.binding.runtime.api; // Annotations diff --git a/binding/binding-data-codec-dynamic/src/main/java/module-info.java b/binding/binding-data-codec-dynamic/src/main/java/module-info.java index 9878429562..aa32f9e80b 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/module-info.java +++ b/binding/binding-data-codec-dynamic/src/main/java/module-info.java @@ -29,11 +29,11 @@ module org.opendaylight.mdsal.binding.dom.codec.impl { requires com.google.common; requires net.bytebuddy; requires org.opendaylight.mdsal.binding.loader; - requires org.opendaylight.mdsal.binding.model.api; requires org.opendaylight.mdsal.binding.spec.util; + requires org.opendaylight.yangtools.binding.lib; + requires org.opendaylight.yangtools.binding.model.api; requires org.opendaylight.yangtools.concepts; requires org.opendaylight.yangtools.util; - requires org.opendaylight.yangtools.binding.lib; requires org.opendaylight.yangtools.yang.common; requires org.opendaylight.yangtools.yang.data.api; requires org.opendaylight.yangtools.yang.data.spi; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java index 8ca36d0dcd..1c9a9103e4 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingCodecContext.java @@ -55,7 +55,7 @@ import org.opendaylight.mdsal.binding.dom.codec.spi.AbstractBindingNormalizedNod import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices; import org.opendaylight.mdsal.binding.dom.codec.spi.BindingSchemaMapping; import org.opendaylight.mdsal.binding.loader.BindingClassLoader; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.ActionRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.mdsal.binding.runtime.api.ChoiceRuntimeType; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java index c62ed4a14f..05db4cf224 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.dom.codec.api.BindingChoiceCodecTreeNode; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ChoiceRuntimeType; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java index 10cc8f1bc3..b87d376d3a 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.ChoiceRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ContainerLikeRuntimeType; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java index 92166d1e1d..8b4c61854e 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java @@ -32,7 +32,7 @@ import org.opendaylight.mdsal.binding.dom.codec.api.IncorrectNestingException; import org.opendaylight.mdsal.binding.dom.codec.api.MissingClassInLoadingStrategyException; import org.opendaylight.mdsal.binding.dom.codec.api.MissingSchemaException; import org.opendaylight.mdsal.binding.dom.codec.api.MissingSchemaForClassException; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.yangtools.util.ClassLoaderUtils; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerStreamerGenerator.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerStreamerGenerator.java index 4a56498162..c2af1d436d 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerStreamerGenerator.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerStreamerGenerator.java @@ -53,9 +53,9 @@ import org.opendaylight.mdsal.binding.dom.codec.spi.BindingSchemaMapping; import org.opendaylight.mdsal.binding.loader.BindingClassLoader; import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator; import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.Augmentable; import org.opendaylight.yangtools.binding.lib.DataContainer; import org.opendaylight.yangtools.binding.lib.DataObject; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java index ab438f9bcc..1e3f8a8a41 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java @@ -28,8 +28,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.AugmentableRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; diff --git a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java index c3c192eea8..9f72ddd3a9 100644 --- a/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java +++ b/binding/binding-data-codec-dynamic/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java @@ -16,8 +16,8 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.RuntimeGeneratedUnion; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding/binding-model-api/src/main/java/module-info.java b/binding/binding-model-api/src/main/java/module-info.java index c4ab40d013..bb8c940ca5 100644 --- a/binding/binding-model-api/src/main/java/module-info.java +++ b/binding/binding-model-api/src/main/java/module-info.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 */ -module org.opendaylight.mdsal.binding.model.api { - exports org.opendaylight.mdsal.binding.model.api; - exports org.opendaylight.mdsal.binding.model.api.type.builder; +module org.opendaylight.yangtools.binding.model.api { + exports org.opendaylight.yangtools.binding.model.api; + exports org.opendaylight.yangtools.binding.model.api.type.builder; requires transitive org.opendaylight.yangtools.concepts; requires transitive org.opendaylight.yangtools.yang.model.api; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AbstractType.java similarity index 95% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AbstractType.java index f9c19c568d..b6e5af346e 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AbstractType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AbstractType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import com.google.common.annotations.Beta; import org.opendaylight.yangtools.concepts.AbstractSimpleIdentifiable; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AccessModifier.java similarity index 90% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AccessModifier.java index be3cf27421..071d336e49 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AccessModifier.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Enum definition which provides four access modifiers that are described diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AnnotationType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AnnotationType.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AnnotationType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AnnotationType.java index 11c5983baf..257ae5c34f 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/AnnotationType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import java.util.List; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/BaseTypeWithRestrictions.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/BaseTypeWithRestrictions.java similarity index 90% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/BaseTypeWithRestrictions.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/BaseTypeWithRestrictions.java index f3fbff382a..b3ca8d8c1b 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/BaseTypeWithRestrictions.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/BaseTypeWithRestrictions.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * The BaseTypeWithRestrictions is marker interface that encapsulates definition of java diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/CodeGenerator.java similarity index 95% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/CodeGenerator.java index 7096d5239a..6364218534 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/CodeGenerator.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Transforms virtual data to the concrete code in programming language. diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/ConcreteType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/ConcreteType.java similarity index 90% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/ConcreteType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/ConcreteType.java index d07f83d3ad..5c77e6308f 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/ConcreteType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * The Concrete Type is marker interface that encapsulates definition of java diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Constant.java similarity index 96% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Constant.java index d1b778b54f..4246ba0a9b 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Interface Contact is designed to hold and model java constant. In Java there are no constant keywords instead of the diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DefaultType.java similarity index 91% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DefaultType.java index 4211e9de2b..70c27e2a09 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DefaultType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DefaultType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Wraps combination of packageName and name to the object representation. diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DocumentedType.java similarity index 96% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DocumentedType.java index d3eee27133..06e73eb9ba 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/DocumentedType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DocumentedType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Implementing this interface allows an object to hold information which are diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Enumeration.java similarity index 96% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Enumeration.java index 746e55d241..3461da4137 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Enumeration.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import java.util.List; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedProperty.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedProperty.java similarity index 95% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedProperty.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedProperty.java index 72b6724bfa..4c1d5c27ed 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedProperty.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Generated Property extends {@link TypeMember} interface with additional information about fields (and other members) diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedTransferObject.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedTransferObject.java index e297287883..a798469ecf 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedTransferObject.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import java.util.List; import java.util.Optional; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedType.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedType.java index da38098e9c..baab42acd4 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/GeneratedType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import java.util.List; import java.util.Optional; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/JavaTypeName.java similarity index 99% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/JavaTypeName.java index bb34c6bfeb..9db8af13d0 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/JavaTypeName.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/JavaTypeName.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/MethodSignature.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/MethodSignature.java index 0f7b950009..9093573fb5 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import java.util.List; import org.eclipse.jdt.annotation.NonNull; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/ParameterizedType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/ParameterizedType.java similarity index 96% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/ParameterizedType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/ParameterizedType.java index 7a56993166..0b9832b394 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/ParameterizedType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Represents an instance of simple parameterized type such as List<String>. The parameterized Type is designed diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Restrictions.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Restrictions.java index f603f1105d..bff60debbf 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Restrictions.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Restrictions.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Type.java similarity index 97% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Type.java index ef8b75d3a9..194e443d86 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Type.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Identifiable; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeComment.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeComment.java similarity index 94% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeComment.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeComment.java index 4175218da0..bc29047661 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeComment.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeComment.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMember.java similarity index 96% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMember.java index dd312e483a..2e7f4dfcbf 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMember.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import java.util.List; import org.eclipse.jdt.annotation.Nullable; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMemberComment.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMemberComment.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMemberComment.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMemberComment.java index f386ce9887..9f3f1b4541 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/TypeMemberComment.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMemberComment.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import static java.util.Objects.requireNonNull; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/WildcardType.java similarity index 89% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/WildcardType.java index 40b603843c..0c5e1d17a9 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/WildcardType.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/WildcardType.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; /** * Marker interface which assign to object property that it is a bounded wildcard type. diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/YangSourceDefinition.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/YangSourceDefinition.java similarity index 98% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/YangSourceDefinition.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/YangSourceDefinition.java index 1e5ef44e48..a89249e701 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/YangSourceDefinition.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/YangSourceDefinition.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/package-info.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/package-info.java similarity index 95% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/package-info.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/package-info.java index 26ee930515..8fe66e54f7 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/package-info.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/package-info.java @@ -24,4 +24,4 @@ * * */ -package org.opendaylight.mdsal.binding.model.api; \ No newline at end of file +package org.opendaylight.yangtools.binding.model.api; \ No newline at end of file diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotableTypeBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotableTypeBuilder.java similarity index 92% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotableTypeBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotableTypeBuilder.java index 370f810357..78e1ed6713 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotableTypeBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotableTypeBuilder.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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; /** * Common interface for java type builders which allow attaching annotations to them. diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotationTypeBuilder.java similarity index 94% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotationTypeBuilder.java index a8c7205db8..d5e5f2bdd1 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/AnnotationTypeBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.Type; /** * Annotation Type Builder Interface serves for creation and instantiation of diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/ConstantBuilder.java similarity index 76% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/ConstantBuilder.java index 9dd6998478..63715b57c6 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/ConstantBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/ConstantBuilder.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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; -import org.opendaylight.mdsal.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Constant; public interface ConstantBuilder { diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/EnumBuilder.java similarity index 83% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/EnumBuilder.java index 9f66e313db..e194f1c089 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/EnumBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; /** diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedPropertyBuilder.java similarity index 91% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedPropertyBuilder.java index 75d4a6ec7c..5947f3d11c 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedPropertyBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedPropertyBuilder.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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; /** * Generated Property Builder is interface that contains methods to build and instantiate Generated Property definition. diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTOBuilder.java similarity index 93% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTOBuilder.java index a3440dcc1a..bad0cf50c8 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTOBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTOBuilder.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Restrictions; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; /** diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilder.java similarity index 85% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilder.java index 4351129278..5d7b5c9b24 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilder.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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; /** * Generated Type Builder interface is helper interface for building and diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilderBase.java similarity index 93% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilderBase.java index cc7737c938..4cc47fd68d 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/GeneratedTypeBuilderBase.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilderBase.java @@ -5,17 +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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; import java.util.List; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeComment; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeComment; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; public interface GeneratedTypeBuilderBase> extends Type, AnnotableTypeBuilder { /** diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/MethodSignatureBuilder.java similarity index 89% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/MethodSignatureBuilder.java index ce02ba4c09..2a9f835d04 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/MethodSignatureBuilder.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.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; /** * Method Signature Builder serves solely for building Method Signature and diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/TypeMemberBuilder.java similarity index 86% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/TypeMemberBuilder.java index 2f0e204d0c..ef5566311e 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/TypeMemberBuilder.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/TypeMemberBuilder.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api.type.builder; +package org.opendaylight.yangtools.binding.model.api.type.builder; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; public interface TypeMemberBuilder> extends AnnotableTypeBuilder { /** diff --git a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/package-info.java b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/package-info.java similarity index 82% rename from binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/package-info.java rename to binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/package-info.java index 2e475790d3..3324e91e42 100644 --- a/binding/binding-model-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/package-info.java +++ b/binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/package-info.java @@ -5,4 +5,4 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api.type.builder; \ No newline at end of file +package org.opendaylight.yangtools.binding.model.api.type.builder; \ No newline at end of file diff --git a/binding/binding-model-api/src/test/java/org/opendaylight/mdsal/binding/model/api/JavaTypeNameTest.java b/binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/JavaTypeNameTest.java similarity index 98% rename from binding/binding-model-api/src/test/java/org/opendaylight/mdsal/binding/model/api/JavaTypeNameTest.java rename to binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/JavaTypeNameTest.java index 18e9506319..1441fa6661 100644 --- a/binding/binding-model-api/src/test/java/org/opendaylight/mdsal/binding/model/api/JavaTypeNameTest.java +++ b/binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/JavaTypeNameTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import static com.google.common.collect.ImmutableList.of; import static org.junit.Assert.assertEquals; diff --git a/binding/binding-model-api/src/test/java/org/opendaylight/mdsal/binding/model/api/TypeTest.java b/binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/TypeTest.java similarity index 94% rename from binding/binding-model-api/src/test/java/org/opendaylight/mdsal/binding/model/api/TypeTest.java rename to binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/TypeTest.java index d6e2983c16..b2fca6fa9a 100644 --- a/binding/binding-model-api/src/test/java/org/opendaylight/mdsal/binding/model/api/TypeTest.java +++ b/binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/TypeTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding.model.api; +package org.opendaylight.yangtools.binding.model.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/binding/binding-model-ri/src/main/java/module-info.java b/binding/binding-model-ri/src/main/java/module-info.java index c464c4d7d0..e0b6a8dca6 100644 --- a/binding/binding-model-ri/src/main/java/module-info.java +++ b/binding/binding-model-ri/src/main/java/module-info.java @@ -9,9 +9,9 @@ module org.opendaylight.mdsal.binding.model.ri { exports org.opendaylight.mdsal.binding.model.ri; exports org.opendaylight.mdsal.binding.model.ri.generated.type.builder; - requires transitive org.opendaylight.mdsal.binding.model.api; - requires org.opendaylight.yangtools.util; + requires transitive org.opendaylight.yangtools.binding.model.api; requires org.opendaylight.yangtools.binding.lib; + requires org.opendaylight.yangtools.util; requires org.opendaylight.yangtools.yang.common; requires org.opendaylight.yangtools.yang.model.api; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypes.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypes.java index d2941bc140..6d1d3e1bef 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypes.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypes.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.model.ri; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.common.Decimal64; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.Uint16; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BindingTypes.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BindingTypes.java index db975b1026..658df13c6d 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BindingTypes.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/BindingTypes.java @@ -15,12 +15,6 @@ import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.Action; import org.opendaylight.yangtools.binding.lib.Augmentable; import org.opendaylight.yangtools.binding.lib.Augmentation; @@ -48,6 +42,12 @@ import org.opendaylight.yangtools.binding.lib.UnionTypeObject; import org.opendaylight.yangtools.binding.lib.YangData; import org.opendaylight.yangtools.binding.lib.YangFeature; import org.opendaylight.yangtools.binding.lib.annotations.RoutingContext; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.YangDataName; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/Types.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/Types.java index c106468888..8b06ef035d 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/Types.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/Types.java @@ -23,14 +23,14 @@ import java.util.Objects; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.AbstractType; -import org.opendaylight.mdsal.binding.model.api.BaseTypeWithRestrictions; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.WildcardType; +import org.opendaylight.yangtools.binding.model.api.AbstractType; +import org.opendaylight.yangtools.binding.model.api.BaseTypeWithRestrictions; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.WildcardType; public final class Types { private static final LoadingCache, ConcreteType> TYPE_CACHE = CacheBuilder.newBuilder().weakKeys() @@ -243,7 +243,8 @@ public final class Types { } /** - * Creates instance of type {@link org.opendaylight.mdsal.binding.model.api.ParameterizedType ParameterizedType}. + * Creates instance of type + * {@link org.opendaylight.yangtools.binding.model.api.ParameterizedType ParameterizedType}. * * @param type JAVA Type for raw type * @param parameters JAVA Types for actual parameter types @@ -255,7 +256,7 @@ public final class Types { } /** - * Creates instance of type {@link org.opendaylight.mdsal.binding.model.api.WildcardType}. + * Creates instance of type {@link org.opendaylight.yangtools.binding.model.api.WildcardType}. * * @param identifier JavaTypeName of the type * @return WildcardType representation of specified identifier diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java index 79134fcd51..98a6a46927 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java @@ -15,19 +15,19 @@ import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.opendaylight.mdsal.binding.model.api.AbstractType; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.AbstractType; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.EnumBuilder; import org.opendaylight.yangtools.util.LazyCollections; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTOBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTOBuilder.java index 412715ba79..5979c81570 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTOBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTOBuilder.java @@ -11,14 +11,14 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedType.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedType.java index d46799d6c1..68ebf1cb1b 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedType.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedType.java @@ -14,23 +14,23 @@ import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; -import org.opendaylight.mdsal.binding.model.api.AbstractType; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeComment; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.yangtools.binding.model.api.AbstractType; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeComment; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.EnumBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; abstract class AbstractGeneratedType extends AbstractType implements GeneratedType { private final TypeComment comment; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilder.java index 891d8e8085..73e2a06052 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilder.java @@ -14,19 +14,19 @@ import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.opendaylight.mdsal.binding.model.api.AbstractType; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeComment; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.yangtools.binding.model.api.AbstractType; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeComment; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; abstract class AbstractGeneratedTypeBuilder> extends AbstractType diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMember.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMember.java index ab5b73907b..656a93bee3 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMember.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMember.java @@ -9,11 +9,11 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMember; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMember; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; abstract class AbstractTypeMember implements TypeMember { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberBuilder.java index 873674594a..1fbefbaff9 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberBuilder.java @@ -14,13 +14,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.TypeMemberBuilder; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.TypeMemberBuilder; import org.opendaylight.yangtools.util.LazyCollections; abstract class AbstractTypeMemberBuilder> implements TypeMemberBuilder { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationTypeBuilderImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationTypeBuilderImpl.java index 90d8f35a40..953d97aba2 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationTypeBuilderImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -13,10 +13,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.model.api.AbstractType; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.AbstractType; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotationTypeBuilder; import org.opendaylight.yangtools.util.LazyCollections; final class AnnotationTypeBuilderImpl extends AbstractType implements AnnotationTypeBuilder { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java index 01f78395a3..aec7d0fa69 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import static java.util.Objects.requireNonNull; import java.util.Optional; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.TypeComment; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.TypeComment; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; import org.opendaylight.yangtools.yang.model.api.Status; public final class CodegenEnumerationBuilder extends AbstractEnumerationBuilder { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java index e909074c72..c3c123db79 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; public class CodegenGeneratedTOBuilder extends AbstractGeneratedTOBuilder { private Restrictions restrictions; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java index 8263ac588b..a5b4e5ab7b 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java @@ -7,9 +7,9 @@ */ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; public final class CodegenGeneratedTypeBuilder extends AbstractGeneratedTypeBuilder implements GeneratedTypeBuilder { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImpl.java index dafc44d889..7fe3878898 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImpl.java @@ -8,8 +8,8 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.util.Objects; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Type; final class ConstantImpl implements Constant { private final Type type; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImpl.java index ae6e2f3242..0508997ad5 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImpl.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; public final class GeneratedPropertyBuilderImpl extends AbstractTypeMemberBuilder implements GeneratedPropertyBuilder { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImpl.java index c95384ee86..54d6464da7 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImpl.java @@ -8,11 +8,11 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; final class GeneratedPropertyImpl extends AbstractTypeMember implements GeneratedProperty { private final String value; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImpl.java index 4de06016d3..36b2644cd5 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImpl.java @@ -8,8 +8,8 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.util.Objects; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.Parameter; +import org.opendaylight.yangtools.binding.model.api.Type; final class MethodParameterImpl implements Parameter { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImpl.java index 7c70ad7a72..9f248f5217 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImpl.java @@ -12,11 +12,11 @@ import static java.util.Objects.requireNonNull; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; final class MethodSignatureBuilderImpl extends AbstractTypeMemberBuilder diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImpl.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImpl.java index 821da79245..88872e050e 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImpl.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImpl.java @@ -13,11 +13,11 @@ import com.google.common.annotations.VisibleForTesting; import java.util.List; import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; class MethodSignatureImpl extends AbstractTypeMember implements MethodSignature { private final List params; diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java index e46b73175d..8e55dcb3ca 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.util.Optional; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.TypeComment; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.TypeComment; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; import org.opendaylight.yangtools.yang.model.api.Status; public final class RuntimeEnumerationBuilder extends AbstractEnumerationBuilder { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java index 9ae2bd8bea..85b0bfeae2 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; public class RuntimeGeneratedTOBuilder extends AbstractGeneratedTOBuilder { public RuntimeGeneratedTOBuilder(final JavaTypeName identifier) { diff --git a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java index 67d3212ed9..12bb20fa0b 100644 --- a/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java +++ b/binding/binding-model-ri/src/main/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java @@ -7,9 +7,9 @@ */ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; public final class RuntimeGeneratedTypeBuilder extends AbstractGeneratedTypeBuilder implements GeneratedTypeBuilder { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypesTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypesTest.java index 28711a83f5..296fe6099b 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypesTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BaseYangTypesTest.java @@ -11,9 +11,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; public class BaseYangTypesTest { @Test diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BindingTypesTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BindingTypesTest.java index d0bfaf838c..2980d9c690 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BindingTypesTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/BindingTypesTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertThrows; import static org.opendaylight.mdsal.binding.model.ri.Types.typeForClass; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; import org.opendaylight.yangtools.binding.lib.Augmentable; import org.opendaylight.yangtools.binding.lib.Augmentation; import org.opendaylight.yangtools.binding.lib.BaseIdentity; @@ -24,6 +23,7 @@ import org.opendaylight.yangtools.binding.lib.InstanceIdentifier; import org.opendaylight.yangtools.binding.lib.Key; import org.opendaylight.yangtools.binding.lib.KeyAware; import org.opendaylight.yangtools.binding.lib.Notification; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; public class BindingTypesTest { @Test @@ -81,4 +81,4 @@ public class BindingTypesTest { assertEquals(Types.typeForClass(Notification.class), notificationType.getRawType()); assertArrayEquals(new Object[] { Types.objectType() }, notificationType.getActualTypeArguments()); } -} \ No newline at end of file +} diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypeNameTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypeNameTest.java index aa1b0feb36..080f330241 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypeNameTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypeNameTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; public class TypeNameTest { @Test diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypesTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypesTest.java index 7c9bd9f8ed..b83176e600 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypesTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/TypesTest.java @@ -11,11 +11,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.WildcardType; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.WildcardType; public class TypesTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilderTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilderTest.java index 0943a38cc2..9f60086d5f 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilderTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilderTest.java @@ -9,8 +9,8 @@ package org.opendaylight.mdsal.binding.model.ri.generated.type.builder; import java.io.Serializable; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; public class AbstractGeneratedTypeBuilderTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberTest.java index 3dfa666920..f625fcab40 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AbstractTypeMemberTest.java @@ -13,9 +13,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; public class AbstractTypeMemberTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationBuilderTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationBuilderTest.java index 3740f6c023..11d4ac404b 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationBuilderTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/AnnotationBuilderTest.java @@ -18,17 +18,17 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.AnnotationType.Parameter; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.AnnotationType.Parameter; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; public class AnnotationBuilderTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImplTest.java index 02a2f5b5b3..dec8067f7e 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/ConstantImplTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; public class ConstantImplTest { @Test diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java index fe605b0369..c852ae8c64 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertNull; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImplTest.java index 61efee6348..1453b9b0ef 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImplTest.java @@ -14,9 +14,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; public class GeneratedPropertyBuilderImplTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImplTest.java index 4f57fb63f7..88b019e83b 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyImplTest.java @@ -13,10 +13,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; public class GeneratedPropertyImplTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyTest.java index 5c6f07ac10..98d2758376 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedPropertyTest.java @@ -12,9 +12,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; public class GeneratedPropertyTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java index 6b41ab2166..8fd2a310b6 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java @@ -12,10 +12,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; public class GeneratedTOBuilderImplTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderTest.java index 94c704848a..beea797950 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTOBuilderTest.java @@ -12,10 +12,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; public class GeneratedTOBuilderTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java index 991b01a7b9..0a95c6c332 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java @@ -15,21 +15,21 @@ import static org.junit.Assert.assertTrue; import java.io.Serializable; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.EnumBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.EnumBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; public class GeneratedTypeBuilderTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImplTest.java index bff304740c..46edd0868f 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodParameterImplTest.java @@ -14,8 +14,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.Type; public class MethodParameterImplTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImplTest.java index 2f8d6232b8..92e3a54470 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderImplTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; public class MethodSignatureBuilderImplTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderTest.java index 53afd9ab6a..4a69ea66f3 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureBuilderTest.java @@ -14,10 +14,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; public class MethodSignatureBuilderTest { diff --git a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImplTest.java b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImplTest.java index 6991930a77..ace5708955 100644 --- a/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImplTest.java +++ b/binding/binding-model-ri/src/test/java/org/opendaylight/mdsal/binding/model/ri/generated/type/builder/MethodSignatureImplTest.java @@ -16,12 +16,12 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.AnnotationType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.AnnotationType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.Parameter; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; public class MethodSignatureImplTest { diff --git a/binding/binding-ri/src/main/java/module-info.java b/binding/binding-ri/src/main/java/module-info.java index 176d604e2a..3f4c3ae9b0 100644 --- a/binding/binding-ri/src/main/java/module-info.java +++ b/binding/binding-ri/src/main/java/module-info.java @@ -17,12 +17,12 @@ module org.opendaylight.mdsal.binding.generator { provides BindingGenerator with DefaultBindingGenerator; provides BindingRuntimeGenerator with DefaultBindingRuntimeGenerator; - requires transitive org.opendaylight.mdsal.binding.model.api; + requires transitive org.opendaylight.yangtools.binding.model.api; requires transitive org.opendaylight.mdsal.binding.model.ri; requires transitive org.opendaylight.mdsal.binding.runtime.api; requires com.google.common; - requires org.opendaylight.yangtools.concepts; requires org.opendaylight.yangtools.binding.lib; + requires org.opendaylight.yangtools.concepts; requires org.opendaylight.yangtools.yang.common; requires org.opendaylight.yangtools.yang.model.api; requires org.opendaylight.yangtools.yang.model.spi; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGenerator.java index 369d7bbb2d..705d05a009 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGenerator.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.binding.generator; import java.util.Collection; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java index 2d4a8e2b57..dc4f84403f 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtil.java @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Optional; import java.util.regex.Pattern; -import org.opendaylight.mdsal.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.Restrictions; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingRuntimeTypesFactory.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingRuntimeTypesFactory.java index 8617b250b9..a58d8013bf 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingRuntimeTypesFactory.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingRuntimeTypesFactory.java @@ -22,13 +22,13 @@ import org.opendaylight.mdsal.binding.generator.impl.reactor.IdentityGenerator; import org.opendaylight.mdsal.binding.generator.impl.reactor.ModuleGenerator; import org.opendaylight.mdsal.binding.generator.impl.reactor.TypeBuilderFactory; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultBindingRuntimeTypes; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeTypes; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.IdentityRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ModuleRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java index c79892a484..b9b26c9ac3 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGenerator.java @@ -18,8 +18,8 @@ import org.opendaylight.mdsal.binding.generator.BindingGenerator; import org.opendaylight.mdsal.binding.generator.impl.reactor.Generator; import org.opendaylight.mdsal.binding.generator.impl.reactor.GeneratorReactor; import org.opendaylight.mdsal.binding.generator.impl.reactor.TypeBuilderFactory; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java index ae3329e452..7e251590f3 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java @@ -19,15 +19,15 @@ import java.util.function.Function; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultAugmentRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.odlext.model.api.AugmentIdentifierEffectiveStatement; import org.opendaylight.yangtools.yang.common.AbstractQName; import org.opendaylight.yangtools.yang.common.QName; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractCompositeGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractCompositeGenerator.java index 5d74b61ad0..5cc3b1c088 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractCompositeGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractCompositeGenerator.java @@ -18,13 +18,13 @@ import java.util.Set; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.rfc8040.model.api.YangDataEffectiveStatement; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AddedByUsesAware; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java index f7fc8a425e..c28aeb6dfa 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractExplicitGenerator.java @@ -16,15 +16,15 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.tree.StatementRepresentation; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.TypeMemberComment; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotableTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.TypeMemberComment; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotableTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.yang.common.AbstractQName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AddedByUsesAware; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractInvokableGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractInvokableGenerator.java index a3851f9279..d610e1c1e3 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractInvokableGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractInvokableGenerator.java @@ -7,11 +7,11 @@ */ package org.opendaylight.mdsal.binding.generator.impl.reactor; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java index ab40f29d9c..cb2506d74f 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java @@ -9,13 +9,13 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import static com.google.common.base.Verify.verify; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.odlext.model.api.ContextReferenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.TypeAware; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java index cf6d31efb8..aa3df987af 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeObjectGenerator.java @@ -24,19 +24,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil; import org.opendaylight.mdsal.binding.generator.impl.reactor.TypeReference.ResolvedLeafref; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Restrictions; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.BaseYangTypes; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.TypeConstants; @@ -47,6 +34,19 @@ import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.RegexPatterns; import org.opendaylight.yangtools.binding.lib.TypeObject; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangConstants; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java index da387f1292..3f7e1e2f38 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ActionGenerator.java @@ -9,15 +9,15 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultActionRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.runtime.api.ActionRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.model.api.stmt.ActionEffectiveStatement; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CaseGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CaseGenerator.java index c9519becce..8c380d264a 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CaseGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CaseGenerator.java @@ -11,13 +11,13 @@ import static com.google.common.base.Verify.verify; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultCaseRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.model.api.stmt.CaseEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ChoiceGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ChoiceGenerator.java index 36fa958979..5d8b76f489 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ChoiceGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ChoiceGenerator.java @@ -12,15 +12,15 @@ import static com.google.common.base.Verify.verify; import java.util.ArrayList; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultChoiceRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ChoiceRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ClassPlacement.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ClassPlacement.java index 4e838bd2da..e9b407b7c2 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ClassPlacement.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ClassPlacement.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.generator.impl.reactor; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; /** * Enumeration of possible placements for a particular type. This provides a tie-in between the {@link Generator} tree diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java index 2902087d31..54e9bff2ac 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java @@ -15,11 +15,11 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java index b1d12e1bdf..9050766ac7 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java @@ -9,17 +9,17 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultContainerRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ContainerRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/FeatureGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/FeatureGenerator.java index a8fc9092b3..e582afaef7 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/FeatureGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/FeatureGenerator.java @@ -10,14 +10,14 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import static com.google.common.base.Verify.verify; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultFeatureRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.FeatureRuntimeType; import org.opendaylight.yangtools.binding.lib.YangFeature; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratedUnionBuilder.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratedUnionBuilder.java index cf7665b213..4fc549bf1e 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratedUnionBuilder.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratedUnionBuilder.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; interface GeneratedUnionBuilder extends GeneratedTOBuilder { diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/Generator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/Generator.java index e45990aeed..a534aef240 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/Generator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/Generator.java @@ -24,21 +24,21 @@ import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.AnnotableTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.GeneratedPropertyBuilderImpl; import org.opendaylight.yangtools.binding.lib.DataContainer; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.AnnotableTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorReactor.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorReactor.java index b9d97a2f61..6efe54e426 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorReactor.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorReactor.java @@ -24,11 +24,11 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.ChildOf; import org.opendaylight.yangtools.binding.lib.ChoiceIn; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.concepts.Mutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorResult.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorResult.java index 07fb61382a..73eda40fca 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorResult.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorResult.java @@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.concepts.Immutable; class GeneratorResult implements Immutable { diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GroupingGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GroupingGenerator.java index 1b566cb6cb..3154710077 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GroupingGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GroupingGenerator.java @@ -12,13 +12,13 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultGroupingRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.GroupingRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java index e090592282..a67eca1f35 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/IdentityGenerator.java @@ -12,13 +12,13 @@ import static org.opendaylight.mdsal.binding.model.ri.BindingTypes.BASE_IDENTITY import java.util.List; import java.util.stream.Collectors; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultIdentityRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.runtime.api.IdentityRuntimeType; import org.opendaylight.yangtools.binding.lib.BaseIdentity; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.stmt.BaseEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InputGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InputGenerator.java index 22c60a7d59..1ebdf0b929 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InputGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InputGenerator.java @@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultInputRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.InputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InvokableRuntimeTypeBuilder.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InvokableRuntimeTypeBuilder.java index f36d29280c..1d19df7c2a 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InvokableRuntimeTypeBuilder.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/InvokableRuntimeTypeBuilder.java @@ -11,10 +11,10 @@ import static com.google.common.base.Verify.verify; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; abstract class InvokableRuntimeTypeBuilder, R extends CompositeRuntimeType> diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java index 1aababf381..1f40e6c426 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/KeyGenerator.java @@ -12,13 +12,13 @@ import static java.util.Objects.requireNonNull; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultKeyRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.KeyRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafGenerator.java index fc358be4e2..f30de8f7fc 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafGenerator.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultLeafRuntimeType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.LeafRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.stmt.LeafEffectiveStatement; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafListGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafListGenerator.java index 671653c8d7..1d3a6cc078 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafListGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/LeafListGenerator.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultLeafListRuntimeType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.runtime.api.LeafListRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.common.Ordering; import org.opendaylight.yangtools.yang.model.api.stmt.LeafListEffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java index 05a18f9c08..9934ab4118 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ListGenerator.java @@ -12,11 +12,6 @@ import static org.opendaylight.mdsal.binding.model.ri.BindingTypes.keyAware; import java.util.List; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultListRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.ValueMechanics; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.KeyRuntimeType; @@ -24,6 +19,11 @@ import org.opendaylight.mdsal.binding.runtime.api.ListRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.ValueMechanics; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.yang.common.Ordering; import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java index 6a59cbf65c..615865acb4 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ModuleGenerator.java @@ -16,9 +16,6 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultModuleRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ModuleRuntimeType; @@ -26,6 +23,9 @@ import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.mdsal.binding.runtime.api.YangDataRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.common.AbstractQName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangDataName; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java index 5b6f1c2308..244fe2b71c 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/NotificationGenerator.java @@ -9,15 +9,15 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultNotificationRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.NotificationRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java index 48b8221d23..31748be37b 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OpaqueObjectGenerator.java @@ -10,14 +10,14 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultAnydataRuntimeType; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultAnyxmlRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AnydataRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.AnyxmlRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.OpaqueRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java index 78084894fc..c310df3005 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java @@ -11,10 +11,10 @@ import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OutputGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OutputGenerator.java index e54cf39120..a89af658f3 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OutputGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OutputGenerator.java @@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultOutputRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.OutputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/RpcGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/RpcGenerator.java index 4dafde6d8c..9cc9e6af22 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/RpcGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/RpcGenerator.java @@ -9,14 +9,14 @@ package org.opendaylight.mdsal.binding.generator.impl.reactor; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultRpcRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.runtime.api.RpcRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.yangtools.binding.lib.contract.Naming; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.model.api.stmt.RpcEffectiveStatement; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/SerialVersionHelper.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/SerialVersionHelper.java index b05bbf253f..29e8ec54fc 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/SerialVersionHelper.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/SerialVersionHelper.java @@ -17,14 +17,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.Set; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.ConcreteType; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.TypeMemberBuilder; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.ConcreteType; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.TypeMemberBuilder; public final class SerialVersionHelper { private static final Set IGNORED_INTERFACES = diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeBuilderFactory.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeBuilderFactory.java index 5aa32d74df..07712e28d6 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeBuilderFactory.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeBuilderFactory.java @@ -14,12 +14,6 @@ import com.google.common.annotations.Beta; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.generator.BindingGeneratorUtil; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.AbstractEnumerationBuilder; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenEnumerationBuilder; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTOBuilder; @@ -28,6 +22,12 @@ import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.RuntimeEnu import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.RuntimeGeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.RuntimeGeneratedTypeBuilder; import org.opendaylight.mdsal.binding.runtime.api.RuntimeGeneratedUnion; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; import org.opendaylight.yangtools.yang.model.api.Module; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeComments.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeComments.java index ff71d90d8e..3f27aeadf6 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeComments.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeComments.java @@ -17,7 +17,7 @@ import java.util.Optional; import java.util.StringTokenizer; import java.util.regex.Pattern; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.mdsal.binding.model.api.TypeComment; +import org.opendaylight.yangtools.binding.model.api.TypeComment; import org.opendaylight.yangtools.yang.model.api.DocumentedNode; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeReference.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeReference.java index bbd30ec9db..541b415a68 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeReference.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypeReference.java @@ -12,8 +12,8 @@ import static java.util.Objects.requireNonNull; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.Type; abstract sealed class TypeReference { private static final class Identityref extends TypeReference { diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypedefGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypedefGenerator.java index d63fc7e139..652d31afe2 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypedefGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/TypedefGenerator.java @@ -13,15 +13,15 @@ import static java.util.Objects.requireNonNull; import java.util.ArrayList; import java.util.List; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultTypedefRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.Type; -import org.opendaylight.mdsal.binding.model.api.YangSourceDefinition; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.TypeConstants; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.runtime.api.TypedefRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.YangSourceDefinition; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/YangDataGenerator.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/YangDataGenerator.java index a6e0b00864..bf3f394b35 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/YangDataGenerator.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/YangDataGenerator.java @@ -13,14 +13,14 @@ import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member; import org.opendaylight.mdsal.binding.generator.impl.rt.DefaultYangDataRuntimeType; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.mdsal.binding.runtime.api.YangDataRuntimeType; import org.opendaylight.yangtools.binding.lib.contract.StatementNamespace; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.yangtools.rfc8040.model.api.YangDataEffectiveStatement; import org.opendaylight.yangtools.yang.common.UnresolvedQName; import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractAugmentableRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractAugmentableRuntimeType.java index a3dd7f2747..07c9010307 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractAugmentableRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractAugmentableRuntimeType.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import com.google.common.collect.ImmutableList; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.AugmentableRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; /** diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java index d144120299..2c439d1c99 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractCompositeRuntimeType.java @@ -17,11 +17,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.GeneratedRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; @@ -105,4 +105,4 @@ abstract class AbstractCompositeRuntimeType> } throw new VerifyException("Unexpected statement " + stmt + " in " + type); } -} \ No newline at end of file +} diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractGeneratedRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractGeneratedRuntimeType.java index 245ccf882d..ae2db6e87c 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractGeneratedRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractGeneratedRuntimeType.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; abstract class AbstractGeneratedRuntimeType> diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractInvokableRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractInvokableRuntimeType.java index f198438618..a5de88e8ef 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractInvokableRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractInvokableRuntimeType.java @@ -9,11 +9,11 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.InputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.InvokableRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.OutputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; abstract sealed class AbstractInvokableRuntimeType> diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractObjectRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractObjectRuntimeType.java index a3c4cd3706..a8604f03c2 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractObjectRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractObjectRuntimeType.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; abstract class AbstractObjectRuntimeType> diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractRuntimeType.java index 6bb4d1287f..70a9b7abdc 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/AbstractRuntimeType.java @@ -11,8 +11,8 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; abstract class AbstractRuntimeType, T extends Type> implements RuntimeType { diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultActionRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultActionRuntimeType.java index db2cb32d11..f2f82267bd 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultActionRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultActionRuntimeType.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.ActionRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.ActionEffectiveStatement; public final class DefaultActionRuntimeType extends AbstractInvokableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnydataRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnydataRuntimeType.java index 2ce8df2519..47db71c4a4 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnydataRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnydataRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AnydataRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataEffectiveStatement; public final class DefaultAnydataRuntimeType extends AbstractGeneratedRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnyxmlRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnyxmlRuntimeType.java index 6778dfc6ac..cdfb97cbc0 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnyxmlRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAnyxmlRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AnyxmlRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement; public final class DefaultAnyxmlRuntimeType extends AbstractGeneratedRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAugmentRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAugmentRuntimeType.java index 08fc3baf37..d135a52417 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAugmentRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultAugmentRuntimeType.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement; public final class DefaultAugmentRuntimeType extends AbstractCompositeRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultBindingRuntimeTypes.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultBindingRuntimeTypes.java index 8f4f6c6167..7c7b369e97 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultBindingRuntimeTypes.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultBindingRuntimeTypes.java @@ -19,7 +19,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeTypes; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ChoiceRuntimeType; @@ -28,6 +27,7 @@ import org.opendaylight.mdsal.binding.runtime.api.IdentityRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ModuleRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.mdsal.binding.runtime.api.YangDataRuntimeType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.YangDataName; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultCaseRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultCaseRuntimeType.java index 37a251c9fc..3ff2f9d1e6 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultCaseRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultCaseRuntimeType.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.CaseEffectiveStatement; public final class DefaultCaseRuntimeType extends AbstractAugmentableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultChoiceRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultChoiceRuntimeType.java index 6f85c8bf95..3c4dfcae81 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultChoiceRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultChoiceRuntimeType.java @@ -8,11 +8,11 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.CaseRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ChoiceRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement; public final class DefaultChoiceRuntimeType extends AbstractCompositeRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultContainerRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultContainerRuntimeType.java index 5f9bd111be..cb934204d9 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultContainerRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultContainerRuntimeType.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ContainerRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerEffectiveStatement; public final class DefaultContainerRuntimeType extends AbstractAugmentableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultFeatureRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultFeatureRuntimeType.java index 9dfbb970d0..e9c07a1403 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultFeatureRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultFeatureRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.FeatureRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureEffectiveStatement; public final class DefaultFeatureRuntimeType extends AbstractGeneratedRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultGroupingRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultGroupingRuntimeType.java index 418bfee741..3311278ce0 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultGroupingRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultGroupingRuntimeType.java @@ -12,10 +12,10 @@ import java.util.Collections; import java.util.List; import java.util.Objects; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.GroupingRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement; public final class DefaultGroupingRuntimeType extends AbstractCompositeRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultIdentityRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultIdentityRuntimeType.java index 992d22cc43..e5c2655782 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultIdentityRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultIdentityRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.IdentityRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement; public final class DefaultIdentityRuntimeType extends AbstractGeneratedRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultInputRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultInputRuntimeType.java index 8104f8d17c..4789d78161 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultInputRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultInputRuntimeType.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.InputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement; public final class DefaultInputRuntimeType extends AbstractAugmentableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultKeyRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultKeyRuntimeType.java index 6612ae2241..6e5c87de4e 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultKeyRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultKeyRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.runtime.api.KeyRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement; public final class DefaultKeyRuntimeType extends AbstractObjectRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafListRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafListRuntimeType.java index fe149664b2..a067e62758 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafListRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafListRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.LeafListRuntimeType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.stmt.LeafListEffectiveStatement; public final class DefaultLeafListRuntimeType extends AbstractRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafRuntimeType.java index c39025d0c1..d9f4324caa 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultLeafRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.runtime.api.LeafRuntimeType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.stmt.LeafEffectiveStatement; public final class DefaultLeafRuntimeType extends AbstractRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultListRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultListRuntimeType.java index ca211b7dcc..6ed2aff90c 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultListRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultListRuntimeType.java @@ -9,11 +9,11 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.KeyRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ListRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement; public final class DefaultListRuntimeType extends AbstractAugmentableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultModuleRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultModuleRuntimeType.java index 353b2969ed..86bd7b9147 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultModuleRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultModuleRuntimeType.java @@ -12,10 +12,10 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.ModuleRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.mdsal.binding.runtime.api.YangDataRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.common.YangDataName; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultNotificationRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultNotificationRuntimeType.java index 1eb2a54200..f402bc728a 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultNotificationRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultNotificationRuntimeType.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.NotificationRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.NotificationEffectiveStatement; public final class DefaultNotificationRuntimeType extends AbstractAugmentableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultOutputRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultOutputRuntimeType.java index 73f54b6675..3757aba328 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultOutputRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultOutputRuntimeType.java @@ -8,10 +8,10 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.OutputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement; public final class DefaultOutputRuntimeType extends AbstractAugmentableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultRpcRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultRpcRuntimeType.java index e0fcb9f72a..3c9784fff1 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultRpcRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultRpcRuntimeType.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.RpcRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.RpcEffectiveStatement; public final class DefaultRpcRuntimeType extends AbstractInvokableRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultTypedefRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultTypedefRuntimeType.java index bdf1860fe1..9cb216e26d 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultTypedefRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultTypedefRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.generator.impl.rt; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.TypedefRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; public final class DefaultTypedefRuntimeType extends AbstractGeneratedRuntimeType diff --git a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultYangDataRuntimeType.java b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultYangDataRuntimeType.java index d871a6f614..b94601fdd4 100644 --- a/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultYangDataRuntimeType.java +++ b/binding/binding-ri/src/main/java/org/opendaylight/mdsal/binding/generator/impl/rt/DefaultYangDataRuntimeType.java @@ -8,9 +8,9 @@ package org.opendaylight.mdsal.binding.generator.impl.rt; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; import org.opendaylight.mdsal.binding.runtime.api.YangDataRuntimeType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.rfc8040.model.api.YangDataEffectiveStatement; public final class DefaultYangDataRuntimeType extends AbstractCompositeRuntimeType diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java index dc95e72595..7b5b2d2d87 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/BindingGeneratorUtilTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Restrictions; +import org.opendaylight.yangtools.binding.model.api.Restrictions; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java index 58deb5c09d..336a12689a 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractOpaqueTest.java @@ -14,12 +14,12 @@ import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.List; import java.util.Optional; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.ChildOf; import org.opendaylight.yangtools.binding.lib.OpaqueObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; abstract class AbstractOpaqueTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java index 7e6b3dd66e..f6d107e835 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ActionsTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ActionsTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java index 1084910d70..6c00d8a27b 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentRelativeXPathTest.java @@ -14,12 +14,12 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class AugmentRelativeXPathTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java index b65e8f8fa0..cd65c9577d 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AugmentedTypeTest.java @@ -14,13 +14,13 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java index 48d39e805d..76dba4a816 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BindingGeneratorImplTest.java @@ -13,9 +13,9 @@ import static org.junit.Assert.assertNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BindingGeneratorImplTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java index 87f32bb357..bf938d3abc 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/BitAndUnionTOEnclosingTest.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.stream.Collectors; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class BitAndUnionTOEnclosingTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug1862Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug1862Test.java index b64c112feb..43d9b7226b 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug1862Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug1862Test.java @@ -15,9 +15,9 @@ import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug1862Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java index d910b01a5c..da570a07f3 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug4145Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug4145Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java index 7ff2c5c5f1..2e6d0c0605 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Bug6135Test.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Bug6135Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java index e940b5ee82..2d205054c8 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ChoiceCaseGenTypesTest.java @@ -14,8 +14,8 @@ import static org.opendaylight.mdsal.binding.generator.impl.SupportTestUtil.cont import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ChoiceCaseGenTypesTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java index dae49bfa42..beaf830b3a 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/DefaultBindingGeneratorTest.java @@ -23,14 +23,14 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java index c05ce67adb..99f27512b3 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/ExtendedTypedefTest.java @@ -13,10 +13,10 @@ import static org.junit.Assert.assertNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.ri.BaseYangTypes; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class ExtendedTypedefTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java index 990f02b58c..0ac3c90870 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenEnumResolvingTest.java @@ -14,10 +14,10 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Enumeration; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Enumeration; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GenEnumResolvingTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java index 809f7e7359..a33b88ffee 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenTypesSubSetTest.java @@ -14,7 +14,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java index e83510c243..d1a585fa69 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java @@ -13,11 +13,11 @@ import static org.junit.Assert.assertTrue; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.ri.BaseYangTypes; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GenerateInnerClassForBitsAndUnionInLeavesTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java index 830e0f1452..8fd458dda6 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesBitsTest.java @@ -14,11 +14,11 @@ import static org.junit.Assert.assertTrue; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.MethodSignature.Parameter; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.MethodSignature.Parameter; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesBitsTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java index d826711d86..d8aba52b97 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesLeafrefTest.java @@ -17,12 +17,12 @@ import static org.junit.Assert.assertThrows; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesLeafrefTest { @@ -223,4 +223,4 @@ public class GeneratedTypesLeafrefTest { assertThat(cause, instanceOf(IllegalArgumentException.class)); assertThat(cause.getMessage(), containsString("Failed to find leafref target")); } -} \ No newline at end of file +} diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java index b15689cbf8..f498dc04dd 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesStringTest.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.Constant; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Constant; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesStringTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java index 7bb335a0a3..6e3749b216 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/GeneratedTypesTest.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class GeneratedTypesTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java index 85437007c8..9a74ffae46 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/IdentityrefTypeTest.java @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class IdentityrefTypeTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/LeafrefResolutionTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/LeafrefResolutionTest.java index 3db9afbc56..7c63fe10f3 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/LeafrefResolutionTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/LeafrefResolutionTest.java @@ -12,9 +12,9 @@ import static org.junit.Assert.assertThrows; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java index 95112df81b..53d91a6385 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal161Test.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; import java.util.Optional; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal161Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java index 6ac7d6715e..e69ccff1ae 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal182Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import java.util.Collection; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java index fd5ef3041e..20faf9f235 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal269Test.java @@ -13,9 +13,9 @@ import static org.junit.Assert.assertTrue; import java.util.Iterator; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal269Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java index f8690db92b..fa4d5b69cf 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal300Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal300Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java index 80cc55832c..eccbf37038 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java @@ -17,12 +17,12 @@ import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.contract.Naming; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal320Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java index b9e6a313d9..fab6f5aa16 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal332Test.java @@ -15,8 +15,8 @@ import com.google.common.collect.ImmutableSet; import java.util.List; import java.util.Set; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal332Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java index e975b05623..a1d305c252 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal335Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal335Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java index c496ee6ef5..2989ce5a51 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal352Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal352Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java index d7e97e7f7f..47c8638298 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal406TypeObjectTest.java @@ -16,10 +16,10 @@ import java.util.List; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java index d9e8603277..6079c1d553 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal437Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal437Test extends AbstractOpaqueTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java index 7761cdb468..f05f3f293b 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal438Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal438Test extends AbstractOpaqueTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal458Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal458Test.java index 91a2319eaa..10f46aa328 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal458Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal458Test.java @@ -13,8 +13,8 @@ import com.google.common.collect.ImmutableSet; import java.util.Set; import java.util.stream.Collectors; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal458Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal459Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal459Test.java index d41f116aaf..f59992b264 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal459Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal459Test.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal459Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal499Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal499Test.java index 1cd05a1104..215d85c90c 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal499Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal499Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal499Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal506Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal506Test.java index b440321c12..aca722beb6 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal506Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal506Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal506Test extends AbstractOpaqueTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal516Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal516Test.java index 9d846c1535..f462ec22f6 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal516Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal516Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal516Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal517Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal517Test.java index c284999493..e5c266dd50 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal517Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal517Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal517Test extends AbstractOpaqueTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java index 44cc44158d..f3fbc5c7e4 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal519Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; /** diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal531Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal531Test.java index da1fb7ddaa..e7896fc275 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal531Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal531Test.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal531Test extends AbstractOpaqueTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal552Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal552Test.java index a77a9e7ed0..d1eff407b2 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal552Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal552Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal552Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java index b953e4b030..abde72e555 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal554Test.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal554Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal573Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal573Test.java index 0a6c178321..71253d0641 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal573Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal573Test.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal573Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java index 7ce90788f2..893cbf52e3 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal600Test.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertSame; import org.eclipse.jdt.annotation.NonNullByDefault; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal666Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal666Test.java index 3a0318380a..9d275c138b 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal666Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal666Test.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertTrue; import java.util.stream.Collectors; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal666Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal669Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal669Test.java index 4bf407d20d..bd9169df4a 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal669Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal669Test.java @@ -14,10 +14,10 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeTypes; import org.opendaylight.mdsal.binding.runtime.api.GroupingRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.RuntimeType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; class Mdsal669Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal675Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal675Test.java index 1d14357598..8065ac7241 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal675Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal675Test.java @@ -19,12 +19,12 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.mdsal.binding.model.ri.BaseYangTypes; import org.opendaylight.mdsal.binding.model.ri.BindingTypes; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class Mdsal675Test { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal824Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal824Test.java index a078db3303..8d706a785a 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal824Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal824Test.java @@ -13,12 +13,12 @@ import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.ActionRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ContainerRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.InputRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.ListRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.OutputRuntimeType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal829Test.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal829Test.java index 47f1a0200f..209e19f8ae 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal829Test.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal829Test.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertSame; import java.util.Set; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SerialVersionHelperTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SerialVersionHelperTest.java index 3240e72c8b..bacf8d259d 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SerialVersionHelperTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SerialVersionHelperTest.java @@ -13,13 +13,13 @@ import static org.junit.Assert.assertNotEquals; import java.io.Serializable; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.impl.reactor.SerialVersionHelper; -import org.opendaylight.mdsal.binding.model.api.AccessModifier; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.mdsal.binding.model.ri.Types; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.AccessModifier; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.yangtools.binding.model.api.type.builder.MethodSignatureBuilder; public class SerialVersionHelperTest { @Test diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java index ef897e5217..178ef96eb5 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/SupportTestUtil.java @@ -11,12 +11,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.List; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.MethodSignature; -import org.opendaylight.mdsal.binding.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.MethodSignature; +import org.opendaylight.yangtools.binding.model.api.ParameterizedType; +import org.opendaylight.yangtools.binding.model.api.Type; public final class SupportTestUtil { private SupportTestUtil() { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java index e6b8151180..720a05bfe0 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java @@ -11,9 +11,9 @@ import static org.junit.Assert.assertEquals; import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; import org.opendaylight.mdsal.binding.model.ri.Types; +import org.opendaylight.yangtools.binding.model.api.GeneratedProperty; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class UnionTypeDefTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java index f64972fe14..f7993433f9 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UsesTest.java @@ -14,8 +14,8 @@ import static org.opendaylight.mdsal.binding.generator.impl.SupportTestUtil.cont import java.util.List; import org.junit.Test; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public class UsesTest { diff --git a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorTest.java b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorTest.java index f76cfd0373..5fc2259642 100644 --- a/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorTest.java +++ b/binding/binding-ri/src/test/java/org/opendaylight/mdsal/binding/generator/impl/reactor/GeneratorTest.java @@ -16,10 +16,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.mdsal.binding.model.ri.generated.type.builder.CodegenGeneratedTOBuilder; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.type.builder.GeneratedTOBuilder; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @RunWith(MockitoJUnitRunner.StrictStubs.class) diff --git a/binding/binding-runtime-api/src/main/java/module-info.java b/binding/binding-runtime-api/src/main/java/module-info.java index e6ff2a662f..34d5b8f936 100644 --- a/binding/binding-runtime-api/src/main/java/module-info.java +++ b/binding/binding-runtime-api/src/main/java/module-info.java @@ -8,13 +8,13 @@ module org.opendaylight.mdsal.binding.runtime.api { exports org.opendaylight.mdsal.binding.runtime.api; + requires transitive org.opendaylight.yangtools.binding.lib; + requires transitive org.opendaylight.yangtools.binding.model.api; requires transitive org.opendaylight.yangtools.concepts; requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; requires transitive org.opendaylight.yangtools.yang.repo.api; - requires transitive org.opendaylight.yangtools.binding.lib; requires transitive org.opendaylight.yangtools.rfc8040.model.api; - requires transitive org.opendaylight.mdsal.binding.model.api; requires org.slf4j; // Annotations diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java index c731e82fef..47d6692785 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java @@ -17,7 +17,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import java.util.concurrent.ExecutionException; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.binding.lib.Action; import org.opendaylight.yangtools.binding.lib.Augmentation; import org.opendaylight.yangtools.binding.lib.BaseIdentity; @@ -26,6 +25,7 @@ import org.opendaylight.yangtools.binding.lib.Rpc; import org.opendaylight.yangtools.binding.lib.RpcInput; import org.opendaylight.yangtools.binding.lib.RpcOutput; import org.opendaylight.yangtools.binding.lib.YangData; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangDataName; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeContext.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeContext.java index 268eeb71bb..7a52d07a34 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeContext.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeContext.java @@ -10,8 +10,6 @@ package org.opendaylight.mdsal.binding.runtime.api; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; import org.opendaylight.yangtools.binding.lib.Action; import org.opendaylight.yangtools.binding.lib.Augmentation; import org.opendaylight.yangtools.binding.lib.BaseIdentity; @@ -19,6 +17,8 @@ import org.opendaylight.yangtools.binding.lib.Rpc; import org.opendaylight.yangtools.binding.lib.RpcInput; import org.opendaylight.yangtools.binding.lib.RpcOutput; import org.opendaylight.yangtools.binding.lib.YangData; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangDataName; diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeTypes.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeTypes.java index 46369f132f..9ebc894d1f 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeTypes.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/BindingRuntimeTypes.java @@ -12,8 +12,8 @@ import java.util.Optional; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangDataName; diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/ChoiceRuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/ChoiceRuntimeType.java index f0fadb6a7f..9f55ace179 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/ChoiceRuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/ChoiceRuntimeType.java @@ -10,8 +10,8 @@ package org.opendaylight.mdsal.binding.runtime.api; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.binding.lib.Augmentable; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement; /** diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DataRuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DataRuntimeType.java index 9a64e6b2f4..00d47cc8f8 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DataRuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DataRuntimeType.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.runtime.api; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; /** * Marker interface for concrete {@link RuntimeType}s relevant when dealing data hierarchy. This interface does not have diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DefaultBindingRuntimeContext.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DefaultBindingRuntimeContext.java index 292f003c98..fa549b1e2a 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DefaultBindingRuntimeContext.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/DefaultBindingRuntimeContext.java @@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; /** * Runtime Context for Java YANG Binding classes. It provides information derived from the backing effective model, diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/GeneratedRuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/GeneratedRuntimeType.java index 86f0f634e3..e39c6fe1d4 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/GeneratedRuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/GeneratedRuntimeType.java @@ -7,8 +7,8 @@ */ package org.opendaylight.mdsal.binding.runtime.api; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.yangtools.concepts.Identifiable; /** diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/KeyRuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/KeyRuntimeType.java index 2f2b555442..d73d33b14a 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/KeyRuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/KeyRuntimeType.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.runtime.api; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement; /** diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/OpaqueRuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/OpaqueRuntimeType.java index 5dfa93b4ac..5cde253e0f 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/OpaqueRuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/OpaqueRuntimeType.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.runtime.api; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement; /** diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeGeneratedUnion.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeGeneratedUnion.java index 933f2b702d..cf96b84730 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeGeneratedUnion.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeGeneratedUnion.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.binding.runtime.api; import com.google.common.annotations.Beta; import java.util.List; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject; +import org.opendaylight.yangtools.binding.model.api.GeneratedTransferObject; /** * A {@link GeneratedTransferObject} created for run-time representation of a {@code union}. diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeType.java index e385cee0c7..70712d61df 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeType.java @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding.runtime.api; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeTypeContainer.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeTypeContainer.java index 11404a393e..03e9ba2813 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeTypeContainer.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/RuntimeTypeContainer.java @@ -8,8 +8,8 @@ package org.opendaylight.mdsal.binding.runtime.api; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; -import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.Type; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; diff --git a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/TypedefRuntimeType.java b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/TypedefRuntimeType.java index 3d56fc9ebf..63d99ffd9d 100644 --- a/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/TypedefRuntimeType.java +++ b/binding/binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/TypedefRuntimeType.java @@ -7,7 +7,7 @@ */ package org.opendaylight.mdsal.binding.runtime.api; -import org.opendaylight.mdsal.binding.model.api.GeneratedType; +import org.opendaylight.yangtools.binding.model.api.GeneratedType; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement; /** diff --git a/binding/binding-runtime-spi/src/main/java/module-info.java b/binding/binding-runtime-spi/src/main/java/module-info.java index 9c4ea9c993..7e7917a48a 100644 --- a/binding/binding-runtime-spi/src/main/java/module-info.java +++ b/binding/binding-runtime-spi/src/main/java/module-info.java @@ -10,12 +10,12 @@ module org.opendaylight.mdsal.binding.runtime.spi { requires transitive org.opendaylight.yangtools.yang.parser.api; requires transitive org.opendaylight.mdsal.binding.runtime.api; + requires org.opendaylight.yangtools.binding.model.api; requires org.opendaylight.yangtools.concepts; requires org.opendaylight.yangtools.util; requires org.opendaylight.yangtools.yang.model.api; requires org.opendaylight.yangtools.yang.model.spi; requires org.opendaylight.yangtools.yang.parser.impl; - requires org.opendaylight.mdsal.binding.model.api; requires org.opendaylight.mdsal.binding.spec.util; requires org.slf4j; diff --git a/binding/binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ForwardingBindingRuntimeContext.java b/binding/binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ForwardingBindingRuntimeContext.java index ff0043ce16..893e1d6e97 100644 --- a/binding/binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ForwardingBindingRuntimeContext.java +++ b/binding/binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ForwardingBindingRuntimeContext.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding.runtime.spi; import com.google.common.annotations.Beta; import com.google.common.collect.ForwardingObject; -import org.opendaylight.mdsal.binding.model.api.JavaTypeName; +import org.opendaylight.yangtools.binding.model.api.JavaTypeName; import org.opendaylight.mdsal.binding.runtime.api.ActionRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.AugmentRuntimeType; import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;