struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] 01/01: Merge pull request #215 from aleksandr-m/feature/WW-685
Date Fri, 16 Mar 2018 13:32:44 GMT
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 <lukasz.lenart@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.

Mime
View raw message