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 <robert.varga@pantheon.tech>

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 25853fe39e3059774a45a6f323dc8f66f7cc6d94..3c1e4da4a88299885fe8afe43ed89649641054a0 100644 (file)
--- 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 442eb77eb8cf105dd773ca22611bb0217e36adae..c411348da5421c9a9618e736f5e5d3fe789aa07f 100644 (file)
--- 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 7d0e3170ca3ed22b01c275b3af03e879ebdfefc4..88c12fa8f5589a49f43662fe655ebb902b29948e 100644 (file)
--- 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 50e9798df83bff52d216f32320b35ec0169c9736..f4caa6b913078ed7f9d7239e8e0bd0a82c12cef6 100644 (file)
--- 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 e0fd3711876dc0aa501b85530a4ab993ca4ce050..43925eda5686c9e58559ae6eb3715c3e36d52f36 100644 (file)
--- 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 1adf4622108665a88051141e3824d0c8936e7ef6..8972c6ea88c51ea5632ada21660830f4c84274b0 100644 (file)
--- 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 4c145796d5fbe9d935ab5a4764d49672e3aca105..cb27e49d304165c658faf9ce7e2cd7564e991e69 100644 (file)
--- 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 30bbff63d0c6d041f46ad36b0c38932578fed35b..8089afc6fb024f7c8d68c80cc23df6034e27f422 100644 (file)
--- 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 e3679745c7743f60b7489909bdc0045ade0cb620..611d6195aeff180249c199ac462375cf1510f16b 100644 (file)
--- 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 6a08f112ab77bc731fd0563bb04a9fe1d4493494..c7a2fbb663ed7b0bc01946d79ed35533dc458d8d 100644 (file)
--- 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 213bbcbc94bada8b8ab753c99b64ccb57346ca79..e203b4e7a2dcdd7d9c883a98e6ad6688156a9427 100644 (file)
--- 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 3dde3a09b5b4a7257d116666d8d8927bac2ee890..8f66ef4bc3717860e34b3f3be5c00b980ddd6cfb 100644 (file)
--- 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 f362d3f4217b5faec3e2d4e70f0a8c2bde32afdf..cabf8c486f937669f77912bd0ab34a9d0c91fc81 100644 (file)
--- 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 a1615ad78abc27a5f94baf4eb2c59dc680b144ca..9280abc0cd932a659ffdf51d2cf5809076e8607f 100644 (file)
--- 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 3fe6a82d2cf1399a75a4ac74ad8233be4ac152c2..420073e5ef413dc31cd4e0c670892fd20c4ab71c 100644 (file)
--- 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 e17bfe6eb93b326bfd6b64f690a9abd80d3254c7..93691fbc95b336fa1d2bc31fbdfa9bf91fb743d0 100644 (file)
--- 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 2c6c5a487d0d8e00711d02e533d0ba560af70988..fc8d6a5160ca8f03bc5ef6a4cbe62d72a9b9238d 100644 (file)
--- 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 f6eff74e54a0789991dd8ca78c5ff81b37efffe4..c30e6affe26cadcebaab8cd0faf3f9466ce8dca1 100644 (file)
--- 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 973c7e2a134edd954048d81998a23a5f1be8cb63..20eec2ced85ae2b020dd1cf493b3511d90b74f4e 100644 (file)
--- 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 0096a5f0f26e5efde7bd3e32fa9400b75ecf3d12..bfe3c0881d729e211bf225ebaff71d504cb4e245 100644 (file)
--- 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 51d0f08483b4bb4c456214f27f1ffce1f4815318..5e3577540f67009897cf32161f75e19f95dedc1c 100644 (file)
--- 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 978192fbca2f905f647b32c9cfd826870406a88c..72312b6f8835206e51def3b4907d70a5cdea0d1b 100644 (file)
--- 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 7f3c8bcb9207d5b5b5b7137f1f124e80b24b125f..c4effc8d463c1028bcaacbfafc79c4d28af8d1a2 100644 (file)
--- 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 8f4b2ffa715604c91e4048c8292ad46e6b1a5756..c0a72086b468dcf4b5f34ede3b99c6c58d0cefbb 100644 (file)
--- 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 6a4843dc44304b03c3cad8720d53f0709e71012d..59eecd61cf9d3c8f32342f98d1481bc2d47e2241 100644 (file)
--- 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 540a044c914dcb8fbb8061cbe46f9d3a4a2831ed..fb1ac66789161a5aac3cae5409e12e96fc55c7ee 100644 (file)
--- 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 e2e4da7438377495f5f19da48deb881954b6df12..a8487f183ff1f325cfa8afc94469e88bd1c754df 100644 (file)
--- 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 29dcc77e843fd19341b178925a1197e1ac714ad4..c55604dfeda7e81797ac6914f2db1d30d9fb20cf 100644 (file)
--- 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 0b1a316a752c908b66c80a21baf13f450d4a9a8a..5d93e6d85c55a711ad18f38938ffa5e6dd680c52 100644 (file)
--- 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 52eca4aa357375bfce25d1a17f73b23f7f740c2e..5893b1acdcd4b5a6eb771075c7c10006c0eae5f0 100644 (file)
--- 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 1c9c481f1fe7132a236c6eba332a8194354dbb21..c02e06447f682b4f88da3b94128048ab7a7063b4 100644 (file)
--- 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 480544f011683beb1d66b43497cc59d00418cee2..38cfc15c9e831d4d545a9d4b29281d0b05e27093 100644 (file)
--- 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 8c5ee643c231f87bf8cf761f2b1603e27a1cf1c1..00c3e8357b80ff29464ecca3dd9d57bb984b0ca7 100644 (file)
--- 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 5ec0dff1d5622b940176d8974ff8b96322f5d08e..01136d7fb47627240e4d2b48eb45e595c114252b 100644 (file)
--- 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 f572a4613da3ecc4ddbd9e09a5dad438ce49f90c..df4d045fce2cd5513a24669874cbdbd906a79c60 100644 (file)
--- 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 f578d7327487f24c3a3e4f8363a10af23f1daab1..39980f7e86e480590d688cbc4c61d7ea1c349ded 100644 (file)
--- 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 eba3d1cc83470991946918b91cadd1cba187dbf0..441258f92119938583ed7e5206cac93cc5b071b3 100644 (file)
--- 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 2121b5313ee31f2a9b5469cc65767435185d3354..5ac7fd95984b466c9958b36c4942025f05521571 100644 (file)
--- 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 71cc77ceb4fe5035814740b6fa512193b95e4996..5a2af3b2c3e511d3d97513688cdea71d8e123a78 100644 (file)
--- 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 98784295626af06d7f9ab0eb400a7b6fdd192a9b..aa32f9e80b1ef302f844fc15c4fb9c2f0dd416c9 100644 (file)
--- 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 8ca36d0dcd08fac198bc199aeae7e9014ed4cd7b..1c9a9103e4d2d984b77bb9d41c0e4a77b6c02125 100644 (file)
--- 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 c62ed4a14f5fd1e162ddfde6096c6401d56d5df5..05db4cf224d2a9c37ca566d2ae8dce30942acbb6 100644 (file)
--- 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 10cc8f1bc3c7a5a826e28e706df830e82314c8ed..b87d376d3a3986dba698a2b8493870a5c08aa7f8 100644 (file)
--- 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 92166d1e1d879edcce090514a2cc0fd683535af8..8b4c61854ec230beb16687e773eb4e93cfabe777 100644 (file)
--- 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 4a56498162386992354bb5feb57371f4052958dc..c2af1d436d4e02ec76244f6a3b49729abda81743 100644 (file)
--- 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 ab438f9bcc8c525f49a72b0e9e91bba977e75edd..1e3f8a8a41ef56ac6a662df2ba124bc3a1d23f5d 100644 (file)
--- 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 c3c192eea8882491f3ca76ccab9f93f267ffffb8..9f72ddd3a9b310bd8eb1bc3d9557c28066f6a239 100644 (file)
--- 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 c4ab40d013841f10462fc2db027338679bc89a97..bb8c940ca583bf86f375084b283483ab898f195e 100644 (file)
--- 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 f9c19c568d5e2e355e497b000bfe8120ed4c3826..b6e5af346e81f74d75e83d9dd43579eab0b1b464 100644 (file)
--- 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 be3cf2742100ed18989da1416e6a12c26d7a8d59..071d336e4968415cc0f8f738fd566a42ddb2459a 100644 (file)
--- 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 11c5983bafecc4f2500bb4f9549caa9c9e7a2c1d..257ae5c34f955e21c35109a4e2ccd27d9c362496 100644 (file)
--- 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 f3fbff382a36e10688ff38b7dc68768f3c6ae7ff..b3ca8d8c1bff65d9bed10e90c1fff0da89b94b52 100644 (file)
--- 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 7096d5239abf7a0fb29a972a8aa0dd9d6affed07..6364218534ce5b5dde85f6c46f084d3dec950cd7 100644 (file)
--- 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 d07f83d3ada4271763e59dc8a8f005c3dffb6963..5c77e6308f0f9783cc66e8f39d3d89e45a6d67b9 100644 (file)
--- 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 d1b778b54f903511c253cb6d34d9ff2505bb420f..4246ba0a9b9b77f87176ab40cbee811704798608 100644 (file)
--- 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 4211e9de2bec46c215c48c84a5f9e7ee952e5ea2..70c27e2a09bd88eaf4f4b3b845db818880a9d04b 100644 (file)
--- 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 <code>packageName</code> and <code>name</code> 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 d3eee27133d465c8e6ae7e7ed23ab4e3b15630a3..06e73eb9baa09649c3fedd6e3e569a77fd901730 100644 (file)
--- 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 746e55d2418a4d6244da1891a112854d344aa8a2..3461da4137c6499cff2494c5c3c23a79573d2b32 100644 (file)
--- 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 72b6724bfae3a451a2122b00649ec90fb1a8f936..4c1d5c27edb22c422938cb88b0167122f38e70c4 100644 (file)
--- 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 e2972878834e0c493120ba64d917428e1f94fd07..a798469ecfdb1e97da4983755675c4f23d8502d9 100644 (file)
--- 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 da38098e9cd962942aa82b816c9e7572de2baac1..baab42acd4cda23362dcdcaed6b71bbc042db6d3 100644 (file)
--- 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 bb34c6bfeb17f8cfb0a28b032b380e30048d8c9a..9db8af13d0e401c92ed2a529bf6e5d34034550a4 100644 (file)
--- 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 0f7b950009a8f402a7604e7413b7fcd919c5b2ce..9093573fb5c2de893e44f7ec75aafd72d26c4fa9 100644 (file)
--- 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 7a56993166e703213c693981bb17ea8a174ac0f0..0b9832b394ea8905ebd06af3a249377fa22270ed 100644 (file)
--- 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 f603f1105d42ff8c980dbab9347ac74b3da7e685..bff60debbfe06335a8524b068356b4e22a2e9116 100644 (file)
--- 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 ef8b75d3a938436e49dc03e1c2aae391d277e1bd..194e443d86ba302435b135c88850a81995810e79 100644 (file)
--- 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 4175218da02b9bd7f81d1113db955f7047fdf1c0..bc29047661929fbe42bf053eb341b830a15b49a9 100644 (file)
--- 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 dd312e483a8bcd7ed42c095f9d871f4802335668..2e7f4dfcbfef95990c4ff4b82b5770f21edb68bd 100644 (file)
--- 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 f386ce9887c89417d87025dc1b4f102a48169e9f..9f3f1b45417cb75a0e93725c374082174fdd9558 100644 (file)
--- 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 40b603843c96bea93a3159c1380b4e638ad41b9c..0c5e1d17a93adb356061a82a98bc0765c8455940 100644 (file)
--- 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 1e5ef44e48c6a0af602a91e2e83ea9287577f240..a89249e70125eb44d0ebed783f5bc65d367ae9b9 100644 (file)
--- 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 26ee930515d4deeb8b012ce0d49020cca7e93869..8fe66e54f7651f0c832d8a3e3814fe1fef54bf1d 100644 (file)
--- 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 @@
  * </li>
  * </ul>
  */
-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 370f810357a4cf4495ca5179097415679d3e96e1..78e1ed671327ba09a25e07e52158864e31f9a5c3 100644 (file)
--- 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 a8c7205db8f9331b7fec3765ea3b1a2c962b65c2..d5e5f2bdd19a6218119f7fe3109b5d3b5ab08997 100644 (file)
--- 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 9dd69984786075b33d6b11af2e2191e67d2e1367..63715b57c685a76cad55fca0e6ad9c763f628b32 100644 (file)
--- 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 9f66e313db0c851e67e6a5324061b8cfa899377c..e194f1c089bfa8f09ad00887d71e04b550247986 100644 (file)
--- 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 75d4a6ec7c1cbe16c3dc45e0f7163572d53339c5..5947f3d11c3a27f2bb723a716042e784733bce05 100644 (file)
--- 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 a3440dcc1a346acaac8f10a04defbabe77793248..bad0cf50c8abbeefdd3483bd5ced314dda9d1d55 100644 (file)
--- 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 43511292789154a2c94b3ad6cfa60bed1d84431b..5d7b5c9b24fa524c8383135016ac1b2528404431 100644 (file)
--- 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 cc7737c9380b6bca300812eb448e822023c31dcb..4cc47fd68d1a63307650876729750e2e16e216b4 100644 (file)
--- 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<T extends GeneratedTypeBuilderBase<T>> 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 ce02ba4c09d2b6e66bde8211aa88bbaff3b3cf27..2a9f835d04ecff7740509e4d450a09ba78c4c1de 100644 (file)
--- 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 2f0e204d0cc371b8c13d1b35e376cf7bee3568bd..ef5566311e40004eb76436d4b7d6fd3d230f81b2 100644 (file)
--- 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<T extends TypeMemberBuilder<T>> 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 2e475790d37f81b7eb8d5d9aaf4ad8b7b5661493..3324e91e4233ad62dcc24866f6634d3a0d7efe69 100644 (file)
--- 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 18e95063197149b8ffa19468d9b52e519d53bcc0..1441fa6661b89996daacd3a3987465a87e49d233 100644 (file)
--- 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 d6e2983c16126c895a88e4831840a2d628a4399e..b2fca6fa9a89f153aa1dbe99de445caf18f679dc 100644 (file)
--- 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 c464c4d7d0d56c4e6e7b097ac3317b78a8faca95..e0b6a8dca6cb9f4b8470dc6b7d066115cc7306db 100644 (file)
--- 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 d2941bc14059f0511bd8aaffc4b87afa75687268..6d1d3e1bef1156d84b88e6288c19cb0a81d609e5 100644 (file)
--- 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 db975b102627ee33548153725882822985ac6e17..658df13c6d09955490a868fbf5684a96d4849a86 100644 (file)
--- 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 c106468888d6f260e9fef84a169037bcd97b1d64..8b06ef035d97c97fdab7c5c1931139bddd229a85 100644 (file)
--- 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<Class<?>, 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 <code>Type</code> for raw type
      * @param parameters JAVA <code>Type</code>s 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 <code>WildcardType</code> 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 79134fcd51b6cd09b7d387627d1bf44cc5fe4650..98a6a469272693abbbd066db16e068a37be35dba 100644 (file)
--- 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 412715ba79befac6de9d9f35556308a548a10e4c..5979c8157007ecb0aeab23b3259250e2ff9435df 100644 (file)
--- 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 d46799d6c19f890d6e6cb51635a2f5ef71277033..68ebf1cb1b2d29712277d08ee0de2a205b1032ac 100644 (file)
--- 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 891d8e808517355af31ae3b4662b5a56b090556f..73e2a06052e7f2b32d866d591d9f696ac6df6346 100644 (file)
--- 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<T extends GeneratedTypeBuilderBase<T>> 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 ab5b73907b1e5523d52e052fffcf9f86119767de..656a93bee389c08fef9a82f991c7da76ba617ddf 100644 (file)
--- 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 873674594a74324cb10bb7d73827f27d148b14c4..1fbefbaff95c5c36e04e87c29f799ebcad466e04 100644 (file)
--- 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<T extends TypeMemberBuilder<T>> implements TypeMemberBuilder<T> {

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 90d8f35a40848d0ee318f5e9a63073705f1d4dfd..953d97aba2af0b799094ad2555bf6a9d7223de98 100644 (file)
--- 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 01f78395a32499c66df58ec75d46741ba3fa62e8..aec7d0fa69063472de1a0288d4eed0a9ebc2306b 100644 (file)
--- 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 e909074c727e67a4a401aefa217ff764cf7125fa..c3c123db795aa76095884bf77be8d72999136f62 100644 (file)
--- 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 8263ac588b17d0e2221b8b0c736a73f5db0d3717..a5b4e5ab7bab711ebbd5ef53abbb81c6e878ad1e 100644 (file)
--- 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<GeneratedTypeBuilder> 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 dafc44d889a44c30faeb23c3dbd915b9d4a86e0f..7fe3878898e95d27064afed84150faff48ae66d6 100644 (file)
--- 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 ae6e2f3242ec0c47312b06fa66e067cc6e229fed..0508997ad52b271ece69e6a0acc0cbe31642e64b 100644 (file)
--- 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<GeneratedPropertyBuilder>
         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 c95384ee867d72fe805525d567c510803dbf5682..54d6464da774f0b9f24f0e20d136be836d91fb82 100644 (file)
--- 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 4de06016d3e62bceeb1eef7b9857b6712b02ddc8..36b2644cd599c65632fe3762579ce1f90fdbc4fd 100644 (file)
--- 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 7c70ad7a72225b0aa3dc244c606c9fff1cd4f5b7..9f248f521740296b9181d0b50612473b8f833e5d 100644 (file)
--- 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<MethodSignatureBuilder>

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 821da79245a89514351c0e25284057f6431a8bee..88872e050e89c547178a19daff52e7a10f0adc81 100644 (file)
--- 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<Parameter> 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 e46b73175d7df0de8cc69f4b203149fe2a1efe89..8e55dcb3ca469ed87cda6f22c177b44207f9c12d 100644 (file)
--- 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 9ae2bd8beabdd43e875dd0124963205fcca9e8c1..85b0bfeae2c50c3888ebaa3a862ef6d9421d1b04 100644 (file)
--- 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 67d3212ed9050094bd1b8f8064245fb5cdc7d788..12bb20fa0bc104d8ee7bf7e002619c64a664ca6d 100644 (file)
--- 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<GeneratedTypeBuilder> 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 28711a83f5f3c6947dbd7ea38f3e86fa9c7f5694..296fe6099bc3b210aa0d1f8404bf41320be90b2c 100644 (file)
--- 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 d0bfaf838c7bcb2c216e98c85dbb6e020784febe..2980d9c69019953cc95ad5da4cb47995140f319b 100644 (file)
--- 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 aa1b0feb3646a9625b1783199e769a64ef916aa8..080f330241781cc210853a96301faa57a8f690aa 100644 (file)
--- 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 7c9bd9f8edb8b17c8121f9d1ac0e8b1a8d923dbb..b83176e6006417f08ae6bdfb4682d43872bd7a19 100644 (file)
--- 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 0943a38cc230c2356f22fdad659d644dd2f4b772..9f60086d5fec55d1cd1650c3d9c7a82350568ee2 100644 (file)
--- 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 3dfa666920453f7bdfec6743199d2fa894bd6030..f625fcab401515718770c5352c221157d53efdaf 100644 (file)
--- 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 3740f6c0233b5defeec550b213696360ec847884..11d4ac404be7b296226fc000bbf211791327de42 100644 (file)
--- 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 02a2f5b5b3f28eaa3ce61ba337cd9118ca8822de..dec8067f7e423a02216ac69f16249ab59acc8da1 100644 (file)
--- 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 fe605b03695f646e96bdd24498403b663db86e31..c852ae8c6416dc6147946004f6eb1dd3fb38baa6 100644 (file)
--- 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 61efee634886d797a928404bbee520f583fd8e22..1453b9b0ef56de44828bdc236f0e123d3722d1dd 100644 (file)
--- 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 4f57fb63f76a9d134a22a35d72e24e9daebf5a2d..88b019e83ba304ac80c90a0dadc9531f02e8a3e8 100644 (file)
--- 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 5c6f07ac10c7620d85920fbf50eb81679a25414e..98d2758376b258304086f4f39e83d8c66a9ff104 100644 (file)
--- 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 6b41ab2166e9f3d82fb78611630c91a14c0066af..8fd2a310b6b0f50e011d3e1a2036d96b0907abe1 100644 (file)
--- 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 94c704848a022c38e21d43653e175f32e281d769..beea797950921d37844c8d1256666e9880377a52 100644 (file)
--- 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 991b01a7b9ba6a9ec8a7e325a59a313092fa84c0..0a95c6c3322e03a7bba94d66fc65d40d7ec1cc22 100644 (file)
--- 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 bff304740c531d8004b9936eb5d5a48b931790bf..46edd0868f1435cc49f76122a4c39059cfebe7a0 100644 (file)
--- 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 2f8d6232b83e14e2087cc7df4b46e903c9bde53d..92e3a54470df1a0ce682f3cf4ac7ed0101ba8fbc 100644 (file)
--- 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 53afd9ab6a209c12f0a9d23b8aafea83afead4a4..4a69ea66f305c6de2a6ac31329a0c523b0c83904 100644 (file)
--- 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 6991930a7781e700f9b948f61214b1f8f6d22f08..ace57089552a6b270ae20f75602be87d4aff5d7d 100644 (file)
--- 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 176d604e2a30410c3a8f3e9299603d466e4b9e21..3f4c3ae9b0b2aa98da45cde013dc52f21b5f4764 100644 (file)
--- 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 369d7bbb2d86a3513586e8c4bc9dba48ef960757..705d05a0098a2a51f118556053333f733c7f7568 100644 (file)
--- 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 2d4a8e2b57a9dad8b0f8431e950e6edd6ce7fb02..dc4f84403f8d217dfe880bf5dc1f85b919225cbd 100644 (file)
--- 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 8617b250b9ecafb804d482b297ff899dde2ea309..a58d8013bf043186c711ebe58be9ca3f039dd926 100644 (file)
--- 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 c79892a484f27ef30a6ca90ad06988a1beeb8a96..b9b26c9ac37fa4c24d638885fb6410f234ab1e9d 100644 (file)
--- 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 ae3329e452cafbfb63fd4be2c22d9eeef06755ac..7e251590f31e4779e1bdfab4e08425f7413e0173 100644 (file)
--- 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 5d74b61ad083ffde5e27683cd134c432daa13ada..5cc3b1c08881d41e8b8c7d02dc22314de50c3af9 100644 (file)
--- 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 f7fc8a425e304dfc717a8fbc83099b5fe9e10a9f..c28aeb6dfa8d929eecdea332ee4fc1e504346b64 100644 (file)
--- 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 a3851f9279d4bc3ec2101d01e5bb3d8bd879cb04..d610e1c1e3b1b08ae352798c7ee6f18700978305 100644 (file)
--- 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 ab40f29d9c8fed8b90a6f3cc1a5632f0318ae3d7..cb2506d74fd9723ae7168d223c0ea63b85dd57ce 100644 (file)
--- 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 cf6d31efb82dbb5b40ed2c55f7a3860884bdc43d..aa3df987af4f4c00f6cb2a9b973e411e01f4ae8b 100644 (file)
--- 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 da387f129279e68a328800f79468f60d0fc323bb..3f7e1e2f38ec16a72bb221a7272f17d3d2cfd041 100644 (file)
--- 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 c9519becceec02f787b3805da5bd8c32bece3a0c..8c380d264ab37065c4a0a23a77bde1da7bb580bb 100644 (file)
--- 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 36fa958979ccac19c4c0985249e7936a93699949..5d8b76f489754034b7e82441ee135c2bdd2821a4 100644 (file)
--- 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 4e838bd2daacb3e4d3af40db8fd29c898462e4ef..e9b407b7c2e3ff5d8688b97e8ee34b931361f7eb 100644 (file)
--- 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 2902087d31275db23766c92dcf548a98dbbb276f..54e9bff2ac0b857d2e55c17a4bb549ce61c9c8ba 100644 (file)
--- 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 b1d12e1bdf25ea63bb7e9489a1590478ed82a498..9050766ac72a318195d78f7dca1171c74e01ccd5 100644 (file)
--- 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 a8fc9092b36bf80e667752cd6646a8cc70d15ea1..e582afaef775f10d3bf6715e30e641d3589ef143 100644 (file)
--- 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 cf7665b213bd0c9e60de978733d61affdfa77896..4fc549bf1e825bba4be692aabdfe32287d87138a 100644 (file)
--- 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 e45990aeede87b5885ca9f48670b72677f34796c..a534aef240d63a04f93a31e7a01a73c51de31a5b 100644 (file)
--- 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 b9d97a2f61e63338f93730af2017e8331eb79fe9..6efe54e42681cf073fc977679c82390d33cf755e 100644 (file)
--- 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 07fb61382a6f6a8f2c3392a4475f046636cf3945..73eda40fca340b26b00cf7db9ac77faece20049b 100644 (file)
--- 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 1b566cb6cb0ee8771a7587a4b18ec84aedfbd687..3154710077bf077446a432b68b7d4c0dbaf86f45 100644 (file)
--- 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 e0905922828f0b5cb9f299708d70ec7f68867137..a67eca1f353f57940581356669dfb561d1e48165 100644 (file)
--- 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 22c60a7d59d43aaed076851927ba841849d4f5f8..1ebdf0b9296365ed53cfee25c5a5553a64ffeec2 100644 (file)
--- 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 f36d29280c7c1d38ec9d897c61132b0d6cfe79e0..1d19df7c2a142f90593a84f054154705e07f4921 100644 (file)
--- 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<S extends EffectiveStatement<?, ?>, 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 1aababf38129887f6edf5f11975a27b822a1d087..1f40e6c42653a82cd273b0ee9fabf347d2932eaf 100644 (file)
--- 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 fc358be4e2027dd3572eecb6a6be7f894b910c0b..f30de8f7fc96d9ec832b201b13d1de9d82632fd9 100644 (file)
--- 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 671653c8d7fa21c4274bcd5960834ac8c802b75c..1d3a6cc0781275fda8fc517fd94123c06ec598db 100644 (file)
--- 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 05a18f9c0876631fe3ac762b8fad5d63a245ebb3..9934ab411885d4350d952e41ad3ccf3c499d9aea 100644 (file)
--- 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 6a59cbf65ca2b8db942ee0bdc97118a4b6de3cd6..615865acb4f345c5ba59f128beba2b49c2bd129b 100644 (file)
--- 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 5b6f1c2308be23a6d4eb91934774627b1a3b52e5..244fe2b71c12f5882716f7fe50b33e953e11293b 100644 (file)
--- 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 48b8221d237290c5d9ed7bfe9b74dd14889ee1b0..31748be37bb1681415c1e5638e7c1a3b4ba2413a 100644 (file)
--- 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 78084894fc3f7718d7be1329a37204ba6174c040..c310df3005e23a959497a85071961664c0a2638e 100644 (file)
--- 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 e54cf391209920adf9c77afb4d339dd9c8e4dada..a89af658f3b895e2f387d786087d5514e7f3b7ed 100644 (file)
--- 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 4dafde6d8c221b16b27ef5798ae784231a9f1aa8..9cc9e6af22efab13d5427cd581f5a523e39473a3 100644 (file)
--- 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 b05bbf253fb3d41cee2eb6785e8a645996eaf5c1..29e8ec54fc172a9ce2b86ffa27db736e2d9a0eb5 100644 (file)
--- 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<ConcreteType> 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 5aa32d74df8636e87e0d227c22f9612f48258f70..07712e28d628e647586851517dcc8c3702a7a932 100644 (file)
--- 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 ff71d90d8ebac8959ffee98d5fb54684d6997735..3f27aeadf60dc41bc28dcb02907ca1f18aece2bc 100644 (file)
--- 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 bbd30ec9db8e659996746ee1e7a64e173ba75d30..541b415a68a939c61af56bf134b245a1eb68981a 100644 (file)
--- 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 d63fc7e139731c1aa31f79ad31c36026fd6a0a7c..652d31afe23a8466f99c0609d90f4cb76ff5014e 100644 (file)
--- 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 a6e0b008648d8829c88c251e9ece4041a1ba886d..bf3f394b3596b510f5afa44b9a96123505084826 100644 (file)
--- 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 a3dd7f27478e3b540c3c0e05c5bcc8de152b6294..07c901030723c58b6ac718890f41be0d539bec0d 100644 (file)
--- 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 d144120299330e2f4f01cf91949ac064cb01f57b..2c439d1c994fd36a4c6fcd3463aaad26b66e41b7 100644 (file)
--- 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<S extends EffectiveStatement<?, ?>>
         }
         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 245ccf882db309afff1058699f6613b430f9fc76..ae2db6e87c0cc9194bc59c46c689a9ada46ec84f 100644 (file)
--- 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<S extends EffectiveStatement<?, ?>>

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 f1984386188096267025a0075d7ce18853c6a058..a5de88e8ef8d315631d1f4b89381b73ea9d322ba 100644 (file)
--- 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<S extends EffectiveStatement<?, ?>>

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 a3c4cd3706beb1f821323098ba0703a9aa47f984..a8604f03c2e06fbf5aae1ea42a150d1221992ff8 100644 (file)
--- 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<S extends EffectiveStatement<?, ?>>

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 6bb4d1287f2c0b643ddd80ce78050be97ee8b1b6..70a9b7abdc37dc4aaae6e5e4ffef02d9682fed7b 100644 (file)
--- 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<S extends EffectiveStatement<?, ?>, 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 db2cb32d11b0d87b95408711e7b6731a048db6fb..f2f82267bd099318023fc2d3afd5a51271e966d6 100644 (file)
--- 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<ActionEffectiveStatement>

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 2ce8df25199fc457140f8526c68ae41b656ed9ad..47db71c4a4df2186f27f97f809cdd8c19cfeec1a 100644 (file)
--- 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<AnydataEffectiveStatement>

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 6778dfc6ac69b6bf48643cdc9643606c005bd912..cdfb97cbc05c6732e7d236dd5c41764641cb7ce8 100644 (file)
--- 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<AnyxmlEffectiveStatement>

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 08fc3baf37933c8593515aaa9130c0f3cb008f4c..d135a52417ada05cce386e052782c941b724573f 100644 (file)
--- 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<AugmentEffectiveStatement>

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 8f4f6c6167ee97d793662dd5f25205d8d9159758..7c7b369e976b79d196ba9c7d74ae4a265723b7e2 100644 (file)
--- 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 37a251c9fcc5471d66c2166c48209031be039962..3ff2f9d1e688969810db2ff2834f87b69dfe49dc 100644 (file)
--- 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<CaseEffectiveStatement>

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 6f85c8bf953a13129428367e04f3f95e31d3c505..3c4dfcae8130fd1434a93d8a19541210ac80493d 100644 (file)
--- 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<ChoiceEffectiveStatement>

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 5f9bd111be76a687dc7bda4a94ef75a7ae10c25a..cb934204d95fd4b10bff193cce29be34179e48a9 100644 (file)
--- 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<ContainerEffectiveStatement>

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 9dfbb970d0d68b031ad5f53649ce58eb48a41f65..e9c07a14038de5081051cfd0964f305f8409e006 100644 (file)
--- 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<FeatureEffectiveStatement>

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 418bfee7414a2cc908a3b80166b98a25bc41c31c..3311278ce032755ed3a39c38b7b813c18cc27d7a 100644 (file)
--- 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<GroupingEffectiveStatement>

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 992d22cc4365c4015fa4cbf36da62dae7ab59efe..e5c26557826fc1dabf9aff730f57ace19805389f 100644 (file)
--- 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<IdentityEffectiveStatement>

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 8104f8d17c80e9b8b193827b35e7bed3059bef1f..4789d781611c6ad4669649c165c615c33fb3a440 100644 (file)
--- 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<InputEffectiveStatement>

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 6612ae2241d9450945c150ab5fa8ecea074b1a97..6e5c87de4e7376825fe4287e84e1323346e37003 100644 (file)
--- 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<KeyEffectiveStatement>

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 fe149664b23487cd5b96bc8e5c0fe7651d0e6118..a067e627580730d0caba1d4c63285c4dd19274e3 100644 (file)
--- 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<LeafListEffectiveStatement, Type>

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 c39025d0c100f3d19b984540720a578797dcd360..d9f4324caa44ab38afe8698aee12e01f40a6394d 100644 (file)
--- 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<LeafEffectiveStatement, Type>

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 ca211b7dcc76c77377a031d317d496448e016d11..6ed2aff90cb6d4de8d322f8c5c041a8c8209a903 100644 (file)
--- 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<ListEffectiveStatement>

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 353b2969ed5646069a206acb48f52fa06f615d57..86bd7b914739162682ad4bfc558b903118968546 100644 (file)
--- 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 1eb2a542003cf944005be05ba921c3af17050645..f402bc728a360e9a8d8965814fd89e7850752dee 100644 (file)
--- 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<NotificationEffectiveStatement>

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 73f54b66759615f02ac017490b803437c77c0c1a..3757aba328f75ba7bcadf9093c81737a6b9456d7 100644 (file)
--- 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<OutputEffectiveStatement>

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 e0fcb9f72a775306612b6ef7eabcfbfefa6667a2..3c9784fff14d5b0ea89d28ba53d39a830949e9b1 100644 (file)
--- 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<RpcEffectiveStatement>

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 bdf1860fe1ee3401e69475fe768ff8cdcab4d530..9cb216e26da30ac528121cf59c2993aadfe64b4a 100644 (file)
--- 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<TypedefEffectiveStatement>

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 d871a6f6143d3992ae0321a428131d7f266d34e5..b94601fdd44e227b1e4628ee217679f6b763a6f6 100644 (file)
--- 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<YangDataEffectiveStatement>

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 dc95e725951c87af35d488383002882d0c1d6c2f..7b5b2d2d8727b358dba73a92341b0c4e9a6aaa1d 100644 (file)
--- 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 58deb5c09d7e0ed5b94ccf9edb7b0ac1cc03280b..336a12689a2748cbc4b183b217603231d0400edc 100644 (file)
--- 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 7e6b3dd66e61ed7952a619b791b2af23e4963379..f6d107e835b25d4a7cab3cb042a80239f08f600e 100644 (file)
--- 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 1084910d70784e6126755e1048c08343aa7f53d1..6c00d8a27b95840b3c0772f1b4d85cae8c7ec5d7 100644 (file)
--- 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 b65e8f8fa07d3771de35a6057d81252c80b0cfef..cd65c9577d09be83315642c6e456ff81a23e0bd3 100644 (file)
--- 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 48d39e805d9f65df1ae6aa4c328182a816415c7e..76dba4a816727549785c67f92944374fc9078a80 100644 (file)
--- 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 87f32bb3573a0ea53d064ba117175ef7517415db..bf938d3abc849dfc91127e2394cab8d696528a8e 100644 (file)
--- 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 b64c112feb72054424511ede28b8874778e90709..43d9b7226bd5e6a31c38e5117b4995ef34c2d8fc 100644 (file)
--- 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 d910b01a5cc1b74919a267838c7b457249112445..da570a07f377f03a0bb9ebf0eddb03a7369face7 100644 (file)
--- 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 7ff2c5c5f1b3160c40e3cd441b0271233ad3ade5..2e6d0c06057c7562f7c309ed6112c32aa7d6291b 100644 (file)
--- 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 e940b5ee824ce098ba13ee095123288f1b7e463a..2d205054c86d2515d4daa238fa87ae1f77e9faee 100644 (file)
--- 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 dae49bfa429b3ef6581097be7e20df5b08fa3aa8..beaf830b3aae4495e9860254ab5c675050fa77d3 100644 (file)
--- 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 c05ce67adb15df56b976df4d2a76a4a76a93c017..99f27512b3cfccdba93ed60485aabd89489cadca 100644 (file)
--- 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 990f02b58cc0236e88c9d406ff4b22bb3d2a1c84..0ac3c908702caa9ebf24e1ade6b9ca42af250543 100644 (file)
--- 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 809f7e73590a3fa58bdc13b73dd35f5ef5da2e65..a33b88ffeeee3e7a62d0d0b42436abbb1dda1158 100644 (file)
--- 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 e83510c2435efdaecc0eb0454620d8f0a4d9ffc2..d1a585fa69b9b51767db1a1f8d80e74cf71f3c31 100644 (file)
--- 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 830e0f14522275a9206905391cd27af7af432a7c..8fd458dda6dc9585c80f7220ce19c079e33b9ead 100644 (file)
--- 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 d826711d86bf541450a03825316d661e40bd6b0e..d8aba52b97edea2274218fcd7a63f2879c1289a0 100644 (file)
--- 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 b15689cbf8f2faab4752eb74bf795089888f16e4..f498dc04dd365f2975c5a0911611dc724e8c8590 100644 (file)
--- 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 7bb335a0a371eae45225d6c84a94412f0a4efff8..6e3749b2166c0cbec3c0548c2dd29a41c7e79921 100644 (file)
--- 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 85437007c85f436bc632eaa5674ff66145b332cf..9a74ffae460ff34974e05bbb47ecea94e546a1a9 100644 (file)
--- 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 3db9afbc56e678590b740499b50f1521eb64f3e8..7c63fe10f36122990598e68926a40c96b92c5d9a 100644 (file)
--- 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 95112df81b030237defc8667297bbb7238ee3110..53d91a6385882609b4be3cbecbcf69604c3e133e 100644 (file)
--- 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 6ac7d6715e9a1ec9d6cc8aa9082aca1320ae12ba..e69ccff1ae6dae8f9d19dc13b457c1cab3f75c0c 100644 (file)
--- 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 fd5ef3041ef89f9ad233ea0c091efa2b4e278ec7..20faf9f2354183e823c2ca6909c9d53078a1f785 100644 (file)
--- 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 f8690db92b60bfe48034931c222454400c53c4bc..fa4d5b69cf2da86db0ecd8c1d22c20890aa9c1b4 100644 (file)
--- 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 80cc55832c512a3376460321ba95d43ff5d05d73..eccbf37038fada49b403b9eca0578ab670a6c0e8 100644 (file)
--- 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 b9e6a313d9c71cc972fa2306fdebaafd1bf41200..fab6f5aa16f40c3f83895c3531ed97abe7417573 100644 (file)
--- 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 e975b0562335402c1a936e2a3a4f9fc50271b2a1..a1d305c25206023d1098e16cf38fe58d0a38abcf 100644 (file)
--- 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 c496ee6ef5ec1c71215507f00b932fae142598ac..2989ce5a510fcc0c911012cddadfafbb381424a7 100644 (file)
--- 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 d7e97e7f7f7264cafd969f88f903fec18b3d77ff..47c8638298b21cec47790fe8afabbf0e2b68d6c6 100644 (file)
--- 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 d9e8603277655708374dbf5a8961a47e952f3a95..6079c1d553cd9fde6440ffc97ec31975b81c745f 100644 (file)
--- 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 7761cdb46810b67ddeaecb06d01ac1d387a9b1fd..f05f3f293ba3e6df86349f975f0ae65a6ba6e66e 100644 (file)
--- 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 91a2319eaab9789fad958a4141f462d55fd12840..10f46aa32806dade87e4f9a6a9bc40495d613ec9 100644 (file)
--- 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 d41f116aafe03763976a6e761925bc4cd9dfda3f..f59992b264f3498b17ecea8b82ec849c384d7298 100644 (file)
--- 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 1cd05a1104f2d9bd5dfca05f9993d6555ea8816f..215d85c90c1627c305e1f1c97865106975802dc1 100644 (file)
--- 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 b440321c129c03d2ca2d2752efefdae74bcde235..aca722beb67e848ab4c4dd76759b45efb1609042 100644 (file)
--- 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 9d846c153580bf285b5b31279d8c676108ac8f94..f462ec22f695364a74f9036267c87a32a490569e 100644 (file)
--- 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 c2849994931806c3f1c9aaf0d36f1e49747dbdcb..e5c266dd50314bee19c0d50568c1bfe77e3e2449 100644 (file)
--- 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 44cc44158d51eaf793ff71a68f9c260a80d8fe9c..f3fbc5c7e48a1c0562db87644f3b62b5c6553757 100644 (file)
--- 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 da1fb7ddaaa68183da5146c216493dcda7c0882b..e7896fc27552522bc54a6896823a8bdef51fd7e6 100644 (file)
--- 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 a77a9e7ed0cad1d7a8316cb3447db428ecd62599..d1eff407b20f72f7fba8a46bcb527970141550ff 100644 (file)
--- 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 b953e4b03083263ce11aef7251fbbfc45a98c392..abde72e55598d317bdbb16abfd1e9338684fafa3 100644 (file)
--- 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 0a6c178321be8ccc9cb7b9fb49f1094cca51cd59..71253d0641b546c1693f949291b7f5934c8f9113 100644 (file)
--- 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 7ce90788f2b7bf5ceb9e47c35911337df432ea06..893cbf52e392d55ba745f6140bef08486952f132 100644 (file)
--- 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 3a0318380a04fe7a731d648fba90e842032b5cc0..9d275c138bff388f22ed67c513a07812c7fb8831 100644 (file)
--- 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 4bf407d20d4ac1534a0d6afcf4a1b6fb9e880a7b..bd9169df4a6744cceda55ccb709f40ee767899e9 100644 (file)
--- 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 1d14357598912154fbbba823fe4651aad9a9eb01..8065ac724140fd0e2e770f90e23989203fa5f7fc 100644 (file)
--- 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 a078db3303e0d6f51499cf1600168132943879c5..8d706a785ab12b8e75206696c9e9dc0e58eb2c03 100644 (file)
--- 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 47f1a0200f553676c3439f111253a5a83d780afc..209e19f8ae25518f57a29ea57bd6f6ff0e3ef16f 100644 (file)
--- 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 3240e72c8bb4100a8e522835361e1ea1f2af77d8..bacf8d259d15a8cbe8e8dafed32e8e3c16a20993 100644 (file)
--- 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 ef897e5217374b4ab5a9b293f6eb0c4ab595e4de..178ef96eb55e88c703ad08db7366a251fe9daa1c 100644 (file)
--- 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 e6b81511806f899af06b4d5c8f074c86f8809955..720a05bfe03ce7f2b1289ec2acd0f8e4fa100b6f 100644 (file)
--- 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 f64972fe144f0b00e7f882dce2d47f3226c1ce4a..f7993433f9cb78d831be6c1c31d6b7f77d7a0d7c 100644 (file)
--- 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 f76cfd0373cb7cd68c81137ae48889d6741aa5e4..5fc2259642859a374a13ab8a7937a3069fb531b3 100644 (file)
--- 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 e6ff2a662f14a8d1067313ebf9e09433fe6ce820..34d5b8f9363fdd9ea147fc03a32f0258f9c012ec 100644 (file)
--- 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 c731e82feffcbfcf67222529e62b523708bd737a..47d6692785e20707f600778fed5bdfe9d1d91387 100644 (file)
--- 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 268eeb71bb5bddda1f656e4e76b45dee8bd8e91d..7a52d07a3471d66f1c3957235487e366c4c143bd 100644 (file)
--- 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 46369f132fca22b391ce95b40fef4e9b52f2bfc8..9ebc894d1f225a6ffaac4ccad2dacf8de9a48a6b 100644 (file)
--- 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 f0fadb6a7f0e2b7be1baca006f7c418d95d1c7ca..9f55ace179fd502a0d3c3ffbf646a829f2034c47 100644 (file)
--- 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 9a64e6b2f4222447d9fe01f2f306a912085e6151..00d47cc8f806a930c00b25e4cac3d297a25adcf7 100644 (file)
--- 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 292f003c9815a2c5730598db187d47d5dc9e5ba5..fa549b1e2aa257115be2406e885252c77991e72f 100644 (file)
--- 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 86f0f634e31efa6f848b51102733c20fa0a16e9e..e39c6fe1d4fe77f031dc22f166e840312a868dfe 100644 (file)
--- 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 2f2b5554429fde56e0d3c115d3e1fa81963de703..d73d33b14adfe574f78c6103808e274fc4c5d39b 100644 (file)
--- 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 5dfa93b4ace28cd4940ebfb3ba721a2d88cd15f9..5cde253e0fd54ecd912bfea99a121d3b5811389b 100644 (file)
--- 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 933f2b702d6eb5a25d8f6db570eaae76f95ea595..cf96b84730649326578308dcd4095a35729a152c 100644 (file)
--- 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 e385cee0c7e8f4c1403e00b0aa5da3a4ae0aa221..70712d61dfcaa8a22e6740d4c790952e8527da3a 100644 (file)
--- 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 11404a393e06dce2d36f974ce8da8e5c79155e32..03e9ba28132a19dfed8392bfb87575d9c3ee9773 100644 (file)
--- 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 3d56fc9ebf2659e8d997965dc21ee1b5f495703b..63d99ffd9d2e7eb75f1f9fc113e13487720fc34a 100644 (file)
--- 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 9c4ea9c99379a3d5fbfd9022b04219234d9d92e7..7e7917a48a04d7dea282236ef2b5217e31291c5a 100644 (file)
--- 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 ff0043ce16681144c4a1d1078cb0788f37e63639..893e1d6e97faf63512a511122493438f8deb10af 100644 (file)
--- 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;