diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java index 6f5bd3822..84ad153eb 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java @@ -15,10 +15,12 @@ */ package com.opensymphony.xwork2.conversion; +import com.opensymphony.xwork2.inject.Initializable; + /** * Used to read converters from Properties file */ -public interface ConversionPropertiesProcessor { +public interface ConversionPropertiesProcessor extends Initializable { /** * Process given property to load converters as not required (Properties file doesn't have to exist) diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java index f658967a1..691d07e0f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionPropertiesProcessor.java @@ -48,6 +48,13 @@ public class DefaultConversionPropertiesProcessor implements ConversionPropertie this.converterHolder = converterHolder; } + @Override + public void init() { + LOG.debug("Processing default conversion properties files"); + processRequired("struts-default-conversion.properties"); + process("xwork-conversion.properties"); + } + public void process(String propsName) { loadConversionProperties(propsName, false); } diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java index 0d556139b..012d44055 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java @@ -171,12 +171,6 @@ public class XWorkConverter extends DefaultTypeConverter { this.reloadingConfigs = Boolean.parseBoolean(reloadingConfigs); } - @Inject - public void setConversionPropertiesProcessor(ConversionPropertiesProcessor propertiesProcessor) { - propertiesProcessor.processRequired("struts-default-conversion.properties"); - propertiesProcessor.process("xwork-conversion.properties"); - } - @Inject public void setConversionFileProcessor(ConversionFileProcessor fileProcessor) { this.fileProcessor = fileProcessor;