Bug 1459-3 #2 - Re-organize mdsal-binding2-generator-api

[mdsal.git] / binding2 / mdsal-binding2-generator-util / src / main / java / org / opendaylight / mdsal / binding2 / generator / util / Types.java

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java
index 57976ce1b1110b7a2dcb4c9be97ac113956be335..6d9e6c309b2dce2432e090b33023d047f2f117f2 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java
@@ -23,15 +23,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
-import org.opendaylight.mdsal.binding2.model.api.BaseTypeWithRestrictions;
-import org.opendaylight.mdsal.binding2.model.api.ConcreteType;
-import org.opendaylight.mdsal.binding2.model.api.ParameterizedType;
-import org.opendaylight.mdsal.binding2.model.api.Restrictions;
-import org.opendaylight.mdsal.binding2.model.api.Type;
-import org.opendaylight.mdsal.binding2.model.api.WildcardType;
-import org.opendaylight.mdsal.binding2.spec.Augmentable;
-import org.opendaylight.mdsal.binding2.spec.Augmentation;
-import org.opendaylight.mdsal.binding2.spec.RpcCallback;
+import org.opendaylight.mdsal.binding.javav2.model.api.BaseTypeWithRestrictions;
+import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType;
+import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType;
+import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions;
+import org.opendaylight.mdsal.binding.javav2.model.api.Type;
+import org.opendaylight.mdsal.binding.javav2.model.api.WildcardType;
+import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable;
+import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding.javav2.spec.base.RpcCallback;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
@@ -69,7 +69,7 @@ public final class Types {
 
     /**
      * Creates the instance of type
-     * {@link org.opendaylight.mdsal.binding2.model.api.ConcreteType
+     * {@link ConcreteType
      * ConcreteType} which represents JAVA <code>void</code> type.
      *
      * @return <code>ConcreteType</code> instance which represents JAVA
@@ -81,7 +81,7 @@ public final class Types {
 
     /**
      * Creates the instance of type
-     * {@link org.opendaylight.mdsal.binding2.model.api.ConcreteType
+     * {@link ConcreteType
      * ConcreteType} which represents primitive JAVA type for which package
      * doesn't exist.
      *
@@ -159,7 +159,7 @@ public final class Types {
 
     /**
      * Creates instance of type
-     * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType
+     * {@link ParameterizedType
      * ParameterizedType}
      *
      * @param type
@@ -175,7 +175,7 @@ public final class Types {
 
     /**
      * Creates instance of type
-     * {@link org.opendaylight.mdsal.binding2.model.api.WildcardType
+     * {@link WildcardType
      * WildcardType}
      *
      * @param packageName
@@ -191,9 +191,9 @@ public final class Types {
 
     /**
      * Creates instance of
-     * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType
+     * {@link ParameterizedType
      * ParameterizedType} where raw type is
-     * {@link org.opendaylight.mdsal.binding2.spec.Augmentable} and actual
+     * {@link Augmentable} and actual
      * parameter is <code>valueType</code>.
      *
      * @param valueType
@@ -209,9 +209,9 @@ public final class Types {
 
     /**
      * Creates instance of
-     * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType
+     * {@link ParameterizedType
      * ParameterizedType} where raw type is
-     * {@link org.opendaylight.mdsal.binding2.spec.Augmentation} and actual
+     * {@link Augmentation} and actual
      * parameter is <code>valueType</code>.
      *
      * @param valueType
@@ -225,9 +225,8 @@ public final class Types {
         return parameterizedTypeFor(augmentation, valueType);
     }
 
-
-    public static  @Nullable
-    String getOuterClassName(final Type valueType) {
+    @Nullable
+    public static String getOuterClassName(final Type valueType) {
         final String pkgName = valueType.getPackageName();
         if(CharMatcher.JAVA_UPPER_CASE.indexIn(pkgName) >= 0) {
             // It is inner class.
@@ -309,17 +308,6 @@ public final class Types {
          */
         private final Type rawType;
 
-        @Override
-        public Type[] getActualTypeArguments() {
-
-            return actualTypes;
-        }
-
-        @Override
-        public Type getRawType() {
-            return rawType;
-        }
-
         /**
          * Creates instance of this class with concrete rawType and array of
          * actual parameters.
@@ -335,6 +323,16 @@ public final class Types {
             this.actualTypes = actTypes.clone();
         }
 
+        @Override
+        public Type[] getActualTypeArguments() {
+
+            return actualTypes;
+        }
+
+        @Override
+        public Type getRawType() {
+            return rawType;
+        }
     }
 
     /**
@@ -361,13 +359,11 @@ public final class Types {
     }
 
     private static final class DefaultRestrictions<T extends Number> implements Restrictions {
-        private final T min;
-        private final T max;
         private final List<RangeConstraint> rangeConstraints;
 
         private DefaultRestrictions(final T min, final T max) {
-            this.min = Preconditions.checkNotNull(min);
-            this.max = Preconditions.checkNotNull(max);
+            Preconditions.checkNotNull(min);
+            Preconditions.checkNotNull(max);
             this.rangeConstraints = Collections.singletonList(BaseConstraints.newRangeConstraint(min, max, Optional
                     .absent(), Optional.absent()));
         }