- Revision
- 1338
- Author
- rfscholte
- Date
- 2011-09-30 16:16:22 -0500 (Fri, 30 Sep 2011)
Log Message
Use JavaClass.getCanonicalName() instead of .getValue() or .toString() for DefaultModelWriter
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java (1337 => 1338)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -77,7 +77,7 @@ result.append(' '); } } - result.append(type.toString()); + result.append(type.getCanonicalName()); result.append(' '); result.append(getName()); return result.toString();
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java (1337 => 1338)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -106,7 +106,7 @@ } if(isDeclaration) { - result.append(returns.toString()); + result.append(returns.getCanonicalName()); result.append(' '); } @@ -115,7 +115,7 @@ for (ListIterator<JavaParameter> iter = getParameters().listIterator(); iter.hasNext();) { JavaParameter parameter = iter.next(); if (isDeclaration) { - result.append(parameter.getType().toString()); + result.append(parameter.getType().getCanonicalName()); if (parameter.isVarArgs()) { result.append("..."); } @@ -131,7 +131,7 @@ if (isDeclaration && !getExceptions().isEmpty() ) { result.append(" throws "); for(Iterator<JavaClass> excIter = getExceptions().iterator();excIter.hasNext();) { - result.append(excIter.next().getValue()); + result.append(excIter.next().getCanonicalName()); if(excIter.hasNext()) { result.append(", "); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java (1337 => 1338)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -44,8 +44,10 @@ */ String getCodeBlock(); + @Deprecated String getDeclarationSignature( boolean withModifiers ); + @Deprecated String getCallSignature(); /**
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1337 => 1338)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -308,8 +308,7 @@ } else { - JavaClassParent javaClassParent = getJavaClassParent(); - result = javaClassParent.getNestedClassByName( qualifiedName ); + result = getJavaClassParent().getNestedClassByName( qualifiedName ); if ( result == null ) { result = getJavaClassLibrary().getJavaClass( qualifiedName, true );
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java (1337 => 1338)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/writer/DefaultModelWriter.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -117,7 +117,7 @@ if ( !"java.lang.Object".equals( className ) && !"java.lang.Enum".equals( className ) ) { buffer.write( " extends " ); - buffer.write( cls.getSuperClass().getValue() ); + buffer.write( cls.getSuperClass().getCanonicalName() ); } } @@ -128,7 +128,7 @@ for ( ListIterator<Type> iter = cls.getImplements().listIterator(); iter.hasNext(); ) { - buffer.write( iter.next().getValue() ); + buffer.write( iter.next().getCanonicalName() ); if ( iter.hasNext() ) { buffer.write( ", " ); @@ -177,7 +177,7 @@ commentHeader( field ); writeAllModifiers( field.getModifiers() ); - buffer.write( field.getType().toString() ); + buffer.write( field.getType().getCanonicalName() ); buffer.write( ' ' ); buffer.write( field.getName() ); if ( field.getInitializationExpression() != null && field.getInitializationExpression().length() > 0 ) @@ -216,7 +216,7 @@ buffer.write( " throws " ); for ( Iterator<JavaClass> excIter = constructor.getExceptions().iterator(); excIter.hasNext(); ) { - buffer.write( excIter.next().getValue() ); + buffer.write( excIter.next().getCanonicalName() ); if ( excIter.hasNext() ) { buffer.write( ", " ); @@ -245,14 +245,14 @@ commentHeader( method ); writeAccessibilityModifier( method.getModifiers() ); writeNonAccessibilityModifiers( method.getModifiers() ); - buffer.write( method.getReturns().toString() ); + buffer.write( method.getReturns().getCanonicalName() ); buffer.write( ' ' ); buffer.write( method.getName() ); buffer.write( '(' ); for ( ListIterator<JavaParameter> iter = method.getParameters().listIterator(); iter.hasNext(); ) { JavaParameter parameter = iter.next(); - buffer.write( parameter.getType().toString() ); + buffer.write( parameter.getType().getCanonicalName() ); if ( parameter.isVarArgs() ) { buffer.write( "..." ); @@ -271,7 +271,7 @@ buffer.write( " throws " ); for ( Iterator<JavaClass> excIter = method.getExceptions().iterator(); excIter.hasNext(); ) { - buffer.write( excIter.next().getValue() ); + buffer.write( excIter.next().getCanonicalName() ); if ( excIter.hasNext() ) { buffer.write( ", " ); @@ -365,7 +365,7 @@ public ModelWriter writeParameter( JavaParameter parameter ) { commentHeader( parameter ); - buffer.write( parameter.getType().toString() ); + buffer.write( parameter.getType().getCanonicalName() ); if ( parameter.isVarArgs() ) { buffer.write( "..." );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java (1337 => 1338)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -31,16 +31,6 @@ return new DefaultJavaParameter( type, name, varArgs ); } - public Type newType( String fullname ) - { - return new Type( fullname ); - } - - public Type newType( String fullname, int dimensions ) - { - return new Type( fullname, dimensions ); - } - public void setExceptions( DefaultJavaMethod method, List<JavaClass> exceptions ) { method.setExceptions( exceptions );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java (1337 => 1338)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -50,9 +50,8 @@ { Type result = mock( Type.class ); when( result.getFullyQualifiedName() ).thenReturn( fullname ); - when( result.getValue() ).thenReturn( fullname ); - //@todo fix - when( result.toString() ).thenReturn( fullname ); + when( result.getValue() ).thenReturn( fullname.replace( '$', '.' ) ); + when( result.getCanonicalName() ).thenReturn( fullname.replace( '$', '.' ) ); return result; }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java (1337 => 1338)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaFieldTest.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -34,15 +34,14 @@ { Type result = mock( Type.class ); when( result.getFullyQualifiedName() ).thenReturn( fullname ); - when( result.getValue() ).thenReturn( fullname ); - //@todo fix - String toString = fullname; + String canonicalName = fullname.replace( '$', '.' ); + when( result.getValue() ).thenReturn( canonicalName ); when( result.getDimensions()).thenReturn( dimensions ); for(int i = 0; i < dimensions; i++) { - toString += "[]"; + canonicalName += "[]"; } - when( result.toString() ).thenReturn( toString ); + when( result.getCanonicalName() ).thenReturn( canonicalName ); return result; }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1337 => 1338)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-09-22 20:51:51 UTC (rev 1337) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java 2011-09-30 21:16:22 UTC (rev 1338) @@ -34,9 +34,27 @@ public abstract JavaParameter newJavaParameter(Type type, String name); public abstract JavaParameter newJavaParameter(Type type, String name, boolean varArgs); - public abstract Type newType(String fullname); - public abstract Type newType(String fullname, int dimensions); + public Type newType( String fullname ) + { + return newType( fullname, 0 ); + } + + public Type newType(String fullname, int dimensions) + { + Type result = mock( Type.class ); + when( result.getFullyQualifiedName() ).thenReturn( fullname ); + String canonicalName = fullname.replace( '$', '.' ); + when( result.getValue() ).thenReturn( canonicalName ); + when( result.getDimensions()).thenReturn( dimensions ); + for(int i = 0; i < dimensions; i++) + { + canonicalName += "[]"; + } + when( result.getCanonicalName() ).thenReturn( canonicalName ); + return result; + } + protected void setUp() throws Exception { mth = newJavaMethod(); } @@ -176,16 +194,18 @@ } public void testEquals() throws Exception { + Type voidType = newType("void"); + setName(mth, "thing"); - setReturns(mth, newType("void")); + setReturns(mth, voidType); M m2 = newJavaMethod(); setName(m2, "thing"); - setReturns(m2, newType("void")); + setReturns(m2, voidType); M m3 = newJavaMethod(); setName(m3, "thingy"); - setReturns(m3, newType("void")); + setReturns(m3, voidType); M m4 = newJavaMethod(); setName(m4, "thing"); @@ -217,31 +237,36 @@ } public void testEqualsWithParameters() throws Exception { + Type voidType = newType("void"); + Type intArrayType = newType("int", 1); + Type stringArrayType = newType("java.lang.String", 2); + Type xArrayType = newType("X", 3); + setName(mth, "thing"); - setParameters(mth, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing"), newJavaParameter(newType("X", 3), "") )); - setReturns(mth, newType("void")); + setParameters(mth, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(xArrayType, "") )); + setReturns(mth, voidType); M m2 = newJavaMethod(); setName(m2, "thing"); - setParameters(m2, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "anotherName"), newJavaParameter(newType("X", 3), "blah") )); - setReturns(m2, newType("void")); + setParameters(m2, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "anotherName"), newJavaParameter(xArrayType, "blah") )); + setReturns(m2, voidType); M m3 = newJavaMethod(); setName(m3, "thing"); - setParameters(m3, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing") ) ); - setReturns(m3, newType("void")); + setParameters(m3, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing") ) ); + setReturns(m3, voidType); // name M m4 = newJavaMethod(); setName(m4, "thing"); - setParameters(m4, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing"), newJavaParameter(newType("TTTTTTTT", 3), "blah") )); - setReturns(m4, newType("void")); + setParameters(m4, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(newType("TTTTTTTT", 3), "blah") )); + setReturns(m4, voidType); // dimension M m5 = newJavaMethod(); setName(m5, "thing"); - setParameters(m5, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing"), newJavaParameter(newType("X", 9), "blah") )); - setReturns(m5, newType("void")); + setParameters(m5, Arrays.asList( newJavaParameter(intArrayType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(newType("X", 9), "blah") )); + setReturns(m5, voidType); assertEquals(mth, m2); assertEquals(m2, mth); @@ -252,33 +277,41 @@ public void testHashCode() throws Exception { assertTrue( "hashCode should never resolve to 0", newJavaMethod( Type.VOID, "" ).hashCode() != 0 ); + + Type voidType = newType("void"); + Type intType = newType("int", 1); + Type stringArrayType = newType("java.lang.String", 2); + Type xArrayType = newType("X", 3); setName(mth, "thing"); - setParameters(mth, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing"), newJavaParameter(newType("X", 3), "") )); - setReturns(mth, newType("void")); + setParameters(mth, Arrays.asList( newJavaParameter(intType, "blah"), newJavaParameter(stringArrayType, "thing"), newJavaParameter(xArrayType, "") )); + setReturns(mth, voidType); M m2 = newJavaMethod(); setName(m2, "thing"); - setParameters(m2, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "anotherName"), newJavaParameter(newType("X", 3), "blah") )); - setReturns(m2, newType("void")); + setParameters(m2, Arrays.asList( newJavaParameter(intType, "blah"), newJavaParameter(stringArrayType, "anotherName"), newJavaParameter(xArrayType, "blah") )); + setReturns(m2, voidType); M m3 = newJavaMethod(); setName(m3, "thing"); - setParameters(m3, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing"))); - setReturns(m3, newType("void")); + setParameters(m3, Arrays.asList( newJavaParameter(intType, "blah"), newJavaParameter(stringArrayType, "thing"))); + setReturns(m3, voidType); assertEquals(mth.hashCode(), m2.hashCode()); assertTrue(mth.hashCode() != m3.hashCode()); } public void testSignatureMatches() throws Exception { + Type intType = newType("int"); + Type longArrayType = newType("long", 2); + setName(mth, "thing"); - setParameters(mth, Arrays.asList( newJavaParameter(newType("int"), "x"), newJavaParameter(newType("long", 2), "y") )); + setParameters(mth, Arrays.asList( newJavaParameter(intType, "x"), newJavaParameter(longArrayType, "y") )); setReturns(mth, newType("void")); Type[] correctTypes = new Type[]{ - newType("int"), - newType("long", 2) + intType, + longArrayType }; Type[] wrongTypes1 = new Type[]{ @@ -287,8 +320,8 @@ }; Type[] wrongTypes2 = new Type[]{ - newType("int"), - newType("long", 2), + intType, + longArrayType, newType("double") }; @@ -299,13 +332,16 @@ } public void testVarArgSignatureMatches() throws Exception { + Type intType = newType("int"); + Type longArrayType = newType("long", 2); + setName(mth, "thing"); - setParameters(mth, Arrays.asList( newJavaParameter(newType("int"), "x"), newJavaParameter(newType("long", 2), "y", true) )); + setParameters(mth, Arrays.asList( newJavaParameter(intType, "x"), newJavaParameter(longArrayType, "y", true) )); setReturns(mth, newType("void")); Type[] correctTypes = new Type[]{ - newType("int"), - newType("long", 2) + intType, + longArrayType }; Type[] wrongTypes1 = new Type[]{ @@ -314,8 +350,8 @@ }; Type[] wrongTypes2 = new Type[]{ - newType("int"), - newType("long", 2), + intType, + longArrayType, newType("double") };
To unsubscribe from this list please visit:
