BUG-865: remove use of Uint16, Int16 and StringType

These have been accumulated into BaseTypes, use them from there.

Change-Id: I92c65780165e2966249cc28a71903b4493e71bf8
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySortTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySortTest.java
index 5a8a28210f45022678d5765bfabedb16d8a46d78..0c3c1e1b02ba9baa20009444c22280d872e591d7 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySortTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySortTest.java
@@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
-import org.opendaylight.yangtools.yang.model.util.StringType;
+import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 
 public class UnionDependencySortTest {
 
@@ -33,7 +33,7 @@ public class UnionDependencySortTest {
         final UnionDependencySort unionDependencySort = new UnionDependencySort();
         final Set<TypeDefinition<?>> typeDefs = new HashSet<>();
 
-        final StringType stringType = StringType.getInstance();
+        final TypeDefinition<?> stringType = BaseTypes.stringType();
         final ExtendedType extendedType = ExtendedType.builder(QName.create("ExtendedType1"), stringType, Optional.<String> absent(), Optional.<String> absent(), SchemaPath.create(false, QName.create("Cont1"), QName.create("List1"))).build();
 
         typeDefs.add(stringType);

diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java
index 58030b1b010fd650b58732c1be10ff171be8c3dc..d48af8e83c75ec93f28ad133ff1bef553ae1a2ff 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java
+++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java
@@ -51,9 +51,7 @@ import org.opendaylight.yangtools.yang.model.util.DataNodeIterator;
 import org.opendaylight.yangtools.yang.model.util.Decimal64;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType.Builder;
-import org.opendaylight.yangtools.yang.model.util.Int16;
-import org.opendaylight.yangtools.yang.model.util.StringType;
-import org.opendaylight.yangtools.yang.model.util.Uint16;
+import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
@@ -322,7 +320,7 @@ public class BindingGeneratorUtilTest {
         Optional<String> absent = Optional.absent();
 
         Builder extTypeBuilder = ExtendedType.builder(new QName(URI.create("namespace"), "localName"),
-                Int16.getInstance(), absent, absent, SchemaPath.create(true, QName.create("/root")));
+                BaseTypes.int16Type(), absent, absent, SchemaPath.create(true, QName.create("/root")));
 
         ArrayList<LengthConstraint> lenght = new ArrayList<LengthConstraint>();
         ArrayList<RangeConstraint> range = new ArrayList<RangeConstraint>();
@@ -359,7 +357,7 @@ public class BindingGeneratorUtilTest {
         Optional<String> absent = Optional.absent();
 
         Builder extTypeBuilder = ExtendedType.builder(new QName(URI.create("namespace"), "localName"),
-                StringType.getInstance(), absent, absent, SchemaPath.create(true, QName.create("/root")));
+                BaseTypes.stringType(), absent, absent, SchemaPath.create(true, QName.create("/root")));
 
         Restrictions restrictions = BindingGeneratorUtil.getRestrictions(extTypeBuilder.build());
 
@@ -374,7 +372,7 @@ public class BindingGeneratorUtilTest {
         Optional<String> absent = Optional.absent();
 
         Builder extTypeBuilder = ExtendedType.builder(new QName(URI.create("namespace"), "localName"),
-                Int16.getInstance(), absent, absent, SchemaPath.create(true, QName.create("/root")));
+                BaseTypes.int16Type(), absent, absent, SchemaPath.create(true, QName.create("/root")));
 
         ExtendedType extType = extTypeBuilder.build();
         Restrictions restrictions = BindingGeneratorUtil.getRestrictions(extType);
@@ -394,7 +392,7 @@ public class BindingGeneratorUtilTest {
         Optional<String> absent = Optional.absent();
 
         Builder extTypeBuilder = ExtendedType.builder(new QName(URI.create("namespace"), "localName"),
-                Uint16.getInstance(), absent, absent, SchemaPath.create(true, QName.create("/root")));
+                BaseTypes.uint16Type(), absent, absent, SchemaPath.create(true, QName.create("/root")));
 
         ExtendedType extType = extTypeBuilder.build();
         Restrictions restrictions = BindingGeneratorUtil.getRestrictions(extType);