- Revision
- 122
- Author
- mward
- Date
- 2007-05-31 08:21:45 -0500 (Thu, 31 May 2007)
Log Message
refcatoring: cleaned up some java files
Modified Paths
- trunk/core/core.iml
- trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleXMLServlet.java
- trunk/core/src/main/java/org/codehaus/waffle/view/GetterXMLConverter.java
- trunk/core/src/main/java/org/codehaus/waffle/view/XMLView.java
- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java
- trunk/core/src/test/java/org/codehaus/waffle/view/GetterXMLConverterTest.java
Diff
Modified: trunk/core/core.iml (121 => 122)
--- trunk/core/core.iml 2007-05-31 12:53:44 UTC (rev 121) +++ trunk/core/core.iml 2007-05-31 13:21:45 UTC (rev 122) @@ -152,6 +152,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module>
Modified: trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleXMLServlet.java (121 => 122)
--- trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleXMLServlet.java 2007-05-31 12:53:44 UTC (rev 121) +++ trunk/core/src/main/java/org/codehaus/waffle/servlet/WaffleXMLServlet.java 2007-05-31 13:21:45 UTC (rev 122) @@ -16,14 +16,13 @@ /** * Waffle's FrontController for XML serialization. - * + * * @author Paulo Silveira */ public class WaffleXMLServlet extends WaffleServlet { - protected void buildViewToReferrer( - ControllerDefinition controllerDefinition, - ActionMethodResponse actionMethodResponse) { + protected void buildViewToReferrer(ControllerDefinition controllerDefinition, + ActionMethodResponse actionMethodResponse) { actionMethodResponse.setReturnValue(new XMLView()); } }
Modified: trunk/core/src/main/java/org/codehaus/waffle/view/GetterXMLConverter.java (121 => 122)
--- trunk/core/src/main/java/org/codehaus/waffle/view/GetterXMLConverter.java 2007-05-31 12:53:44 UTC (rev 121) +++ trunk/core/src/main/java/org/codehaus/waffle/view/GetterXMLConverter.java 2007-05-31 13:21:45 UTC (rev 122) @@ -1,42 +1,39 @@ package org.codehaus.waffle.view; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Map; -import java.util.TreeMap; - import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Map; +import java.util.TreeMap; + /** * Used to make XStream use bean getters to serialize, no attributes - * @author Paulo Silveira * + * @author Paulo Silveira */ public class GetterXMLConverter implements Converter { - private static final String IS_INITIALS = "is"; - private static final String GET_INITIALS = "get"; - private static final Object[] NO_ARGUMENTS = {}; - public void marshal(Object o, HierarchicalStreamWriter writer, - MarshallingContext context) { + public void marshal(Object object, HierarchicalStreamWriter writer, + MarshallingContext context) { - Map<String, Method> getters = getGetters(o.getClass()); + Map<String, Method> getters = getGetters(object.getClass()); for (String name : getters.keySet()) { Method getter = getters.get(name); writer.startNode(name); try { - Object got = getter.invoke(o, NO_ARGUMENTS); - if (got != null) - + Object got = getter.invoke(object, NO_ARGUMENTS); + if (got != null) { context.convertAnother(got); + } } catch (IllegalArgumentException e) { throw new IllegalStateException(e); } catch (IllegalAccessException e) { @@ -45,12 +42,11 @@ throw new IllegalStateException(e); } writer.endNode(); - } } - public Object unmarshal(HierarchicalStreamReader arg0, - UnmarshallingContext arg1) { + public Object unmarshal(HierarchicalStreamReader hierarchicalStreamReader, + UnmarshallingContext unmarshallingContext) { throw new UnsupportedOperationException( "Converter only available for marshaling"); } @@ -103,28 +99,25 @@ return new String(chars); } - public static boolean isGetter(Method m) { - if (m.getParameterTypes().length != 0 - || !Modifier.isPublic(m.getModifiers()) - || m.getReturnType().equals(Void.TYPE)) { + public static boolean isGetter(Method method) { + if (method.getParameterTypes().length != 0 + || !Modifier.isPublic(method.getModifiers()) + || method.getReturnType().equals(Void.TYPE)) { return false; } - if (Modifier.isStatic(m.getModifiers()) - || !Modifier.isPublic(m.getModifiers()) - || Modifier.isAbstract(m.getModifiers())) { + if (Modifier.isStatic(method.getModifiers()) + || !Modifier.isPublic(method.getModifiers()) + || Modifier.isAbstract(method.getModifiers())) { return false; } - if (m.getName().startsWith(GET_INITIALS) - && m.getName().length() > GET_INITIALS.length()) { + if (method.getName().startsWith(GET_INITIALS) + && method.getName().length() > GET_INITIALS.length()) { return true; } - if (m.getName().startsWith(IS_INITIALS) - && m.getName().length() > IS_INITIALS.length() - && (m.getReturnType().equals(boolean.class) || m - .getReturnType().equals(Boolean.class))) { - return true; - } - return false; + return method.getName().startsWith(IS_INITIALS) + && method.getName().length() > IS_INITIALS.length() + && (method.getReturnType().equals(boolean.class) || method + .getReturnType().equals(Boolean.class)); } }
Modified: trunk/core/src/main/java/org/codehaus/waffle/view/XMLView.java (121 => 122)
--- trunk/core/src/main/java/org/codehaus/waffle/view/XMLView.java 2007-05-31 12:53:44 UTC (rev 121) +++ trunk/core/src/main/java/org/codehaus/waffle/view/XMLView.java 2007-05-31 13:21:45 UTC (rev 122) @@ -1,18 +1,16 @@ package org.codehaus.waffle.view; -import java.io.IOException; -import java.util.Collection; - -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.codehaus.waffle.Constants; - import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.collections.CollectionConverter; import com.thoughtworks.xstream.io.xml.DomDriver; import com.thoughtworks.xstream.mapper.MapperWrapper; +import org.codehaus.waffle.Constants; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Collection; + /** * A view that renders the controller as XML. * @@ -28,8 +26,8 @@ XStream xs = new WaffleXStream(); xs.registerConverter(new GetterXMLConverter(), -19); xs.registerConverter(new CollectionConverter(xs.getMapper()) { - public boolean canConvert(Class c) { - return Collection.class.isAssignableFrom(c); + public boolean canConvert(Class clazz) { + return Collection.class.isAssignableFrom(clazz); } }, -18);
Modified: trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java (121 => 122)
--- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java 2007-05-31 12:53:44 UTC (rev 121) +++ trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java 2007-05-31 13:21:45 UTC (rev 122) @@ -14,7 +14,7 @@ WaffleXMLServlet servlet = new WaffleXMLServlet(); servlet.buildViewToReferrer(null, response); - Assert.assertTrue((response.getReturnValue() instanceof XMLView)); + Assert.assertTrue(response.getReturnValue() instanceof XMLView); } }
Modified: trunk/core/src/test/java/org/codehaus/waffle/view/GetterXMLConverterTest.java (121 => 122)
--- trunk/core/src/test/java/org/codehaus/waffle/view/GetterXMLConverterTest.java 2007-05-31 12:53:44 UTC (rev 121) +++ trunk/core/src/test/java/org/codehaus/waffle/view/GetterXMLConverterTest.java 2007-05-31 13:21:45 UTC (rev 122) @@ -1,82 +1,73 @@ package org.codehaus.waffle.view; -import java.lang.reflect.Method; -import java.util.Map; - import org.junit.Assert; import org.junit.Test; +import java.lang.reflect.Method; +import java.util.Map; + public class GetterXMLConverterTest { @Test public void testChecksIfGetIsAGetter() throws SecurityException, NoSuchMethodException { - Method get = GetterXMLConverterTestClass.class.getMethod("get", - new Class[0]); + Method get = GetterXMLConverterTestClass.class.getMethod("get"); Assert.assertFalse(GetterXMLConverter.isGetter(get)); } @Test public void testChecksIfIsIsAGetter() throws SecurityException, NoSuchMethodException { - Method is = GetterXMLConverterTestClass.class.getMethod("is", - new Class[0]); + Method is = GetterXMLConverterTestClass.class.getMethod("is"); Assert.assertFalse(GetterXMLConverter.isGetter(is)); } @Test public void testChecksIfANonReturnMethodIsAGetter() throws SecurityException, NoSuchMethodException { - Method getVoidProperty = GetterXMLConverterTestClass.class.getMethod( - "getVoidProperty", new Class[0]); + Method getVoidProperty = GetterXMLConverterTestClass.class.getMethod("getVoidProperty"); Assert.assertFalse(GetterXMLConverter.isGetter(getVoidProperty)); } @Test public void testChecksIfAMethodWhichReceivesAParameterIsAGetter() throws SecurityException, NoSuchMethodException { - Method getBizarre = GetterXMLConverterTestClass.class.getMethod( - "getBizarre", new Class[] { Integer.TYPE }); + Method getBizarre = GetterXMLConverterTestClass.class.getMethod("getBizarre", Integer.TYPE); Assert.assertFalse(GetterXMLConverter.isGetter(getBizarre)); } @Test public void testChecksIfAMethodNotStartingWithGetIsAGetter() throws SecurityException, NoSuchMethodException { - Method bizarreGetter3 = GetterXMLConverterTestClass.class.getMethod( - "bizarreGetter3", new Class[0]); + Method bizarreGetter3 = GetterXMLConverterTestClass.class.getMethod("bizarreGetter3"); Assert.assertFalse(GetterXMLConverter.isGetter(bizarreGetter3)); } @Test public void testChecksIfAnIsMethodReturningStringIsAGetter() throws SecurityException, NoSuchMethodException { - Method isBizarre = GetterXMLConverterTestClass.class.getMethod( - "isBizarre", new Class[0]); + Method isBizarre = GetterXMLConverterTestClass.class.getMethod("isBizarre"); Assert.assertFalse(GetterXMLConverter.isGetter(isBizarre)); } @Test public void testChecksForAValidGetter() throws SecurityException, NoSuchMethodException { - Method getInternal = GetterXMLConverterTestClass.class.getMethod( - "getInternal", new Class[0]); + Method getInternal = GetterXMLConverterTestClass.class.getMethod("getInternal"); Assert.assertTrue(GetterXMLConverter.isGetter(getInternal)); } @Test public void testChecksForAValidIs() throws SecurityException, NoSuchMethodException { - Method isClosed = GetterXMLConverterTestClass.class.getMethod( - "isClosed", new Class[0]); + Method isClosed = GetterXMLConverterTestClass.class.getMethod("isClosed"); Assert.assertTrue(GetterXMLConverter.isGetter(isClosed)); } @Test public void testChecksForAStaticMethodGetter() throws SecurityException, NoSuchMethodException { - Method getStatic = GetterXMLConverterTestClass.class.getMethod( - "getStatic", new Class[0]); + Method getStatic = GetterXMLConverterTestClass.class.getMethod("getStatic"); Assert.assertFalse(GetterXMLConverter.isGetter(getStatic)); } @@ -123,7 +114,6 @@ } public static class GetterXMLConverterTestClass { - @SuppressWarnings("unused") private int internal;
To unsubscribe from this list please visit:
