improved toString method

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2460 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionService.java

@@ -78,7 +78,7 @@ public class FormattingConversionService implements FormatterRegistry, Conversio
 					return new PrinterConverter(fieldType, printer, conversionService).convert(source, sourceType, targetType);
 				}
 				public String toString() {
-					return "@" + annotationType.getName() + " " + fieldType.getName() + " -> " + String.class.getName();
+					return "@" + annotationType.getName() + " " + fieldType.getName() + " -> " + String.class.getName() + " : " + annotationFormatterFactory;
 				}
 			});
 			getConverterRegistry().addGenericConverter(new ConditionalGenericConverter() {
@@ -93,7 +93,7 @@ public class FormattingConversionService implements FormatterRegistry, Conversio
 					return new ParserConverter(fieldType, parser, conversionService).convert(source, sourceType, targetType);		
 				}
 				public String toString() {
-					return String.class.getName() + " -> @" + annotationType.getName() + " " + fieldType.getName();
+					return String.class.getName() + " -> @" + annotationType.getName() + " " + fieldType.getName() + " : " + annotationFormatterFactory;
 				}				
 			});
 		}
@@ -166,6 +166,10 @@ public class FormattingConversionService implements FormatterRegistry, Conversio
 		private Class<?> resolvePrinterObjectType(Printer<?> printer) {
 			return GenericTypeResolver.resolveTypeArgument(printer.getClass(), Printer.class);
 		}
+		
+		public String toString() {
+			return this.fieldType.getName() + " -> " + String.class.getName() + " : " + this.printer;
+		}
 	}
 
 	private static class ParserConverter implements GenericConverter {
@@ -207,6 +211,11 @@ public class FormattingConversionService implements FormatterRegistry, Conversio
 			}
 			return parsedValue;
 		}
+
+		public String toString() {
+			return String.class.getName() + " -> " + this.fieldType.getName() + " : " + this.parser;
+		}
+
 	}
 	
 }

org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java

@@ -31,6 +31,7 @@ public class JodaTimeFormattingTests {
 	public void setUp() {
 		JodaTimeFormattingConfigurer configurer = new JodaTimeFormattingConfigurer();
 		configurer.installJodaTimeFormatting(conversionService);
+		System.out.println(conversionService);
 
 		binder = new DataBinder(new JodaTimeBean());
 		binder.setConversionService(conversionService);

org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java

@@ -19,9 +19,12 @@ package org.springframework.core.convert.support;
 import static org.springframework.core.convert.support.ConversionUtils.invokeConverter;
 
 import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -129,15 +132,20 @@ public class GenericConversionService implements ConversionService, ConverterReg
 	}
 
 	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("ConversionService converters = ").append("\n");
+		List<String> converterStrings = new ArrayList<String>();
 		for (Map<Class<?>, MatchableConverters> targetConverters : this.converters.values()) {
 			for (MatchableConverters matchable : targetConverters.values()) {
-				builder.append("\t");
-				builder.append(matchable);
-				builder.append("\n");
+				converterStrings.add(matchable.toString());
 			}
 		}
+		Collections.sort(converterStrings);
+		StringBuilder builder = new StringBuilder();
+		builder.append("ConversionService converters = ").append("\n");
+		for (String converterString : converterStrings) {
+			builder.append("\t");
+			builder.append(converterString);
+			builder.append("\n");			
+		}
 		return builder.toString();
 	}
 
@@ -435,7 +443,17 @@ public class GenericConversionService implements ConversionService, ConverterReg
 
 		public String toString() {
 			if (this.conditionalConverters != null) {
-				return "[" + this.conditionalConverters + "; default = " + this.defaultConverter + "]";
+				StringBuilder builder = new StringBuilder();
+				for (Iterator<ConditionalGenericConverter> it = this.conditionalConverters.iterator(); it.hasNext(); ) {
+					builder.append(it.next());
+					if (it.hasNext()) {
+						builder.append(", ");
+					}
+				}
+				if (this.defaultConverter != null) {
+					builder.append(", ").append(this.defaultConverter);
+				}
+				return builder.toString();
 			} else {
 				return this.defaultConverter.toString();
 			}