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 2013/05/22 19:51:40 UTC
svn commit: r1485311 - in /struts/struts2/trunk/xwork-core/src:
main/java/com/opensymphony/xwork2/interceptor/
test/java/com/opensymphony/xwork2/interceptor/
Author: lukaszlenart
Date: Wed May 22 17:51:40 2013
New Revision: 1485311
URL: http://svn.apache.org/r1485311
Log:
WW-4071 Changes interface a bit after review
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java?rev=1485311&r1=1485310&r2=1485311&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java (original)
+++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java Wed May 22 17:51:40 2013
@@ -209,13 +209,10 @@ public class DefaultWorkflowInterceptor
protected String processValidationErrorAware(final Object action, final String currentResultName) {
String resultName = currentResultName;
if (action instanceof ValidationErrorAware) {
- String validationErrorAwareResult = ((ValidationErrorAware) action).actionErrorOccurred();
- if (validationErrorAwareResult != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Changing result name from [#0] to [#1] because of processing interface [#2] on action [#3]",
- currentResultName, resultName, ValidationErrorAware.class.getSimpleName(), action);
- }
- resultName = validationErrorAwareResult;
+ resultName = ((ValidationErrorAware) action).actionErrorOccurred(currentResultName);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Changing result name from [#0] to [#1] because of processing interface [#2] on action [#3]",
+ currentResultName, resultName, ValidationErrorAware.class.getSimpleName(), action);
}
}
return resultName;
Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java?rev=1485311&r1=1485310&r2=1485311&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java (original)
+++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java Wed May 22 17:51:40 2013
@@ -30,8 +30,9 @@ public interface ValidationErrorAware {
/**
* Allows to notify action about occurred action/field errors
*
- * @return new result name or null to keep result of {@link com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor}
+ * @param currentResultName current result name, action can change it or return the same
+ * @return new result name or passed currentResultName
*/
- String actionErrorOccurred();
+ String actionErrorOccurred(final String currentResultName);
}
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java?rev=1485311&r1=1485310&r2=1485311&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java Wed May 22 17:51:40 2013
@@ -37,7 +37,7 @@ public class ValidationErrorAwareTest ex
public void testNotChangeResultWhenNotifyAboutValidationError() throws Exception {
// given
- actionResult = null;
+ actionResult = Action.INPUT;
ValidationInterceptor validationInterceptor = create();
// when
@@ -56,7 +56,7 @@ public class ValidationErrorAwareTest ex
interceptor = new DefaultWorkflowInterceptor();
ActionProxy proxy = EasyMock.createNiceMock(ActionProxy.class);
- EasyMock.expect(action.actionErrorOccurred()).andAnswer(new IAnswer<String>() {
+ EasyMock.expect(action.actionErrorOccurred(EasyMock.<String>anyObject())).andAnswer(new IAnswer<String>() {
public String answer() throws Throwable {
return actionResult;
}