Seed yang-model-spi with model.util.type

Move TypeDefinition implementation into a newly-created artifact,
yang-model-spi. This is the second step if untangling the
parser-rfc7950/model-util dependency conundrum.

JIRA: YANGTOOLS-1052
Change-Id: I3282d730ae2517efb8edc3f46bdc39d135677790
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 08ef9e398af7bda1e43b746c9e9c78f35a7668a6..3034c3e3819434f8379084844a5af8d0cdc81a81 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -84,6 +84,11 @@
                 <artifactId>yang-model-api</artifactId>
                 <version>7.0.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-spi</artifactId>
+                <version>7.0.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-export</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
index 36fbd9683997e806a32a5f55342d21b984aa0b28..4b411a41205bb7a5a8c8ce86a6771de0bda987d5 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -74,6 +74,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-export</artifactId>

diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 114ec965c8ee10c0631c18ca57bc44499fee490f..5aec457841447adeca007dc52d8f0f26592a63a0 100644 (file)
--- a/features/odl-yangtools-parser-api/pom.xml
+++ b/features/odl-yangtools-parser-api/pom.xml
@@ -84,6 +84,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>

diff --git a/yang/pom.xml b/yang/pom.xml
index bd3170ec07861e586bf383d590b9c0c7f6487b26..1991b519bb673979b5e1f38d1d1d82be32970d56 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -34,6 +34,7 @@
         <module>yang-data-codec-gson</module>
         <module>yang-data-codec-xml</module>
         <module>yang-model-api</module>
+        <module>yang-model-spi</module>
         <module>yang-model-export</module>
         <module>yang-model-util</module>
         <module>yang-model-util-ut</module>

diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
index 37139d153488676d989998312c5ebd217ba1b4e4..9c6436ec099d9d6bc2d73190497e80fd20284659 100644 (file)
--- a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
+++ b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java
@@ -26,8 +26,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithQNameArgument.WithSubstatements;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.UnknownEffectiveStatementBase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;

diff --git a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java b/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
index e03b04f83fa8a957f3a80656df6cbbc2644d1816..a5e7a9ba7d78dfdf659f7c1cc480497ab0622f5f 100644 (file)
--- a/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
+++ b/yang/rfc7952-parser-support/src/test/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationTest.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.rfc7950.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;

diff --git a/yang/yang-data-impl/src/main/java/module-info.java b/yang/yang-data-impl/src/main/java/module-info.java
index 6935fffe474c013280a21aae83397ec812c52c3f..22b06786fd31d0032aa3710ad86ff8eac9e55655 100644 (file)
--- a/yang/yang-data-impl/src/main/java/module-info.java
+++ b/yang/yang-data-impl/src/main/java/module-info.java
@@ -28,6 +28,7 @@ module org.opendaylight.yangtools.yang.data.impl {
     requires org.opendaylight.yangtools.rfc8528.data.util;
     requires org.opendaylight.yangtools.yang.common;
     requires org.opendaylight.yangtools.yang.model.api;
+    requires org.opendaylight.yangtools.yang.model.spi;
     requires org.opendaylight.yangtools.yang.model.util;
     requires org.slf4j;
 

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java
index ee91a1ac7d6abe629e7337e1b0c44701d1a20f5d..4c6230d36c8f64ffd80dd75a04667329608c6686 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryCodecStringTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar
 import java.util.Base64;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for BinaryCodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java
index fe1e5dbae80a77d15fcb057703af0b441f6266af..6a5e7621ed16dda0685842f479b6ce63557dd06d 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BitsCodecStringTest.java
@@ -20,8 +20,8 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.data.api.codec.BitsCodec;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.BitsTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BitsTypeBuilder;
 
 /**
  * Unit tests for BitsCodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java
index 8a4c013c83926d9a6dcde016cdbda1a8d8117abd..c4dbf236bc00eaaceee6f3300f84d32027338e34 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanCodecStringTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.BooleanCodec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for BooleanCodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java
index ba6a39810b33923ec204dea91baad62dbe0fdec7..cda2cbbf3b4c13168c75ac4f39502dc723000a2b 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalCodecStringTest.java
@@ -14,7 +14,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.codec.DecimalCodec;
 import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for DecimalCodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java
index d0902e198b89dfdf24e8cbf86b940ac3700dcc18..dc3cba3f7b7c8857fb51d5c8acbeb46269fbf50b 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyCodecStringTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
 import static org.junit.Assert.assertEquals;
@@ -13,7 +12,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.data.api.codec.EmptyCodec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for EmptyCodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java
index 5f9dabc121430bd75eb49483c6b1778ec17094c3..8ef0966aaaa91dec6f3d53768645ac93175fa591 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16CodecStringTest.java
@@ -13,7 +13,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.Int16Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Int8CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java
index 24e00b854a3a71806911df3c14bddf201d4bded4..190ecffd43fc8c8765f17f2af9d5718e8cbd05c9 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32CodecStringTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.Int32Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Int32CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java
index 2abc82e70ecdb51b1704b39bc7cbd9b880f92d44..0b668826b4ac18bf1a82cd790cdbfbb37409418e 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64CodecStringTest.java
@@ -13,7 +13,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.Int64Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Int64CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java
index 3119fe640d4b5e3b8c8d1eeb41eadaf5e1f7637a..3d14ba80df7b1a12a955f56b79fae21f5770a4a8 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8CodecStringTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.Int8Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Int8CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java
index 564d3437cce18b8654202c8006311f427956bceb..94eae0ca630a7229b29d1c7ef6fbb56ee8a47dfd 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/StringCodecStringTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.StringCodec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for StringCodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java
index 757ecd0d3d91359ef89fcaa66167a6828fb90cc1..31ae57b397384e5fd7b4ffc60791cd66d664d24d 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java
@@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.EnumerationTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.EnumerationTypeBuilder;
 
 public final class TypeDefinitionAwareCodecTestHelper {
     private TypeDefinitionAwareCodecTestHelper() {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java
index d75da405a9e40d681f8fdd6b02af8392c166e2eb..2d60b8de91e35a545f574c60d71136363d8c1877 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16CodecStringTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.data.api.codec.Uint16Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Uint16CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java
index 269559a4c56e89f92c0210ab6b10f03b60021f24..142017fc44a488970acce1310297ef652cc284c7 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32CodecStringTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.data.api.codec.Uint32Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Uint32CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java
index 8eb6f5a6f00145718eb8a210dd7b455b7074d227..946f58b627d64d4473c336ad68d7789ad34c1866 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64CodecStringTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Uint64;
 import org.opendaylight.yangtools.yang.data.api.codec.Uint64Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Uint64CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java
index 4cf1ee50f769cd9ce8e89745fe9bd3322a408629..6b2cfa4031f587e74bf521af0c9ed217a54f2dc0 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8CodecStringTest.java
@@ -14,7 +14,7 @@ import static org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwar
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.Uint8;
 import org.opendaylight.yangtools.yang.data.api.codec.Uint8Codec;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Unit tests for Uint8CodecString.

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java
index 7e5fe62a9adee22879bc8d773ce0d36acf0b6eb1..bec571330b2c35c47141736447ac52cb61edd08c 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionCodecStringTest.java
@@ -18,8 +18,8 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.codec.UnionCodec;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.UnionTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.UnionTypeBuilder;
 
 /**
  * Unit tests forUnionCodecString.

diff --git a/yang/yang-model-spi/pom.xml b/yang/yang-model-spi/pom.xml
new file mode 100644 (file)
index 0000000..3f95460
--- /dev/null
+++ b/yang/yang-model-spi/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2021 PANTHEON.tech, s.r.o.. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
+        <relativePath>../../bundle-parent</relativePath>
+    </parent>
+
+    <artifactId>yang-model-spi</artifactId>
+    <packaging>bundle</packaging>
+    <name>${project.artifactId}</name>
+    <description>${project.artifactId}</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/yang/yang-model-spi/src/main/java/module-info.java b/yang/yang-model-spi/src/main/java/module-info.java
new file mode 100644 (file)
index 0000000..feeac36
--- /dev/null
+++ b/yang/yang-model-spi/src/main/java/module-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2021 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+module org.opendaylight.yangtools.yang.model.spi {
+    exports org.opendaylight.yangtools.yang.model.spi.type;
+
+    requires transitive org.opendaylight.yangtools.yang.model.api;
+    requires org.opendaylight.yangtools.yang.common;
+
+//    requires org.opendaylight.yangtools.util;
+//    requires org.slf4j;
+
+    // Annotations
+    requires static transitive org.eclipse.jdt.annotation;
+//    requires static com.github.spotbugs.annotations;
+}

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractBaseType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractBaseType.java
index da34949fc593e4f2206360c1576cee5d8b2f81a0..34189bd18037be33d903e351be66340801ceaf45 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractBaseType.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractDerivedType.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractDerivedType.java
index 50cf6befe20d97804ffc30075e7239c9aa31fca5..decd61b7bded7806ae02b3c1973e5ff059fa23e7 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractDerivedType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractDerivedType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedBaseType.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedBaseType.java
index dd38bca403c57fbff4090ce2c9522d28a22c2c25..e5daab776eaa6e8cd35f8089bcd9e59d590c8c98 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedBaseType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedBaseType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedDerivedType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedDerivedType.java
index aaab2e807daa7213873369b1867c51d0046aa60c..bf467d0ad6d22c845e91fdf4d62b07d98c0bf44f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedDerivedType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedDerivedType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.Optional;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedType.java
index c0f7ecbee7f66530c864a2b04797bf24e2e3aeaf..cf63671fc01624fb844080779dfe999e2c44cfd5 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractLengthRestrictedType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractLengthRestrictedType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.Optional;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedBaseType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedBaseType.java
index 4731b7bebb1b6c4255146f0852ce9e6c5707dad3..c049d1bebac7f0a3f60c2fbf8f6af7a09569dfb1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedBaseType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedBaseType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedDerivedType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedDerivedType.java
index 75343553ec5fe789deeff5b82cf503ca490dd754..f138a64cec3b3d975338b9710e2d27b4a70388d9 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedDerivedType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedDerivedType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.Optional;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedType.java
index 747704eb8ed51453322a6589534a0601bdf9bd8c..2c94f91bd68d4514ad589f51ddd1d4f6d3b4818d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangeRestrictedType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRangeRestrictedType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.Optional;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedType.java
index 35c7d1dd6047d04cd66c313f54eec86d21d5cde4..bb100b570b218b00e048b815d4fcf173e2cf242a 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedTypeBuilder.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedTypeBuilder.java
index cba537a1e50c6d593b30ac82c3f1a3de5cb6c0a6..90d8c85fa3c9990ae54800773dc89640ab1ec4f6 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractRestrictedTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verifyNotNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractTypeDefinition.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractTypeDefinition.java
index 4c2a78de55c3dda4224f344f2c391804e3246e62..092dfd5216d080250ea8a5eab8714140207dc8d4 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractTypeDefinition.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/AbstractTypeDefinition.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBinaryType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBinaryType.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBinaryType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBinaryType.java
index 0db63df91fb565fcb396a0cac4fc38130e443ddd..7cb50017df4cf2702cd191f1022660b948e3ee8b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBinaryType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBinaryType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBitsType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBitsType.java
index 6bd23a20d506af01e45b5541aa3d962ce19623d8..1658a2957b6e099bf8eb43e0b69601d4d1662652 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBitsType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBitsType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBooleanType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBooleanType.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBooleanType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBooleanType.java
index c339d8ba5abb42adbecd6c3763bee82860a62a40..a8ab41c4d8286386132496d83c5426bb53380f61 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseBooleanType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseBooleanType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseDecimalType.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseDecimalType.java
index 8f1ae76ef7ff3df7680e6386f77155ab89c0196e..1e648ea213c0f41dc2f683551692f66ab72dd398 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseDecimalType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Verify.verifyNotNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEmptyType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEmptyType.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEmptyType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEmptyType.java
index 138d586b657965bfa185bafdb1f5b03a899c2bfb..8e7e1f75df81470e02ef85209f782b7a7f964957 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEmptyType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEmptyType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEnumerationType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEnumerationType.java
index aba5dc374b588ae780a85f9c83d22f2b95b4c87f..5c238822fe1251846d6384b527aba8d2a4410b28 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseEnumerationType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseEnumerationType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseIdentityrefType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseIdentityrefType.java
index 693e1178d292136d4482ba3f6b18b062cc15d900..6ecd10d3434cf63799f96c2577aa46c0c2fa7209 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseIdentityrefType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseIdentityrefType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInstanceIdentifierType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInstanceIdentifierType.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInstanceIdentifierType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInstanceIdentifierType.java
index bb955a2b4ba6120cb569b61b2167066cd48d5080..9ae5f0a073d3164de4f362b21a5e99d146cfe690 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInstanceIdentifierType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInstanceIdentifierType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt16Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt16Type.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt16Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt16Type.java
index 8c66349af828922c742cd430a01d58b9456ab143..25302564505e34e3e527551ef9c6c0446a3cb1fa 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt16Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt16Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt32Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt32Type.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt32Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt32Type.java
index 779966a53269fed921da29b257c89786c171bc0b..2400f92145cb41b95e59a4687c1f6ce3f5f2138d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt32Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt32Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt64Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt64Type.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt64Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt64Type.java
index 564a79874095f7e5094f1739004bccacea33cbda..39e9934c61c1368c8bc90f4dcf54af4406bd3492 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt64Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt64Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt8Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt8Type.java
similarity index 94%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt8Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt8Type.java
index 6afd197830e4c75b591acb6cc2eaa9ebdfbfd577..ce3a61e126b494f4ee61817e2980340b87a3c556 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseInt8Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseInt8Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseLeafrefType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseLeafrefType.java
index f767c8cd59989e2557aed9185d4241ae71c90843..d05555b7f7a2fd119018c0cf19e2dba8516a96da 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseLeafrefType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseLeafrefType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseStringType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseStringType.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseStringType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseStringType.java
index 0a170fec89aeb8584cf73fd85eb148bff26bbb03..dcf5af3b5ba3aab585115b28da3f5aefb25a7e36 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseStringType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseStringType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseTypes.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseTypes.java
index f349944d464ea89744c05c2f26beb72ba9cc1a55..a2ae3745623476975783d3fb6f4b868bbf69f739 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseTypes.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseTypes.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint16Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint16Type.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint16Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint16Type.java
index 9b2acb4fe64ebe03ba320f040bfb735e4f1c582d..785808dd531a3d7047740c0442f87e2f208d5621 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint16Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint16Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.Uint16;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint32Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint32Type.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint32Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint32Type.java
index 9dcf70bd91a70a0a27a4be9db0946d65b96e63e8..5099025d8f1847e48c893f4f0c14d9827d539d2b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint32Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint32Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.Uint32;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint64Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint64Type.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint64Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint64Type.java
index 8f99f02bdcc25fc0f6a6c477b0e85eaf3f8d94cc..4c23e3d49309227d05acce35b1715b8f1b95fccf 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint64Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint64Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.Uint64;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint8Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint8Type.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint8Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint8Type.java
index 72186ee7f0f7408dab20c1f0679b8c21c511b6ba..00b58b84bc781eafbea60741e2c116fd6618a411 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUint8Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUint8Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.Uint8;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUnionType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUnionType.java
index 1d70b511b4364dce8f25c54623eec73155a9003d..d681107e1cd497482f1da4b7ad02dd7bd237ee5b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseUnionType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BaseUnionType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitBuilder.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitBuilder.java
index 2ec0b43eeb429afd86f23b6918fec4a2e03d2068..ea11dbdea1fb92910d3927ef2120f18f80d61973 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitImpl.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitImpl.java
index 0a7f3092741b9a869f70df6b0d86d3c2ccc64932..3aac40c29a2bb287db5883ca1c18d0dc32211614 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitImpl.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitImpl.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeBuilder.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeBuilder.java
index 33edeefe2f4f98b7e4808c2b3e413e1d78bd767c..bb0b643c7d8e19f154e090dd985e3b7efe1cf1f2 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BitsTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/CompatUtils.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/CompatUtils.java
similarity index 99%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/CompatUtils.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/CompatUtils.java
index 455fa059b5702955a0f05f18c0b7900a7263f6e6..b33000280d374b88da73688a7c2a0919d81a76f3 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/CompatUtils.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/CompatUtils.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypeBuilder.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypeBuilder.java
index 1adb731065afdc30e0512caff0a02192d4689458..ebac9e535f797c77ef0e17badfbadc1bb9f2dde8 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Verify.verifyNotNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypes.java
similarity index 99%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypes.java
index 44bd9b49dc69cc3cf9c86864e9f74b8bcd15ae80..415292373b4f492c7eb98b5c1b676a3d40bbee9f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypes.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ConcreteTypes.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNullByDefault;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DecimalTypeBuilder.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DecimalTypeBuilder.java
index 36517352155e0e1e39eb04d4b7b8da9cc8d1356b..b4423787a3ac475004d618c50ee89185e0c147fc 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DecimalTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DecimalTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkState;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBinaryType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBinaryType.java
index 396014a7860b8c206517129dd2583c7b288b66ec..f4f572775586b1efa253f9a32930973d4052b2c4 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBinaryType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBinaryType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBitsType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBitsType.java
index 047e718844186638e682e003d9aa8b5425503f07..50bc600fa4ce6192bd685536d170c2fcdc0cec9e 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBitsType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBitsType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBooleanType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBooleanType.java
index a7ef7f7f561407c98d895fae9b7fffd412ab3ed9..be14562d5e465fd451229a09385450e9650e89d9 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedBooleanType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedBooleanType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedDecimalType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedDecimalType.java
index 905dad949c0a5e0247c65e53fea7420e62f468ca..db33512c574276aa32aef64f9d529923d6755cf7 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedDecimalType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedDecimalType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.math.BigDecimal;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEmptyType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEmptyType.java
index ffe5869249f6d76a4c95170a75ebd86405dc6187..ddd1d57d394a1b495786f954b4f71b21a3597dec 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEmptyType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEmptyType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEnumerationType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEnumerationType.java
index 7880b06909e85aa4dcc2366138acb64a20bc3951..a0722ffb9664951dcfcd3e529f48c13c5f77e3be 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedEnumerationType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedEnumerationType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedIdentityrefType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedIdentityrefType.java
index ee3a15fe20112f2a5d7a4b91a62997370cbdb9fc..21e2f1e335e4a8ad4b3ad7aa8d38046dc7dde9c8 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedIdentityrefType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedIdentityrefType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.Set;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInstanceIdentifierType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInstanceIdentifierType.java
index 12d3e7340aeeb2c1063614a6b4ccf2bc950dc9c4..61f8bbea078d01ad9b13acae1a54233d13b868e5 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInstanceIdentifierType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt16Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt16Type.java
index 2e34af50ec9970034105f3d9851fab882f995d10..cdbef0b6b3517d789fa9307e8c807e645eca2da1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt16Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt16Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt32Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt32Type.java
index 1d02b9f430dfd47863ccf941dfd1e6f6b3d0ea80..52f5bdf7bd8ad6c5410e647b2fe0f43ef041d93f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt32Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt32Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt64Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt64Type.java
index 08d976d1fe7c30330cc1b996c0426ac659eb6ab9..e67a9955ed6139bd9a67f6ad243168c8e10edc6d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt64Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt64Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt8Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt8Type.java
index a069197dd1f1d4baad13faaabbcedeaae6f6d5c5..c577ed42fe363548b4687ae65c42b8f43071bfbd 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInt8Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedInt8Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedLeafrefType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedLeafrefType.java
index d4dd8720289e43f9579abf958ea56803d4e4a7c1..eb3cfb40cd5dfae710bcd33d4b2aea4d2f7ee799 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedLeafrefType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedLeafrefType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedStringType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedStringType.java
index af73f6f05c0ef985fcbb284b0e662449592c46a2..9eff8bdfc71998c09435715ff6e41939d03c5671 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedStringType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedStringType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypeBuilder.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypeBuilder.java
index 07a8a9a1c89846a95f51d2951e8cf01e8efd3f9e..145f53bcd26129077498242be2fb8821477d81a4 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypes.java
similarity index 99%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypes.java
index 1863b32f7a7ffabb4c0bf069b37f0bc679041e4d..e094197d30c0106eb0ada1ae884548ecce6d5fc8 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypes.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedTypes.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint16Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint16Type.java
index a74594ef34590643276a7a6c885147ff2fa9b1c7..5127ea95bab3816ee09e11c5cb8814e7158f0e97 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint16Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint16Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint32Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint32Type.java
index 594abc1c01120577d095926de4040ce6e6f3fa28..f73205954f4a4a2a8467080e7da49151117f5b88 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint32Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint32Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint64Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint64Type.java
index fa678d10e49438b378207d7f86e98f2a2b5fa64f..8ed6a4d96882da3a65ebbda8681585e0d044dad1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint64Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint64Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint8Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint8Type.java
index e94d577ef991051c6466ced290fcdd096a5add32..1bd390066170b32c335a1aa8661087298fc93ef6 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUint8Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUint8Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUnionType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUnionType.java
index 1631d625dfac9b7d4766b13e1ea86ae18cd19481..9c2ecdce14091223e53fb023437cb88380b203ae 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedUnionType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/DerivedUnionType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairBuilder.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairBuilder.java
index de3ff397ee3a89aaa66182844ccbe8c6675ddc4d..4d64d6a186c4c80afb00cfd03415de172d06e6d0 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImpl.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImpl.java
index b74d75735e4b6f173357b44b01408c97e7f0e78c..6c8cb14af0a26f43318f347a02e8657becde9611 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImpl.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImpl.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumerationTypeBuilder.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumerationTypeBuilder.java
index 3680e4bc2ad96712a1e25dc61dff8341c8e7572a..93253339287d1b445984477946e1042ecc4f52b1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/EnumerationTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/EnumerationTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/IdentityrefTypeBuilder.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/IdentityrefTypeBuilder.java
index d9fe09dfff76fb369f1d844ad6cacb25c364aed3..f90189aca83b9780da9423c5d1313678e271763f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/IdentityrefTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/IdentityrefTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkState;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InstanceIdentifierTypeBuilder.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InstanceIdentifierTypeBuilder.java
index d42c065ddbad9d65f6c1e5be61b93d9b041f9732..838d40029f62e84c7d3ad42326f5bbb692fa514d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InstanceIdentifierTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InstanceIdentifierTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidBitDefinitionException.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidBitDefinitionException.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidBitDefinitionException.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidBitDefinitionException.java
index 81ce1b2c6c18f5ad5c985136aeb18eea07c0f979..f73fd16f61e8475a4d63bf374ffe7682ddb72f1d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidBitDefinitionException.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidBitDefinitionException.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidEnumDefinitionException.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidEnumDefinitionException.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidEnumDefinitionException.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidEnumDefinitionException.java
index 59d059d552b1e6e11e7cef35e37b424a2ab32353..9365163fdc961c59c1c714cd6947fbb9bc12de05 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidEnumDefinitionException.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidEnumDefinitionException.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidLengthConstraintException.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidLengthConstraintException.java
similarity index 92%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidLengthConstraintException.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidLengthConstraintException.java
index 533504a02936f814091dd5ced6060d362d6f6f03..77456aa3a7a5633cd729b40251836949a0c6e95f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidLengthConstraintException.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidLengthConstraintException.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidRangeConstraintException.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidRangeConstraintException.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidRangeConstraintException.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidRangeConstraintException.java
index 3da55e7a47cc985cd78b5fc29dbf7923e485ff98..20dbaf887c7e379a6067af4405654d3a592bf51b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/InvalidRangeConstraintException.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/InvalidRangeConstraintException.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/JavaLengthConstraints.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/JavaLengthConstraints.java
index 22c9ac85568fa95727be3b6aa0a3aef95c4a96b9..039fd1a27f71b549bb2f2139a0242bd05212a4c6 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/JavaLengthConstraints.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableRangeSet;
 import com.google.common.collect.Range;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTypeBuilder.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTypeBuilder.java
index b268fadb93a6f740ff8cce3a7c7ca7bea05ea300..298fab1ac91cc50b28dfafa8a33ccd2f34db2737 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LeafrefTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LengthRestrictedTypeBuilder.java
similarity index 98%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LengthRestrictedTypeBuilder.java
index 8378773f92e0e3a64d6352c42c99ef0856e65f41..15b76066aa86c29e257c2bb8fbcb71138ce74868 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/LengthRestrictedTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/NumberUtil.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtil.java
similarity index 99%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/NumberUtil.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtil.java
index 2b71341a0afebcf8f327f9f4e944aee05303bf6c..5315ddc0e20bccef1062b4a0350468187c18a806 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/NumberUtil.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtil.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilder.java
similarity index 99%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilder.java
index a7286400436b23c135c9e1f79813e5f9e95c7184..6c0c91eeb5dab9d1da7559b4c73bccf9fd25db3b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilderWithBase.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilderWithBase.java
index 1713cc183e0e3201052805ef71a05141def3a105..e3caf707ed1ed8ed18f5bfc7f860a127cff84278 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RangeRestrictedTypeBuilderWithBase.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RangeRestrictedTypeBuilderWithBase.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RequireInstanceRestrictedTypeBuilder.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RequireInstanceRestrictedTypeBuilder.java
index 24c14894620fb47340b6288e4c0166067daa5b38..b0fa302934b48d516bbee72a7eeb2f7e8f668317 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RequireInstanceRestrictedTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RequireInstanceRestrictedTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ResolvedLengthConstraint.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedLengthConstraint.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ResolvedLengthConstraint.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedLengthConstraint.java
index 3abae2eff3a68813081da82305c38958985e1e5b..44684a1294808ee2790c8edad0de4d61d492bdb6 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ResolvedLengthConstraint.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedLengthConstraint.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ResolvedRangeConstraint.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedRangeConstraint.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ResolvedRangeConstraint.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedRangeConstraint.java
index 93d41f30030cccd5817bb0448ed6ff5fe59e68a0..87d52f822e0c8222d17873a7b17416ac8ded9354 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ResolvedRangeConstraint.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/ResolvedRangeConstraint.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBinaryType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBinaryType.java
index 31737fbb56f6eb110f9fed704a377ae5c573f02e..bf8e3c1929fe4ff4457406cee59217022f8fdeee 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBinaryType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBinaryType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBitsType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBitsType.java
index 180b8efaa34d1c7346efeafd0677d5d7a70eba4a..e38af508156390b206fdbc68b0563ffca916cfbb 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBitsType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBitsType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBooleanType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBooleanType.java
index 004306ae9740df94a998fbc61828e9444367f7d2..66825ab3af8b9cfac42f2b9b983b4aa300c2b643 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedBooleanType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedBooleanType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedDecimalType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedDecimalType.java
index a6da9dafd5738249be487c9b556222296d03d4c7..dfda55aed17c984072dea43c07a05a9cff8c6faf 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedDecimalType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedDecimalType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.math.BigDecimal;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEmptyType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEmptyType.java
index 521ec73ed419c80d01aec0ab73a81e315962955a..8b723bc6ff8cab9f88cd9c9640e3cb43017a4b4c 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEmptyType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEmptyType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEnumerationType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEnumerationType.java
index b40b7c54eb0f553b1669a8e368f4d09e69b10366..4965ba5cdced932282e2cac9e2093b894569fc57 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedEnumerationType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedEnumerationType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedIdentityrefType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedIdentityrefType.java
index 12bcd0c5020cd10ac7e3ba9f9f419c01dd595a0c..312a7d39065b66ef1794c8c10b54d33c38795b79 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedIdentityrefType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedIdentityrefType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.Set;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInstanceIdentifierType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInstanceIdentifierType.java
index c8c6f0cc52057f9f5ae1e3ce1e53f05f0d27c3e7..925467a1540881fb3843c29501981f350d475691 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInstanceIdentifierType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInstanceIdentifierType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt16Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt16Type.java
index d17a701b1983a38692207b5855e626b3c7678a95..e824d04b6ba3eae3860a78526ef805780674805b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt16Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt16Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt32Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt32Type.java
index 147daadd525637849b55f0872bf7fe062e897c61..50fb2f010012890f0f36a660e08cbf3821a2a6a2 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt32Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt32Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt64Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt64Type.java
index 95a1aa1c9c66eca1bed6fa56f83f22624b23fe3f..aa522e1ed6fa2acf012107888557fc3133fadd38 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt64Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt64Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt8Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt8Type.java
index 3e34a028be39942d92bbcd2b405298da63e0187f..08de814a2a358d9268e2aedd1ca7437539e875cf 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedInt8Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedInt8Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedLeafrefType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedLeafrefType.java
index a7ac1afb9c459c9fdff81c6cc5e2c7370798cd52..bff28a8c68c797571167c8282095e95cb39aa2da 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedLeafrefType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedLeafrefType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.common.QName;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedStringType.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedStringType.java
index 828f4ad49c8d348f4f1f98593bebcd6302678f68..ed305627ef18d605590365822fbe651e02c61423 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedStringType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedStringType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedTypes.java
similarity index 99%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedTypes.java
index 7cc226a5387e84ff1be7838365bcb07e0f3d2ad6..c9238519903bae34075ba0f5e18077da5a9388a1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedTypes.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.annotations.Beta;
 import java.math.BigDecimal;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint16Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint16Type.java
index 6ad18983930bb230377685c7fc039c35df48fb0f..8ec151997eb09c3fd7686da32073f52a93a53dbb 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint16Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint16Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint32Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint32Type.java
index 045a3aeeccc4c2ce5fc0421ba8294efb4f0870e2..4f3b753819d24a42d7792d982dc18f946c6018cb 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint32Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint32Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint64Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint64Type.java
index 7a6010059c8b87738ee2108a9481f60a7c8a94ad..9bf031293d7ff1ebe575b760f8572bda23fc5f3c 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint64Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint64Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint8Type.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint8Type.java
index 918f7e02ed075b2c6d14aa228d1ffb2b64c82427..07c763180f8478fdf1dace97f05b34242499a4ee 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUint8Type.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUint8Type.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import org.eclipse.jdt.annotation.Nullable;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUnionType.java
similarity index 96%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUnionType.java
index 20a247935ba1b203423a06da7cd32785ba6cc97b..f61c4aeddcca358cc1eb78f10abf1562f8b63bc3 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedUnionType.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/RestrictedUnionType.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/StringTypeBuilder.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/StringTypeBuilder.java
index 6757965b2208e939a90a0f71b929faf42ef44507..07bfbdd483281fb5e9d885416bf0af8513c0c058 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/StringTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/TypeBuilder.java
similarity index 97%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/TypeBuilder.java
index 2aa24a298ea627da4af25864a2e327570e715a95..b05f7cb7fef0f6b1252580dee10f2e731c203fb9 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/TypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/UnionTypeBuilder.java
similarity index 95%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/UnionTypeBuilder.java
index 1eb0e71e30581aa47d252cedde8ad0f9193798c1..228915e1cbc924cb7bb61ecd57b22550a283c85d 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/UnionTypeBuilder.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/type/UnionTypeBuilder.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BinaryTypeTest.java
similarity index 86%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BinaryTypeTest.java
index 80433fa81bc15984a83167a2e015a293fbfcc731..8676699d8d94b272498f9927d8bc0e31278c53ac 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BinaryTypeTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BinaryTypeTest.java
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.opendaylight.yangtools.yang.model.util.type.BaseTypes.binaryType;
 
 import java.util.Optional;
 import org.junit.Test;
@@ -20,8 +19,8 @@ import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
 public class BinaryTypeTest {
     @Test
     public void canCreateBinaryType() {
-        final BinaryTypeDefinition binType = binaryType();
-        final BinaryTypeDefinition binType1 = binaryType();
+        final BinaryTypeDefinition binType = BaseTypes.binaryType();
+        final BinaryTypeDefinition binType1 = BaseTypes.binaryType();
 
         assertFalse(binType.getLengthConstraint().isPresent());
         assertEquals(Optional.empty(), binType.getDefaultValue());

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/BitImplTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitImplTest.java
similarity index 98%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/BitImplTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitImplTest.java
index e3e0fe0ef9e75c6b14b3583ae33231ca89f8aa9f..276208694a96b237dcde93fc05487dfac8fc1b38 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/BitImplTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitImplTest.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertEquals;

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeTest.java
similarity index 95%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeTest.java
index c468fe5e73350aca7bcb204e1841a4282d003812..defe99d796dbea012fde1cf2f2e7eafd64a11058 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BitsTypeTest.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.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,7 +23,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BitsTypeTest {

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BooleanTypeTest.java
similarity index 88%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BooleanTypeTest.java
index 50d42cdc1e27fcb6b0f4cd20328054c72ed26c7e..735d1bddb1e1319d97d87da2bbd11c2ff5c8673d 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BooleanTypeTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/BooleanTypeTest.java
@@ -5,13 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.opendaylight.yangtools.yang.model.util.type.BaseTypes.booleanType;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -22,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;
 public class BooleanTypeTest {
     @Test
     public void canCreateBooleanType() {
-        final BooleanTypeDefinition boolType = booleanType();
+        final BooleanTypeDefinition boolType = BaseTypes.booleanType();
 
         assertEquals("getQName gives BOOLEAN_QNAME", BooleanTypeDefinition.QNAME, boolType.getQName());
         assertFalse(boolType.getDescription().isPresent());

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EmptyTypeTest.java
similarity index 88%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EmptyTypeTest.java
index 470e0c9605fa278e2e01f7dddf81082f30069479..689d84aad33114b51181243d896454d4344d51b2 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/EmptyTypeTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EmptyTypeTest.java
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.opendaylight.yangtools.yang.model.util.type.BaseTypes.emptyType;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -21,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
 public class EmptyTypeTest {
     @Test
     public void canCreateEmptyType() {
-        EmptyTypeDefinition emptyType = emptyType();
+        EmptyTypeDefinition emptyType = BaseTypes.emptyType();
 
         assertEquals("QName", EmptyTypeDefinition.QNAME, emptyType.getQName());
         assertEquals("BaseType", null, emptyType.getBaseType());

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImplTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImplTest.java
similarity index 97%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImplTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImplTest.java
index 694e9f29317d67f1bc58110c33fe2d1a20cf17d2..0d9850788b3aff7f96ee1907a4b174d07ed742a9 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/EnumPairImplTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/EnumPairImplTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/Int8Test.java
similarity index 90%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/Int8Test.java
index c2990c11d6951e49f87eeaeccd9a5ed1886be64a..e6ff900ab54f3007c570ee43a44d9ecb468a2f9b 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Int8Test.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/Int8Test.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.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -14,10 +14,8 @@ import static org.junit.Assert.assertSame;
 import java.util.Optional;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 
 public class Int8Test {
-
     @Test
     public void testInt8() {
         Int8TypeDefinition int8 = BaseTypes.int8Type();

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTest.java
similarity index 86%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTest.java
index 7663342738a1b7faf0cb40fec356846aa02d69cf..a10fb1faec066e09e170942dacdea5f650e6edfc 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/LeafrefTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/LeafrefTest.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.yangtools.yang.model.util;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.util.Optional;
 import org.junit.Test;
@@ -20,17 +21,15 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.PathExpression;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.LeafrefTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RequireInstanceRestrictedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes;
 
 public class LeafrefTest {
     @Test
     public void testMethodsOfLeafrefTest() {
         final QName qname = QName.create("test", "List1");
-        final PathExpression revision = new PathExpressionImpl("/test:Cont1/test:List1", false);
-        final PathExpression revision2 = new PathExpressionImpl("/test:Cont1/test:List2", false);
+        // PathExpressionImpl("/test:Cont1/test:List1", false);
+        final PathExpression revision = mock(PathExpression.class);
+        //  PathExpressionImpl("/test:Cont1/test:List2", false);
+        final PathExpression revision2 = mock(PathExpression.class);
 
         final LeafrefTypeDefinition leafref = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(revision).build();
         final LeafrefTypeDefinition leafref2 = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(revision2).build();
@@ -62,7 +61,8 @@ public class LeafrefTest {
     @Test
     public void testRequireInstanceSubstatement() {
         final QName qname = QName.create("test", "my-leafref");
-        final PathExpression path = new PathExpressionImpl("../my-leaf", false);
+        // new PathExpressionImpl("../my-leaf", false)
+        final PathExpression path = mock(PathExpression.class);
         final LeafrefTypeBuilder leafrefTypeBuilder = BaseTypes.leafrefTypeBuilder(qname).setPathStatement(path);
 
         assertTrue(leafrefTypeBuilder.build().requireInstance());

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/NumberUtilTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtilTest.java
similarity index 98%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/NumberUtilTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtilTest.java
index 9e00093c7bedfd9b109bc46d4db336875fc1653e..fe66a827e1640a72d4fc8907a7b7d86ed14074fe 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/NumberUtilTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/NumberUtilTest.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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/TypeTest.java
similarity index 97%
rename from yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java
rename to yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/TypeTest.java
index b2308a8519eeb19a26c4a55156da98ff415e6dfe..66ef34d153cb26839d060886f3c0e75d22b6895f 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/type/TypeTest.java
+++ b/yang/yang-model-spi/src/test/java/org/opendaylight/yangtools/yang/model/spi/type/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.yangtools.yang.model.util.type;
+package org.opendaylight.yangtools.yang.model.spi.type;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -50,17 +50,13 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.BaseConstraints;
-import org.opendaylight.yangtools.yang.model.util.PathExpressionImpl;
 
 public class TypeTest {
     private static final QName Q_NAME = QName.create("test.namespace", "2016-01-01", "test-name");
-    private static final PathExpression REVISION_AWARE_XPATH = new PathExpressionImpl("/test", true);
     private static final Bit BIT_A = BitBuilder.create(Q_NAME.getLocalName(), Uint32.valueOf(55L))
         .setDescription("description")
         .setReference("reference")
         .build();
-    private static final Optional<String> ABSENT = Optional.empty();
 
     @Test
     public void binaryTypeTest() {
@@ -279,8 +275,7 @@ public class TypeTest {
         concreteBuilderTest(baseStringType1, derivedStringType1);
 
         final StringTypeBuilder stringTypeBuilder = new StringTypeBuilder(baseStringType1, Q_NAME);
-        final PatternConstraint patternConstraint = BaseConstraints.newPatternConstraint("pattern", ABSENT, ABSENT);
-        stringTypeBuilder.addPatternConstraint(patternConstraint);
+        stringTypeBuilder.addPatternConstraint(mock(PatternConstraint.class));
         final StringTypeDefinition stringTypeDefinition = stringTypeBuilder.buildType();
         assertNotNull(stringTypeDefinition);
     }
@@ -327,14 +322,16 @@ public class TypeTest {
 
     @Test
     public void leafrefTypeTest() {
+        final PathExpression expr = mock(PathExpression.class);
+
         final LeafrefTypeBuilder leafrefTypeBuilder1 = BaseTypes.leafrefTypeBuilder(Q_NAME);
         final LeafrefTypeBuilder leafrefTypeBuilder2 = BaseTypes.leafrefTypeBuilder(Q_NAME);
-        leafrefTypeBuilder1.setPathStatement(REVISION_AWARE_XPATH);
-        leafrefTypeBuilder2.setPathStatement(REVISION_AWARE_XPATH);
+        leafrefTypeBuilder1.setPathStatement(expr);
+        leafrefTypeBuilder2.setPathStatement(expr);
         final BaseLeafrefType baseLeafrefType1 = (BaseLeafrefType)leafrefTypeBuilder1.build();
         final BaseLeafrefType baseLeafrefType2 = (BaseLeafrefType)leafrefTypeBuilder1.build();
         hashCodeEqualsToStringTest(baseLeafrefType1, baseLeafrefType2);
-        assertEquals(baseLeafrefType1.getPathStatement(), REVISION_AWARE_XPATH);
+        assertEquals(expr, baseLeafrefType1.getPathStatement());
 
         final DerivedLeafrefType derivedLeafrefType1 = (DerivedLeafrefType)DerivedTypes
                 .derivedTypeBuilder(baseLeafrefType1, Q_NAME).build();

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index c99f11f7bd57c1b00616615bd3e68499f42de112..92737cb646c238e7914e8e8494792655fff26f05 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -26,6 +26,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc7952-model-api</artifactId>

diff --git a/yang/yang-model-util/src/main/java/module-info.java b/yang/yang-model-util/src/main/java/module-info.java
index 286d1144afc57dcc907168517fbb05e9ec986005..1c2c698770f81d3d832c456ae94b8cc197dde773 100644 (file)
--- a/yang/yang-model-util/src/main/java/module-info.java
+++ b/yang/yang-model-util/src/main/java/module-info.java
@@ -7,13 +7,13 @@
  */
 module org.opendaylight.yangtools.yang.model.util {
     exports org.opendaylight.yangtools.yang.model.util;
-    exports org.opendaylight.yangtools.yang.model.util.type;
     exports org.opendaylight.yangtools.yang.model.repo.util;
 
     requires transitive org.opendaylight.yangtools.rfc7952.model.api;
 
     requires org.opendaylight.yangtools.util;
     requires org.opendaylight.yangtools.yang.common;
+    requires org.opendaylight.yangtools.yang.model.spi;
     requires org.slf4j;
 
     // Annotations

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java
index 291378590644d1b4ce76c6413bafa956fc5c0857..16806cb05b7e2653291a597183b1db00cf463cbf 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java
@@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.model.api.PathExpression;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class SchemaContextUtilTest {

diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml
index c6366b533529bf0b4ea115ec4a0d28e09339df92..5b0179ea793fc67686618127ac7ea5314d07cd61 100644 (file)
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -38,6 +38,14 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>
@@ -54,10 +62,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-antlr</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>openconfig-model-api</artifactId>

diff --git a/yang/yang-parser-rfc7950/src/main/java/module-info.java b/yang/yang-parser-rfc7950/src/main/java/module-info.java
index da0aa5f80179f9468fc9f3b86aabd1d791ef702f..bfe9ffc2825f23875814cad2bc924203e69d6f95 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/module-info.java
+++ b/yang/yang-parser-rfc7950/src/main/java/module-info.java
@@ -25,6 +25,7 @@ module org.opendaylight.yangtools.yang.parser.rfc7950 {
     requires org.opendaylight.yangtools.openconfig.model.api;
     requires org.opendaylight.yangtools.yang.common;
     requires org.opendaylight.yangtools.yang.model.api;
+    requires org.opendaylight.yangtools.yang.model.spi;
     requires org.opendaylight.yangtools.yang.model.util;
     requires org.opendaylight.yangtools.yang.parser.antlr;
     requires org.opendaylight.yangtools.util;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java
index f6244d10c818aa44159963b9182e35f3ea5a1671..8b8d41de8a03d27aa7d6686e63c66e4deadc4518 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/AbstractLeafEffectiveStatement.java
@@ -25,8 +25,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatemen
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataSchemaNodeMixin;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MandatoryMixin;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
index c738046e516e8426e95b3d9786be1a003c37d6b5..1236dd5bb80ed4b3c549552215a4d7a373d47d5c 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
@@ -24,8 +24,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceEffectiveStatemen
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.ConcreteTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataSchemaNodeMixin;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MustConstraintMixin;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
index 150fa20e1c09de990b731acef2cba7a3ed51d339..7cb3b82ede251c61161eeeb59209bab2e1126dc4 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
@@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.IdentityRefSpecification;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.IdentityrefTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.IdentityrefTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.IdentityNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java
index 774a3a1e9f59551638ca79822186ce746c35dd08..c7bfd2b16b8fa9b49a336d6ea7636bde374e8ecd 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java
@@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PathEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.LeafrefSpecification;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.LeafrefTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.LeafrefTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java
index c714e129973231899deca3e5e757d81bc93a447a..a1be4f36ce44c5aaf78ad7c6ec7999011b069b85 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java
@@ -55,16 +55,16 @@ import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BitsTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.EnumerationTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.InstanceIdentifierTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.InvalidLengthConstraintException;
-import org.opendaylight.yangtools.yang.model.util.type.InvalidRangeConstraintException;
-import org.opendaylight.yangtools.yang.model.util.type.LengthRestrictedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RangeRestrictedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RequireInstanceRestrictedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes;
-import org.opendaylight.yangtools.yang.model.util.type.StringTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BitsTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.EnumerationTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.InstanceIdentifierTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.InvalidLengthConstraintException;
+import org.opendaylight.yangtools.yang.model.spi.type.InvalidRangeConstraintException;
+import org.opendaylight.yangtools.yang.model.spi.type.LengthRestrictedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.RangeRestrictedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.RequireInstanceRestrictedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.RestrictedTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.StringTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
index 1e84112959da3903f93578856eb9e4edbbdb3430..27c1ee70887a2b92f02b57eaa03e8c0d315e5c2e 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
@@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.BitEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.BitsSpecification;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.BitsTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BitsTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
index cc3c1b69670bb63235a2ba25ce0aaa65dd1adaac..d8fc8c998783564982ae84e2ba658543e63322c6 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinEffectiveStatement.java
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 
 /**
  * Common shared effective statements for built-in types.

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java
index 15973bfcec82f1faa50dc62e15f855cf397ac42c..6072dabb6e75e803199e06d05198b0dae4f86435 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java
@@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.FractionDigitsEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RangeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.Decimal64Specification;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.DecimalTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.DecimalTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
index ed74ade308a34afa1e28d1ce2ac3d2cc4b67fd2a..c8a0047389b75af8faccd62054e3758235e51ba1 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EffectiveTypeUtil.java
@@ -17,8 +17,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.BitEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.EnumEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.yangtools.yang.model.util.type.BitBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.EnumPairBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BitBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.EnumPairBuilder;
 
 @Beta
 final class EffectiveTypeUtil {

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java
index 285c8997599ba29d1db6fa1abd5ab90b1a9416c5..b1ce4a421d6c29238935f13a3f5f538f5d612417 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java
@@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.EnumEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.EnumSpecification;
 import org.opendaylight.yangtools.yang.model.api.stmt.ValueEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.EnumerationTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.EnumerationTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
index 1f7eba6b735e90d4c819d567c0539a4234dde7be..1c056a40e99e36dd0fd927efda99f82e75386712 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
@@ -13,9 +13,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RequireInstanceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.InstanceIdentifierSpecification;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.InstanceIdentifierTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.InstanceIdentifierTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.RestrictedTypes;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java
index a30eb21127421cfbd9b67d8809c4dab1b55ff6e1..1ecb6fbe27ea2c65a927786d4300132951f8982b 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeEffectiveStatementImpl.java
@@ -14,7 +14,7 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement;
-import org.opendaylight.yangtools.yang.model.util.type.TypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.TypeBuilder;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultArgument.WithSubstatements;
 
 final class TypeEffectiveStatementImpl<T extends TypeDefinition<T>, D extends TypeStatement>

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java
index e4164ac690e18f2080ec6aee2417e954ab7d64fc..f85aa7477d16b010e50a89b3991237f1a5f45726 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java
@@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.UnionSpecification;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.UnionTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.UnionTypeBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx;
 import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
index 3ce4ef3b8a104d2bc2586dae600e196b977c5849..85eead000b55ef764cacee3a57eb54b050c47d41 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefEffectiveStatementImpl.java
@@ -33,8 +33,8 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.util.type.DerivedTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.DerivedTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.DerivedTypeBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.DerivedTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.Default;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.SchemaNodeMixin;
 import org.slf4j.Logger;

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
index 5471957594e14795b8f36133a62f3e67a6f808dc..452b623879b40fcf1268ac7b806cc2863baff80f 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
@@ -28,10 +28,10 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.yangtools.yang.model.util.type.BitBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.EnumPairBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.InvalidBitDefinitionException;
-import org.opendaylight.yangtools.yang.model.util.type.InvalidEnumDefinitionException;
+import org.opendaylight.yangtools.yang.model.spi.type.BitBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.EnumPairBuilder;
+import org.opendaylight.yangtools.yang.model.spi.type.InvalidBitDefinitionException;
+import org.opendaylight.yangtools.yang.model.spi.type.InvalidEnumDefinitionException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.stmt.StmtTestUtils;

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java
index df392794cf53d3a375de9d5dfe42b6afe75b15c4..876b90dc66f031045dc15541ef9c3872777acd95 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java
@@ -37,7 +37,7 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 
 public class UsesAugmentTest {

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
index 417a0a5e73387643d36e9648152eeba157a1b31f..071cc864e5751b0fd6f3414ccf4a46b4c89ed247 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java
@@ -63,7 +63,7 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException;

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
index 39f70bbdd4b3841a3abff7cc12856d06e51ab7af..4aaee7a1f57c7e7de1ab752881b51122e9acd997 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java
@@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java
index 8e29571c9b804ae320061e3221164058d4ca8e49..1bcf9d52c013c126b4a2b084efce671659ca19c2 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileListStmtTest.java
@@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.spi.type.BaseTypes;
 import org.opendaylight.yangtools.yang.stmt.TestUtils;
 
 public class YinFileListStmtTest extends AbstractYinModulesTest {