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

added "converters" property to FormattingConversionServiceFactoryBean as well

This commit is contained in:
Juergen Hoeller 2009-12-09 17:53:25 +00:00
parent bc6b707a22
commit 8334a03e03
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
org.springframework.context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.support;
import java.util.Set;
@ -20,39 +21,51 @@ import java.util.Set;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.converter.ConverterFactory;
import org.springframework.core.convert.converter.ConverterRegistry;
import org.springframework.core.convert.converter.GenericConverter;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.GenericConversionService;
/**
* A factory for a ConversionService that installs default converters appropriate for most environments.
* Set the <code>converters</code> property to supplement or override the default converters.
* Set the {@link #setConverters "converters"} property to supplement or override the default converters.
*
* @author Keith Donald
* @author Juergen Hoeller
* @since 3.0
* @see ConversionServiceFactory#createDefaultConversionService()
*/
public class ConversionServiceFactoryBean implements FactoryBean<ConversionService>, InitializingBean {
private Set<Object> converters;
private ConversionService conversionService;
private GenericConversionService conversionService;
/**
* Configure the set of custom Converters that should be added.
* Configure the set of custom converter objects that should be added:
* implementing {@link org.springframework.core.convert.converter.Converter},
* {@link org.springframework.core.convert.converter.ConverterFactory},
* or {@link org.springframework.core.convert.converter.GenericConverter}.
*/
public void setConverters(Set<Object> converters) {
this.converters = converters;
}
// implementing InitializingBean
public void afterPropertiesSet() {
this.conversionService = createConversionService();
registerConverters(this.converters, (ConverterRegistry) this.conversionService);
ConversionServiceFactory.addDefaultConverters(this.conversionService);
ConversionServiceFactory.registerConverters(this.converters, this.conversionService);
}
/**
* Create the ConversionService instance returned by this factory bean.
* <p>Creates a simple {@link GenericConversionService} instance by default.
* Subclasses may override to customize the ConversionService instance that gets created.
*/
protected GenericConversionService createConversionService() {
return new GenericConversionService();
}
// implementing FactoryBean
public ConversionService getObject() {
@ -60,41 +73,11 @@ public class ConversionServiceFactoryBean implements FactoryBean<ConversionServi
}
public Class<? extends ConversionService> getObjectType() {
return ConversionService.class;
return GenericConversionService.class;
}
public boolean isSingleton() {
return true;
}
// subclassing hooks
/**
* Creates the ConversionService instance returned by this factory bean.
* Creates a default conversion service instance by default.
* Subclasses may override to customize the ConversionService instance that gets created.
* @see ConversionServiceFactory#createDefaultConversionService()
*/
protected ConversionService createConversionService() {
return ConversionServiceFactory.createDefaultConversionService();
}
// internal helpers
private void registerConverters(Set<Object> converters, ConverterRegistry registry) {
if (converters != null) {
for (Object converter : converters) {
if (converter instanceof Converter<?, ?>) {
registry.addConverter((Converter<?, ?>) converter);
} else if (converter instanceof ConverterFactory<?, ?>) {
registry.addConverterFactory((ConverterFactory<?, ?>) converter);
} else if (converter instanceof GenericConverter) {
registry.addGenericConverter((GenericConverter) converter);
} else {
throw new IllegalArgumentException("Each converter must implement one of the Converter, ConverterFactory, or GenericConverter interfaces");
}
}
}
}
}

13
org.springframework.context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
View File

@ -51,12 +51,25 @@ public class FormattingConversionServiceFactoryBean
private static final boolean jodaTimePresent = ClassUtils.isPresent(
"org.joda.time.DateTime", FormattingConversionService.class.getClassLoader());
private Set<Object> converters;
private FormattingConversionService conversionService;
/**
* Configure the set of custom converter objects that should be added:
* implementing {@link org.springframework.core.convert.converter.Converter},
* {@link org.springframework.core.convert.converter.ConverterFactory},
* or {@link org.springframework.core.convert.converter.GenericConverter}.
*/
public void setConverters(Set<Object> converters) {
this.converters = converters;
}
public void afterPropertiesSet() {
this.conversionService = new FormattingConversionService();
ConversionServiceFactory.addDefaultConverters(this.conversionService);
ConversionServiceFactory.registerConverters(this.converters, this.conversionService);
installFormatters(this.conversionService);
}