root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

moved converter initialization code to constructor

This commit is contained in:
Juergen Hoeller 2009-09-25 10:57:40 +00:00
parent ea40fb9bcd
commit e408cbeecd
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java
View File

@ -31,12 +31,6 @@ public class DefaultConversionService extends GenericConversionService {
* Create a new default conversion service, installing the default converters. * Create a new default conversion service, installing the default converters.
*/ */
public DefaultConversionService() { public DefaultConversionService() {
initDefaultConverters();
}
// subclassing hooks
protected void initDefaultConverters() {
addConverter(new StringToBooleanConverter()); addConverter(new StringToBooleanConverter());
addConverter(new StringToCharacterConverter()); addConverter(new StringToCharacterConverter());
addConverter(new StringToLocaleConverter()); addConverter(new StringToLocaleConverter());

39
org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
View File

@ -63,10 +63,26 @@ public class GenericConversionService implements ConversionService, ConverterReg
} }
}; };
public GenericConversionService() { public GenericConversionService() {
initGenericConverters(); addGenericConverter(Object[].class, Object[].class, new ArrayToArrayGenericConverter(this));
addGenericConverter(Object[].class, Collection.class, new ArrayToCollectionGenericConverter(this));
addGenericConverter(Object[].class, Map.class, new ArrayToMapGenericConverter(this));
addGenericConverter(Object[].class, Object.class, new ArrayToObjectGenericConverter(this));
addGenericConverter(Collection.class, Collection.class, new CollectionToCollectionGenericConverter(this));
addGenericConverter(Collection.class, Object[].class, new CollectionToArrayGenericConverter(this));
addGenericConverter(Collection.class, Map.class, new CollectionToMapGenericConverter(this));
addGenericConverter(Collection.class, Object.class, new CollectionToObjectGenericConverter(this));
addGenericConverter(Map.class, Map.class, new MapToMapGenericConverter(this));
addGenericConverter(Map.class, Object[].class, new MapToArrayGenericConverter(this));
addGenericConverter(Map.class, Collection.class, new MapToCollectionGenericConverter(this));
addGenericConverter(Map.class, Object.class, new MapToObjectGenericConverter(this));
addGenericConverter(Object.class, Object[].class, new ObjectToArrayGenericConverter(this));
addGenericConverter(Object.class, Collection.class, new ObjectToCollectionGenericConverter(this));
addGenericConverter(Object.class, Map.class, new ObjectToMapGenericConverter(this));
} }
/** /**
* Registers the converters in the set provided. * Registers the converters in the set provided.
* JavaBean-friendly alternative to calling {@link #addConverter(Converter)}. * JavaBean-friendly alternative to calling {@link #addConverter(Converter)}.
@ -175,27 +191,6 @@ public class GenericConversionService implements ConversionService, ConverterReg
// subclassing hooks // subclassing hooks
/**
* Hook to initialize the "generic" converters that require the full TypeDescriptor context to perform their conversion operations.
*/
protected void initGenericConverters() {
addGenericConverter(Object[].class, Object[].class, new ArrayToArrayGenericConverter(this));
addGenericConverter(Object[].class, Collection.class, new ArrayToCollectionGenericConverter(this));
addGenericConverter(Object[].class, Map.class, new ArrayToMapGenericConverter(this));
addGenericConverter(Object[].class, Object.class, new ArrayToObjectGenericConverter(this));
addGenericConverter(Collection.class, Collection.class, new CollectionToCollectionGenericConverter(this));
addGenericConverter(Collection.class, Object[].class, new CollectionToArrayGenericConverter(this));
addGenericConverter(Collection.class, Map.class, new CollectionToMapGenericConverter(this));
addGenericConverter(Collection.class, Object.class, new CollectionToObjectGenericConverter(this));
addGenericConverter(Map.class, Map.class, new MapToMapGenericConverter(this));
addGenericConverter(Map.class, Object[].class, new MapToArrayGenericConverter(this));
addGenericConverter(Map.class, Collection.class, new MapToCollectionGenericConverter(this));
addGenericConverter(Map.class, Object.class, new MapToObjectGenericConverter(this));
addGenericConverter(Object.class, Object[].class, new ObjectToArrayGenericConverter(this));
addGenericConverter(Object.class, Collection.class, new ObjectToCollectionGenericConverter(this));
addGenericConverter(Object.class, Map.class, new ObjectToMapGenericConverter(this));
}
/** /**
* Registers a GenericConverter. * Registers a GenericConverter.
* @param sourceType the source type to convert from * @param sourceType the source type to convert from