Skip to site navigation (Press enter)

[qdox-scm] [1350] trunk/qdox/src/test/java/com/thoughtworks/qdox: Introducing JavaType interface

rfscholte Sun, 02 Oct 2011 06:54:55 -0700

Title: [1350] trunk/qdox/src/test/java/com/thoughtworks/qdox: Introducing JavaType interface

Revision: 1350
Author: rfscholte
Date: 2011-10-02 08:54:53 -0500 (Sun, 02 Oct 2011)

Log Message

Introducing JavaType interface
JavaClass.getSuperClass returns JavaType instead of Type


Modified Paths

trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java
trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java
trunk/qdox/src/test/java/com/thoughtworks/qdox/JSR14Test.java
trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java


Added Paths

trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java (1349 => 1350)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java	2011-10-02 13:19:41 UTC (rev 1349)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java	2011-10-02 13:54:53 UTC (rev 1350)
@@ -64,7 +64,7 @@
      */
     boolean isAnnotation();
 
-    Type getSuperClass();
+    JavaType getSuperClass();
 
     /**
      * Shorthand for getSuperClass().getJavaClass() with null checking.

Added: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java (0 => 1350)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java	                        (rev 0)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java	2011-10-02 13:54:53 UTC (rev 1350)
@@ -0,0 +1,18 @@
+package com.thoughtworks.qdox.model;
+
+import java.util.List;
+
+public interface JavaType
+{
+    String getCanonicalName();
+
+    String getFullyQualifiedName();
+
+    String getGenericFullyQualifiedName();
+
+    String getValue();
+
+    String getGenericValue();
+
+    List<Type> getActualTypeArguments();
+}
\ No newline at end of file

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1349 => 1350)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-02 13:19:41 UTC (rev 1349)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java	2011-10-02 13:54:53 UTC (rev 1350)
@@ -27,7 +27,7 @@
 
 import com.thoughtworks.qdox.library.ClassLibrary;
 
-public class Type implements JavaClass, Serializable {
+public class Type implements JavaClass, JavaType, Serializable {
 
     public static final Type VOID = new Type("void");
 
@@ -656,7 +656,7 @@
      * (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaClass#getSuperClass()
      */
-    public Type getSuperClass()
+    public JavaType getSuperClass()
     {
         return resolveRealClass().getSuperClass();
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JSR14Test.java (1349 => 1350)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JSR14Test.java	2011-10-02 13:19:41 UTC (rev 1349)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JSR14Test.java	2011-10-02 13:54:53 UTC (rev 1350)
@@ -11,6 +11,7 @@
 import com.thoughtworks.qdox.model.JavaMethod;
 import com.thoughtworks.qdox.model.JavaParameter;
 import com.thoughtworks.qdox.model.JavaSource;
+import com.thoughtworks.qdox.model.JavaType;
 import com.thoughtworks.qdox.model.Type;
 import com.thoughtworks.qdox.model.TypeVariable;
 /**
@@ -234,7 +235,7 @@
         String source = "public class Something extends java.util.List<String> {}";
         JavaSource javaSource = builder.addSource(new StringReader(source));
         JavaClass javaClass = javaSource.getClasses().get(0);
-        Type superClass = javaClass.getSuperClass();
+        JavaType superClass = javaClass.getSuperClass();
         assertEquals("java.util.List", superClass.getFullyQualifiedName());
         assertEquals("java.util.List<java.lang.String>", superClass.getGenericFullyQualifiedName());
         assertEquals("java.util.List", superClass.getValue());
@@ -245,7 +246,7 @@
         String source = "public class Something extends java.util.Map<String, Object> {}";
         JavaSource javaSource = builder.addSource(new StringReader(source));
         JavaClass javaClass = javaSource.getClasses().get(0);
-        Type superClass = javaClass.getSuperClass();
+        JavaType superClass = javaClass.getSuperClass();
         assertEquals("java.util.Map", superClass.getFullyQualifiedName());
         assertEquals("java.util.Map<java.lang.String,java.lang.Object>", superClass.getGenericFullyQualifiedName());
         assertEquals("java.util.Map", superClass.getValue());
@@ -256,7 +257,7 @@
     	String source = "public class Something extends java.util.List<?>{}";
     	JavaSource javaSource = builder.addSource(new StringReader(source));
     	JavaClass javaClass = javaSource.getClasses().get(0);
-    	Type superClass = javaClass.getSuperClass();
+    	JavaType superClass = javaClass.getSuperClass();
     	assertEquals("java.util.List<?>", superClass.getGenericValue());
     }
 
@@ -264,7 +265,7 @@
 		String source = "public class Something extends java.util.List<? extends Number> {}";
     	JavaSource javaSource = builder.addSource(new StringReader(source));
     	JavaClass javaClass = javaSource.getClasses().get(0);
-    	Type superClass = javaClass.getSuperClass();
+    	JavaType superClass = javaClass.getSuperClass();
     	assertEquals("java.util.List", superClass.getFullyQualifiedName());
         assertEquals("java.util.List<? extends java.lang.Number>", superClass.getGenericFullyQualifiedName());
         assertEquals("java.util.List", superClass.getValue());
@@ -275,7 +276,7 @@
 		String source = "public class Something extends java.util.List<? super Integer> {}";
     	JavaSource javaSource = builder.addSource(new StringReader(source));
     	JavaClass javaClass = javaSource.getClasses().get(0);
-    	Type superClass = javaClass.getSuperClass();
+    	JavaType superClass = javaClass.getSuperClass();
     	assertEquals("java.util.List", superClass.getFullyQualifiedName());
         assertEquals("java.util.List<? super java.lang.Integer>", superClass.getGenericFullyQualifiedName());
         assertEquals("java.util.List", superClass.getValue());
@@ -286,7 +287,7 @@
 		String source = "public class Something extends java.util.List<java.util.Set<String>> {}";
     	JavaSource javaSource = builder.addSource(new StringReader(source));
     	JavaClass javaClass = javaSource.getClasses().get(0);
-    	Type superClass = javaClass.getSuperClass();
+    	JavaType superClass = javaClass.getSuperClass();
     	assertEquals("java.util.List", superClass.getFullyQualifiedName());
         assertEquals("java.util.List<java.util.Set<java.lang.String>>", superClass.getGenericFullyQualifiedName());
         assertEquals("java.util.List", superClass.getValue());
@@ -297,7 +298,7 @@
 		String source = "public class Something extends java.util.List<java.util.Set<String>> {}";
     	JavaSource javaSource = builder.addSource(new StringReader(source));
     	JavaClass javaClass = javaSource.getClasses().get(0);
-    	Type superClass = javaClass.getSuperClass();
+    	JavaType superClass = javaClass.getSuperClass();
     	assertEquals("java.util.List", superClass.getFullyQualifiedName());
         assertEquals("java.util.List<java.util.Set<java.lang.String>>", superClass.getGenericFullyQualifiedName());
         assertEquals("java.util.List", superClass.getValue());

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java (1349 => 1350)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java	2011-10-02 13:19:41 UTC (rev 1349)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java	2011-10-02 13:54:53 UTC (rev 1350)
@@ -728,7 +728,7 @@
         //running this test alone make it fail, so it's not a proper test.
         //should be fixed if we can get rid of the Type-visibility
         JavaClass clazz = newJavaClass( "a.b.Sample" );
-        assertEquals( "java.lang.Object", clazz.getSuperClass().getJavaClass().getFullyQualifiedName() );
+        assertEquals( "java.lang.Object", clazz.getSuperJavaClass().getFullyQualifiedName() );
         assertEquals( "java.lang.Object", clazz.getSuperClass().getFullyQualifiedName() );
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email