JavassistUtils cleanup

Change-Id: I481caf9954aec0ae2051d1722c0375cd1dcbe5d8
Signed-off-by: Martin Ciglan <mciglan@cisco.com>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java
index e3a56e5d5140e5f4c70e63461d7d5ec2dac27c28..e54e51b3c0d0c43f5db2c82a7e39bc1fecefb742 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java
@@ -57,22 +57,21 @@ public final class JavassistUtils {
         return ret;
     }
 
-    public void method(final CtClass it, final Class<? extends Object> returnType, final String name,
-            final Class<? extends Object> parameter, final MethodGenerator function1) throws CannotCompileException {
+    public void method(final CtClass it, final Class<?> returnType, final String name,
+            final Class<?> parameter, final MethodGenerator function1) throws CannotCompileException {
         final CtClass[] pa = new CtClass[] { asCtClass(parameter) };
-        final CtMethod _ctMethod = new CtMethod(asCtClass(returnType), name, pa, it);
+        final CtMethod method = new CtMethod(asCtClass(returnType), name, pa, it);
 
-        final CtMethod method = _ctMethod;
         function1.process(method);
         it.addMethod(method);
     }
 
-    public void method(final CtClass it, final Class<? extends Object> returnType, final String name,
+    public void method(final CtClass it, final Class<?> returnType, final String name,
             final Collection<? extends Class<?>> parameters, final MethodGenerator function1) throws CannotCompileException {
         final CtClass[] pa = new CtClass[parameters.size()];
 
         int i = 0;
-        for (Class<? extends Object> parameter : parameters) {
+        for (Class<?> parameter : parameters) {
             pa[i] = asCtClass(parameter);
             ++i;
         }
@@ -82,11 +81,10 @@ public final class JavassistUtils {
         it.addMethod(method);
     }
 
-    public void staticMethod(final CtClass it, final Class<? extends Object> returnType, final String name,
-            final Class<? extends Object> parameter, final MethodGenerator function1) throws CannotCompileException {
+    public void staticMethod(final CtClass it, final Class<?> returnType, final String name,
+            final Class<?> parameter, final MethodGenerator function1) throws CannotCompileException {
         final CtClass[] pa = new CtClass[] { asCtClass(parameter) };
-        final CtMethod _ctMethod = new CtMethod(asCtClass(returnType), name, pa, it);
-        final CtMethod method = _ctMethod;
+        final CtMethod method = new CtMethod(asCtClass(returnType), name, pa, it);
         function1.process(method);
         it.addMethod(method);
     }
@@ -144,23 +142,23 @@ public final class JavassistUtils {
         it.addInterface(supertype);
     }
 
-    public CtClass asCtClass(final Class<? extends Object> class1) {
+    public CtClass asCtClass(final Class<?> class1) {
         return get(this.classPool, class1);
     }
 
-    public CtField field(final CtClass it, final String name, final Class<? extends Object> returnValue) throws CannotCompileException {
+    public CtField field(final CtClass it, final String name, final Class<?> returnValue) throws CannotCompileException {
         final CtField field = new CtField(asCtClass(returnValue), name, it);
         field.setModifiers(Modifier.PUBLIC);
         it.addField(field);
         return field;
     }
 
-    public CtField staticField(final CtClass it, final String name, final Class<? extends Object> returnValue) throws CannotCompileException {
+    public CtField staticField(final CtClass it, final String name, final Class<?> returnValue) throws CannotCompileException {
         return staticField(it, name, returnValue, null);
     }
 
     public CtField staticField(final CtClass it, final String name,
-            final Class<? extends Object> returnValue,
+            final Class<?> returnValue,
             final SourceCodeGenerator sourceGenerator) throws CannotCompileException {
         final CtField field = new CtField(asCtClass(returnValue), name, it);
         field.setModifiers(Modifier.PUBLIC + Modifier.STATIC);