moved converter initialization code to constructor
This commit is contained in:
parent
ea40fb9bcd
commit
e408cbeecd
|
|
@ -31,12 +31,6 @@ public class DefaultConversionService extends GenericConversionService {
|
|||
* Create a new default conversion service, installing the default converters.
|
||||
*/
|
||||
public DefaultConversionService() {
|
||||
initDefaultConverters();
|
||||
}
|
||||
|
||||
// subclassing hooks
|
||||
|
||||
protected void initDefaultConverters() {
|
||||
addConverter(new StringToBooleanConverter());
|
||||
addConverter(new StringToCharacterConverter());
|
||||
addConverter(new StringToLocaleConverter());
|
||||
|
|
|
|||
|
|
@ -63,10 +63,26 @@ public class GenericConversionService implements ConversionService, ConverterReg
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
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.
|
||||
* JavaBean-friendly alternative to calling {@link #addConverter(Converter)}.
|
||||
|
|
@ -175,27 +191,6 @@ public class GenericConversionService implements ConversionService, ConverterReg
|
|||
|
||||
// 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.
|
||||
* @param sourceType the source type to convert from
|
||||
|
|
|
|||
Loading…
Reference in New Issue