Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Injects missing dependency

Browse Source
This commit is contained in:
Lukasz Lenart
2017-03-13 06:51:47 +01:00
parent ce2261f6f5
commit 6d60064bea
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+9 -1
View File
@@ -23,6 +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.TextProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
import com.opensymphony.xwork2.util.AnnotationUtils;
@@ -55,7 +56,9 @@ import java.util.Set;
public class BeanValidationInterceptor extends MethodFilterInterceptor {
private static final Logger LOG = LogManager.getLogger(BeanValidationInterceptor.class);
protected BeanValidationManager beanValidationManager;
protected TextProviderFactory textProviderFactory;
protected boolean convertToUtf8 = false;
protected String convertFromEncoding = "ISO-8859-1";
@@ -64,6 +67,11 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
this.beanValidationManager = beanValidationManager;
}
@Inject
public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
@Inject(value = ValidatorConstants.CONVERT_MESSAGE_TO_UTF8, required = false)
public void setConvertToUtf8(String convertToUtf8) {
this.convertToUtf8 = BooleanUtils.toBoolean(convertToUtf8);
@@ -122,7 +130,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
@SuppressWarnings("nls")
private void addBeanValidationErrors(Set<ConstraintViolation<Object>> constraintViolations, Object action) {
if (constraintViolations != null) {
ValidatorContext validatorContext = new DelegatingValidatorContext(action);
ValidatorContext validatorContext = new DelegatingValidatorContext(action, textProviderFactory);
for (ConstraintViolation<Object> constraintViolation : constraintViolations) {
String key = constraintViolation.getMessage();
String message = key;