You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2018/03/16 13:32:43 UTC
[struts] branch master updated (7f3c09c -> b492eaf)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 7f3c09c Merge pull request #208 from aleksandr-m/feature/lang_to_text
add 5b4ae03 WW-685 Add class to hold conversion related data
add 1b15cfd WW-685 Add generic type conversion error message
add 34979cf WW-685 Add tests
add 1fcd1ae WW-685 Fix getText expression
new b492eaf Merge pull request #215 from aleksandr-m/feature/WW-685
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../com/opensymphony/xwork2/ActionContext.java | 7 +-
.../com/opensymphony/xwork2/ActionSupport.java | 5 +-
.../xwork2/conversion/impl/ConversionData.java} | 33 ++++----
.../xwork2/conversion/impl/XWorkConverter.java | 22 +++--
.../interceptor/ConversionErrorInterceptor.java | 13 +--
.../validators/ConversionErrorFieldValidator.java | 5 +-
...pulateConversionErrorFieldValidatorSupport.java | 5 +-
.../com/opensymphony/xwork2/ActionContextTest.java | 5 +-
.../com/opensymphony/xwork2/ActionSupportTest.java | 3 +-
.../impl/AnnotationXWorkConverterTest.java | 16 ++--
.../xwork2/conversion/impl/XWorkConverterTest.java | 93 ++++++++++++++++++++--
.../ConversionErrorInterceptorTest.java | 11 +--
.../ConversionErrorFieldValidatorTest.java | 5 +-
...teConversionErrorFieldValidatorSupportTest.java | 7 +-
.../validator/VisitorFieldValidatorTest.java | 6 +-
.../StrutsConversionErrorInterceptorTest.java | 14 ++--
.../opensymphony/xwork2/SimpleAction.properties | 4 +
17 files changed, 177 insertions(+), 77 deletions(-)
copy core/src/{test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java => main/java/com/opensymphony/xwork2/conversion/impl/ConversionData.java} (66%)
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 01/01: Merge pull request #215 from
aleksandr-m/feature/WW-685
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b492eaf0c7ed3309554488e01ae2401bb7ad0344
Merge: 7f3c09c 1fcd1ae
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Fri Mar 16 14:32:41 2018 +0100
Merge pull request #215 from aleksandr-m/feature/WW-685
WW-685 Add generic type conversion error message
.../com/opensymphony/xwork2/ActionContext.java | 7 +-
.../com/opensymphony/xwork2/ActionSupport.java | 5 +-
.../xwork2/conversion/impl/ConversionData.java | 46 +++++++++++
.../xwork2/conversion/impl/XWorkConverter.java | 22 +++--
.../interceptor/ConversionErrorInterceptor.java | 13 +--
.../validators/ConversionErrorFieldValidator.java | 5 +-
...pulateConversionErrorFieldValidatorSupport.java | 5 +-
.../com/opensymphony/xwork2/ActionContextTest.java | 5 +-
.../com/opensymphony/xwork2/ActionSupportTest.java | 3 +-
.../impl/AnnotationXWorkConverterTest.java | 16 ++--
.../xwork2/conversion/impl/XWorkConverterTest.java | 93 ++++++++++++++++++++--
.../ConversionErrorInterceptorTest.java | 11 +--
.../ConversionErrorFieldValidatorTest.java | 5 +-
...teConversionErrorFieldValidatorSupportTest.java | 7 +-
.../validator/VisitorFieldValidatorTest.java | 6 +-
.../StrutsConversionErrorInterceptorTest.java | 14 ++--
.../opensymphony/xwork2/SimpleAction.properties | 4 +
17 files changed, 206 insertions(+), 61 deletions(-)
diff --cc core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
index 32270de,f271380..ee8e392
--- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
+++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
@@@ -20,9 -20,10 +20,10 @@@ package com.opensymphony.xwork2.interce
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+ import com.opensymphony.xwork2.conversion.impl.ConversionData;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import java.util.HashMap;
import java.util.Map;
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.