X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fmodel%2Futil%2FTypes.java;h=eefeaa26b035b2fa9456d68c0ab7ee7168db7924;hb=2f8f56af98be1f58d14256e780e2a9a77c0cfc49;hp=2dec3dae45f8b07373058d1d9cd6cfc4eeb953b3;hpb=c7da6941c5e7f46e189cc85a8b4eb66ba8551f70;p=mdsal.git
diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java
index 2dec3dae45..eefeaa26b0 100644
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java
@@ -34,8 +34,6 @@ import org.opendaylight.mdsal.binding.model.api.Restrictions;
import org.opendaylight.mdsal.binding.model.api.Type;
import org.opendaylight.mdsal.binding.model.api.WildcardType;
import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
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;
@@ -65,9 +63,6 @@ public final class Types {
private static final @NonNull ConcreteType SERIALIZABLE = typeForClass(Serializable.class);
private static final @NonNull ConcreteType SET_TYPE = typeForClass(Set.class);
- private static final @NonNull ConcreteType AUGMENTABLE = typeForClass(Augmentable.class);
- private static final @NonNull ConcreteType AUGMENTATION = typeForClass(Augmentation.class);
-
/**
* It is not desirable to create instance of this class.
*/
@@ -156,6 +151,14 @@ public final class Types {
return parameterizedTypeFor(MAP_TYPE, keyType, valueType);
}
+ public static boolean isMapType(final ParameterizedType type) {
+ return MAP_TYPE.equals(type.getRawType());
+ }
+
+ public static boolean isMapType(final Type type) {
+ return type instanceof ParameterizedType && isMapType((ParameterizedType) type);
+ }
+
/**
* Returns an instance of {@link ParameterizedType} describing the typed {@link Set}<V> with concrete type
* of value.
@@ -241,9 +244,11 @@ public final class Types {
* @return ParametrizedType
representation of raw type
* Augmentable
with actual parameter
* valueType
+ * @deprecated Use {@link BindingTypes#augmentable(Type)} instead.
*/
+ @Deprecated(forRemoval = true)
public static @NonNull ParameterizedType augmentableTypeFor(final Type valueType) {
- return parameterizedTypeFor(AUGMENTABLE, valueType);
+ return BindingTypes.augmentable(valueType);
}
/**
@@ -252,12 +257,14 @@ public final class Types {
* is valueType
.
*
* @param valueType JAVA Type
with actual parameter
- * @return ParametrizedType
reprezentation of raw type
+ * @return ParametrizedType
representation of raw type
* Augmentation
with actual parameter
* valueType
+ * @deprecated Use {@link BindingTypes#augmentation(Type)} instead.
*/
+ @Deprecated(forRemoval = true)
public static @NonNull ParameterizedType augmentationTypeFor(final Type valueType) {
- return parameterizedTypeFor(AUGMENTATION, valueType);
+ return BindingTypes.augmentation(valueType);
}
public static @Nullable String getOuterClassName(final Type valueType) {