Share Class Type

[mdsal.git] / binding / mdsal-binding-generator-impl / src / main / java / org / opendaylight / mdsal / binding / yang / types / AbstractTypeProvider.java

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
index ea188847c07e8ae02c0c45d6bb30b2c46e620ec0..9b33d29235d33d670d84c42c09e68aea0221bd39 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
@@ -394,8 +394,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
         final String basePackageName = BindingMapping.getRootPackageName(module.getQNameModule());
         final JavaTypeName identifier = JavaTypeName.create(BindingGeneratorUtil.packageNameForGeneratedType(basePackageName,
             identity.getPath()), BindingMapping.getClassName(identity.getQName()));
-        final Type paramType = Types.wildcardTypeFor(identifier);
-        return Types.parameterizedTypeFor(Types.typeForClass(Class.class), paramType);
+        return Types.classType(Types.wildcardTypeFor(identifier));
     }
 
     /**
@@ -558,7 +557,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
                     returnType = resolveTypeFromDataSchemaNode(dataNode);
                 }
             } else {
-                returnType = Types.typeForClass(Object.class);
+                returnType = Types.objectType();
             }
         }
         Preconditions.checkArgument(returnType != null, "Failed to find leafref target: %s in module %s (%s)",
@@ -1320,7 +1319,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
      *            transfer object which needs to be serializable
      */
     private static void makeSerializable(final GeneratedTOBuilder gto) {
-        gto.addImplementsType(Types.typeForClass(Serializable.class));
+        gto.addImplementsType(Types.serializableType());
         final GeneratedPropertyBuilder prop = new GeneratedPropertyBuilderImpl("serialVersionUID");
         prop.setValue(Long.toString(BindingGeneratorUtil.computeDefaultSUID(gto)));
         gto.setSUID(prop);