Extracts TextProviderFactory interface
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54974223 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54974223 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54974223 Branch: refs/heads/master Commit: 54974223fa1f6a66d8c1d61b7b18c94ef5c50386 Parents: 9376bb0 Author: Lukasz Lenart <[email protected]> Authored: Thu Mar 16 14:55:35 2017 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Thu Mar 16 14:55:35 2017 +0100 ---------------------------------------------------------------------- .../xwork2/StrutsTextProviderFactory.java | 4 ++- .../xwork2/TextProviderFactory.java | 26 ++++++++++++++++++++ .../AnnotationActionValidatorManager.java | 4 +-- .../DefaultActionValidatorManager.java | 6 ++--- .../validator/DelegatingValidatorContext.java | 4 +-- .../validator/validators/ValidatorSupport.java | 16 ++++++------ .../org/apache/struts2/components/I18n.java | 8 +++--- .../interceptor/FileUploadInterceptor.java | 2 +- core/src/main/resources/struts-default.xml | 3 +-- .../AnnotationActionValidatorManagerTest.java | 3 ++- .../ConversionErrorFieldValidatorTest.java | 4 +-- .../validator/DoubleRangeValidatorTest.java | 4 +-- .../xwork2/validator/DummyValidatorContext.java | 4 +-- .../xwork2/validator/EmailValidatorTest.java | 6 ++--- .../validator/ExpressionValidatorTest.java | 4 +-- .../validator/RegexFieldValidatorTest.java | 6 ++--- ...onversionErrorFieldValidatorSupportTest.java | 4 +-- .../validator/SimpleActionValidationTest.java | 2 +- .../StringLengthFieldValidatorTest.java | 4 +-- .../xwork2/validator/StringValidatorTest.java | 6 ++--- .../xwork2/validator/URLValidatorTest.java | 6 ++--- .../AppendingValidatorContextTest.java | 3 ++- .../validators/DateRangeFieldValidatorTest.java | 6 ++--- .../validators/IntRangeFieldValidatorTest.java | 6 ++--- .../validators/LongRangeFieldValidatorTest.java | 6 ++--- .../validators/RequiredStringValidatorTest.java | 6 ++--- .../ShortRangeFieldValidatorTest.java | 6 ++--- .../interceptor/BeanValidationInterceptor.java | 6 ++--- .../interceptor/OValValidationInterceptor.java | 6 ++--- .../struts2/tiles/I18NAttributeEvaluator.java | 4 +-- 30 files changed, 102 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java index c5123af..7c703b7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java +++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java @@ -25,7 +25,7 @@ import java.util.ResourceBundle; * @author Oleg Gorobets * @author Rene Gielen */ -public class StrutsTextProviderFactory { +public class StrutsTextProviderFactory implements TextProviderFactory { private TextProvider textProvider; private LocaleProviderFactory localeProviderFactory; @@ -46,6 +46,7 @@ public class StrutsTextProviderFactory { this.localizedTextProvider = localizedTextProvider; } + @Override public TextProvider createInstance(Class clazz) { TextProvider instance = getTextProvider(clazz); if (instance instanceof ResourceBundleTextProvider) { @@ -55,6 +56,7 @@ public class StrutsTextProviderFactory { return instance; } + @Override public TextProvider createInstance(ResourceBundle bundle) { TextProvider instance = getTextProvider(bundle); if (instance instanceof ResourceBundleTextProvider) { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java new file mode 100644 index 0000000..e9b0623 --- /dev/null +++ b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java @@ -0,0 +1,26 @@ +/* + * Copyright 2002-2007,2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.opensymphony.xwork2; + +import java.util.ResourceBundle; + +public interface TextProviderFactory { + + TextProvider createInstance(Class clazz); + + TextProvider createInstance(ResourceBundle bundle); + +} http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java index 2e0fc30..cd6fa4e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java @@ -52,7 +52,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager private ValidatorFileParser validatorFileParser; private FileManager fileManager; private boolean reloadingConfigs; - private StrutsTextProviderFactory textProviderFactory; + private TextProviderFactory textProviderFactory; @Inject public void setValidatorFactory(ValidatorFactory fac) { @@ -75,7 +75,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager } @Inject - public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { + public void setTextProviderFactory(TextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java index 85237c9..48d552a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java @@ -18,7 +18,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkConstants; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; @@ -63,7 +63,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager { private ValidatorFileParser validatorFileParser; private FileManager fileManager; private boolean reloadingConfigs; - private StrutsTextProviderFactory textProviderFactory; + private TextProviderFactory textProviderFactory; @Inject public void setValidatorFileParser(ValidatorFileParser parser) { @@ -86,7 +86,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager { } @Inject - public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { + public void setTextProviderFactory(TextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java index 3c75e2b..0e3fe97 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java @@ -57,7 +57,7 @@ public class DelegatingValidatorContext implements ValidatorContext { * * @param object the object to use for validation (usually an Action). */ - public DelegatingValidatorContext(Object object, StrutsTextProviderFactory textProviderFactory) { + public DelegatingValidatorContext(Object object, TextProviderFactory textProviderFactory) { this.localeProvider = makeLocaleProvider(object); this.validationAware = makeValidationAware(object); this.textProvider = makeTextProvider(object, textProviderFactory); @@ -196,7 +196,7 @@ public class DelegatingValidatorContext implements ValidatorContext { return validationAware.hasFieldErrors(); } - public TextProvider makeTextProvider(Object object, StrutsTextProviderFactory textProviderFactory) { + public TextProvider makeTextProvider(Object object, TextProviderFactory textProviderFactory) { // the object argument passed through here will most probably be an ActionSupport descendant which does // implements TextProvider. if (object != null && object instanceof DelegatingValidatorContext) { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java index f99db43..2173a2f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java @@ -15,7 +15,7 @@ */ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.util.ValueStack; @@ -37,20 +37,20 @@ import java.util.List; */ public abstract class ValidatorSupport implements Validator, ShortCircuitableValidator { - protected final Logger log = LogManager.getLogger(this.getClass()); + private static final Logger LOG = LogManager.getLogger(ValidatorSupport.class); - protected String defaultMessage = ""; - protected String messageKey; private ValidatorContext validatorContext; private boolean shortCircuit; private String type; private String[] messageParameters; - protected ValueStack stack; - protected StrutsTextProviderFactory textProviderFactory; + protected String defaultMessage = ""; + protected String messageKey; + protected ValueStack stack; + protected TextProviderFactory textProviderFactory; @Inject - public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { + public void setTextProviderFactory(TextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } @@ -97,7 +97,7 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal } catch (Exception e) { // if there's an exception in parsing, we'll just treat the expression itself as the // parameter - log.warn("exception while parsing message parameter [{}]", messageParameter, e); + LOG.warn("exception while parsing message parameter [{}]", messageParameter, e); parsedMessageParameters.add(messageParameter); } } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/org/apache/struts2/components/I18n.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java index 6d173ef..faacea4 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -25,16 +25,16 @@ import java.io.Writer; import java.util.ResourceBundle; import com.opensymphony.xwork2.LocaleProviderFactory; +import com.opensymphony.xwork2.LocalizedTextProvider; +import com.opensymphony.xwork2.TextProviderFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.DefaultLocalizedTextProvider; import com.opensymphony.xwork2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -122,11 +122,11 @@ public class I18n extends Component { ResourceBundle bundle = defaultTextProvider.getTexts(name); if (bundle == null) { - bundle = container.getInstance(DefaultLocalizedTextProvider.class).findResourceBundle(name, localeProvider.getLocale()); + bundle = container.getInstance(LocalizedTextProvider.class).findResourceBundle(name, localeProvider.getLocale()); } if (bundle != null) { - StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class); + TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); textProvider = tpf.createInstance(bundle); getStack().push(textProvider); pushed = true; http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java index 138b033..a392813 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java @@ -446,7 +446,7 @@ public class FileUploadInterceptor extends AbstractInterceptor { } private TextProvider getTextProvider(Object action) { - StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class); + TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); return tpf.createInstance(action.getClass()); } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/resources/struts-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index b0c0769..72d6a69 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -130,9 +130,8 @@ <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/> <bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/> - <bean type="com.opensymphony.xwork2.StrutsTextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" scope="prototype" /> <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="struts" class="com.opensymphony.xwork2.util.DefaultLocalizedTextProvider" scope="singleton" /> - <bean type="com.opensymphony.xwork2.TextProvider" name="struts" class="com.opensymphony.xwork2.TextProviderSupport" scope="prototype" /> + <bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" scope="singleton" /> <bean type="com.opensymphony.xwork2.LocaleProviderFactory" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton" /> <bean type="org.apache.struts2.components.UrlRenderer" name="struts" class="org.apache.struts2.components.ServletUrlRenderer"/> http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java index c2b3ba2..8a9a4cd 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java @@ -25,6 +25,7 @@ import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.SimpleAction; import com.opensymphony.xwork2.SimpleAnnotationAction; import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.test.AnnotationDataAware2; @@ -59,7 +60,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase { protected final String alias = "annotationValidationAlias"; AnnotationActionValidatorManager annotationActionValidatorManager; - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; @Override protected void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java index 9cdeac0..411dbf8 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java @@ -16,7 +16,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.interceptor.ValidationAware; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.XWorkTestCase; @@ -53,7 +53,7 @@ public class ConversionErrorFieldValidatorTest extends XWorkTestCase { validator = new ConversionErrorFieldValidator(); validationAware = new ValidationAwareSupport(); - DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.inject(StrutsTextProviderFactory.class)); + DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.getInstance(TextProviderFactory.class)); stack.push(validatorContext); validator.setValidatorContext(validatorContext); validator.setFieldName("foo"); http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java index bd3d9da..e60d247 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java @@ -21,7 +21,7 @@ import java.util.Map; */ public class DoubleRangeValidatorTest extends XWorkTestCase { private DoubleRangeFieldValidator val; - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void testRangeValidationWithError() throws Exception { //Explicitly set an out-of-range double for DoubleRangeValidatorTest @@ -237,7 +237,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { val = new DoubleRangeFieldValidator(); val.setValueStack(ActionContext.getContext().getValueStack()); ActionContext.getContext().setParameters(HttpParameters.create().build()); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } @Override http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java index d9e138c..e0f5f33 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java @@ -15,7 +15,7 @@ */ package com.opensymphony.xwork2.validator; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import java.util.*; @@ -33,7 +33,7 @@ public class DummyValidatorContext extends DelegatingValidatorContext { private Map<String, List<String>> fieldErrors; - public DummyValidatorContext(Object object, StrutsTextProviderFactory tpf) { + public DummyValidatorContext(Object object, TextProviderFactory tpf) { super(object, tpf); } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java index 5a66920..dffad12 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java @@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.EmailValidator; @@ -30,7 +30,7 @@ import com.opensymphony.xwork2.validator.validators.EmailValidator; */ public class EmailValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void testEmailValidity() throws Exception { assertTrue(verifyEmailValidity("[email protected]")); @@ -162,6 +162,6 @@ public class EmailValidatorTest extends XWorkTestCase { public void setUp() throws Exception { super.setUp(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java index 7ce38c5..92c5a5a 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java @@ -38,7 +38,7 @@ import java.util.Map; */ public class ExpressionValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void testExpressionValidationOfStringLength() throws ValidationException { TestBean bean = new TestBean(); @@ -139,7 +139,7 @@ public class ExpressionValidatorTest extends XWorkTestCase { ActionContext.getContext().setActionInvocation(invocation); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java index 6dd8e3f..4fa50fd 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java @@ -16,7 +16,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.RegexFieldValidator; @@ -37,11 +37,11 @@ import java.util.List; */ public class RegexFieldValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } public void testMatch() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java index ad8418b..c4aa178 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java @@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.mock.MockActionInvocation; import com.opensymphony.xwork2.util.ValueStack; @@ -92,7 +92,7 @@ public class RepopulateConversionErrorFieldValidatorSupportTest extends XWorkTes conversionErrors.put("someFieldName", conversionErrorValue); conversionErrors.put("xxxsomeFieldName", conversionErrorValue); - StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class); + TextProviderFactory tpf = container.inject(TextProviderFactory.class); action = container.inject(ActionSupport.class); validator1 = http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java index e737dde..06695ea 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java @@ -153,7 +153,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { SimpleAction action = new SimpleAction(); container.inject(action); - ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class)); + ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.getInstance(TextProviderFactory.class)); validator.setValidatorContext(validatorContext); validator.validate(this); assertTrue(validatorContext.hasActionErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java index b8f3472..ee6daf7 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java @@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator; @@ -163,7 +163,7 @@ public class StringLengthFieldValidatorTest extends XWorkTestCase { validator = new StringLengthFieldValidator(); validator.setFieldName("myField"); validator.setMessageKey("error"); - validator.setValidatorContext(new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class))); + validator.setValidatorContext(new DelegatingValidatorContext(action, container.getInstance(TextProviderFactory.class))); validator.setMaxLength(5); validator.setMinLength(2); validator.setValueStack(valueStack); http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java index 0ca581c..45a0211 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java @@ -19,7 +19,7 @@ import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.entities.ActionConfig; @@ -37,7 +37,7 @@ import java.util.Map; */ public class StringValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void testRequiredStringWithNullValue() throws Exception { Equidae equidae = new Equidae(); @@ -217,6 +217,6 @@ public class StringValidatorTest extends XWorkTestCase { ActionContext.getContext().setActionInvocation(invocation); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java index d377bc9..b961d78 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java @@ -16,7 +16,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.URLValidator; @@ -37,7 +37,7 @@ public class URLValidatorTest extends XWorkTestCase { ValueStack stack; ActionContext actionContext; - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void testAcceptNullValueForMutualExclusionOfValidators() throws Exception { @@ -205,7 +205,7 @@ public class URLValidatorTest extends XWorkTestCase { super.setUp(); stack = ActionContext.getContext().getValueStack(); actionContext = ActionContext.getContext(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } @Override http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java index 5727e45..52b331a 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java @@ -7,6 +7,7 @@ import java.util.Map; import com.opensymphony.xwork2.CompositeTextProvider; import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.validator.DelegatingValidatorContext; import com.opensymphony.xwork2.validator.ValidatorContext; @@ -28,7 +29,7 @@ public class AppendingValidatorContextTest extends XWorkTestCase { super.setUp(); action = container.inject(VisitorValidatorTestAction.class); - StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class); + TextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class); ValidatorContext vc1 = new DelegatingValidatorContext(action, tpf); VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(vc1, createTextProvider(action, vc1), FIRST_NAME, ""); http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java index 789c6a4..597a19b 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java @@ -1,7 +1,7 @@ package com.opensymphony.xwork2.validator.validators; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -14,7 +14,7 @@ import java.util.Locale; public class DateRangeFieldValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void testPassValidation() throws Exception { // given @@ -91,7 +91,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase { public void setUp() throws Exception { super.setUp(); ActionContext.getContext().setLocale(new Locale("DE")); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java index 26dd422..229e8fc 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java @@ -1,6 +1,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class IntRangeFieldValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } public void testPassValidation() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java index bc26cb4..fc99e8b 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java @@ -1,6 +1,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class LongRangeFieldValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } public void testPassValidation() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java index 614c406..8d4d919 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java @@ -2,7 +2,7 @@ package com.opensymphony.xwork2.validator.validators; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.DummyValidatorContext; @@ -10,11 +10,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class RequiredStringValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } public void testRequiredStringPass() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java index e6d3fb2..869f439 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java @@ -1,6 +1,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class ShortRangeFieldValidatorTest extends XWorkTestCase { - private StrutsTextProviderFactory tpf; + private TextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(StrutsTextProviderFactory.class); + tpf = container.getInstance(TextProviderFactory.class); } public void testPassValidation() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java ---------------------------------------------------------------------- diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java index 27660fb..3123a4b 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java @@ -23,7 +23,7 @@ package org.apache.struts.beanvalidation.validation.interceptor; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; import com.opensymphony.xwork2.util.AnnotationUtils; @@ -58,7 +58,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { private static final Logger LOG = LogManager.getLogger(BeanValidationInterceptor.class); protected BeanValidationManager beanValidationManager; - protected StrutsTextProviderFactory textProviderFactory; + protected TextProviderFactory textProviderFactory; protected boolean convertToUtf8 = false; protected String convertFromEncoding = "ISO-8859-1"; @@ -68,7 +68,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { } @Inject - public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { + public void setTextProviderFactory(TextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java ---------------------------------------------------------------------- diff --git a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java index 2373b16..473c9a7 100644 --- a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java +++ b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java @@ -23,7 +23,7 @@ package org.apache.struts2.oval.interceptor; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.Validateable; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; @@ -59,7 +59,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor { protected boolean programmatic = true; protected OValValidationManager validationManager; protected boolean validateJPAAnnotations; - protected StrutsTextProviderFactory textProviderFactory; + protected TextProviderFactory textProviderFactory; @Inject public void setValidationManager(OValValidationManager validationManager) { @@ -67,7 +67,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor { } @Inject - public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { + public void setTextProviderFactory(TextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java index d1a3442..1ef7357 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java @@ -21,7 +21,7 @@ package org.apache.struts2.tiles; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.StrutsTextProviderFactory; +import com.opensymphony.xwork2.TextProviderFactory; import com.opensymphony.xwork2.config.ConfigurationException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -48,7 +48,7 @@ public class I18NAttributeEvaluator extends AbstractAttributeEvaluator { throw new ConfigurationException("There is no ActionContext for current request!"); } - StrutsTextProviderFactory tpf = ctx.getContainer().inject(StrutsTextProviderFactory.class); + TextProviderFactory tpf = ctx.getContainer().getInstance(TextProviderFactory.class); TextProvider textProvider = tpf.createInstance(ctx.getActionInvocation().getAction().getClass()); if (textProvider != null) {
