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 2017/08/03 14:05:02 UTC
[3/5] struts git commit: Updates flow to handle new API
Updates flow to handle new API
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a64da53d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a64da53d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a64da53d
Branch: refs/heads/master
Commit: a64da53d5770c5404ee5eb390b826f5733171f5f
Parents: 3bd072c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Aug 2 14:59:54 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Aug 2 14:59:54 2017 +0200
----------------------------------------------------------------------
.../org/apache/struts2/rest/ContentTypeHandlerManager.java | 7 +++++++
.../java/org/apache/struts2/rest/ContentTypeInterceptor.java | 2 +-
.../java/org/apache/struts2/rest/RestActionInvocation.java | 2 +-
.../java/org/apache/struts2/rest/RestWorkflowInterceptor.java | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a64da53d/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java
index 5b81a97..a7af101 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java
@@ -21,6 +21,7 @@
package org.apache.struts2.rest;
+import com.opensymphony.xwork2.ActionInvocation;
import org.apache.struts2.rest.handler.ContentTypeHandler;
import javax.servlet.http.HttpServletRequest;
@@ -59,10 +60,16 @@ public interface ContentTypeHandlerManager {
* @param target The object to return, usually the action object
* @return The new result code to process
* @throws IOException If unable to write to the response
+ *
+ * @deprecated use version which requires {@link ActionInvocation}
*/
+ @Deprecated
String handleResult(ActionConfig actionConfig, Object methodResult, Object target)
throws IOException;
+ String handleResult(ActionInvocation actionInvocation, Object methodResult, Object target)
+ throws IOException;
+
/**
* Finds the extension in the url
*
http://git-wip-us.apache.org/repos/asf/struts/blob/a64da53d/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
index 01340a7..8a194ed 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
@@ -57,7 +57,7 @@ public class ContentTypeInterceptor extends AbstractInterceptor {
if (request.getContentLength() > 0) {
InputStream is = request.getInputStream();
InputStreamReader reader = new InputStreamReader(is);
- handler.toObject(reader, target);
+ handler.toObject(invocation, reader, target);
}
return invocation.invoke();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a64da53d/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
index c5a687f..c71faba 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
@@ -224,7 +224,7 @@ public class RestActionInvocation extends DefaultActionInvocation {
if (handler != null && !(handler instanceof HtmlHandler)) {
// Specific representation (json, xml...)
- resultCode = handlerSelector.handleResult(this.getProxy().getConfig(), httpHeaders, target);
+ resultCode = handlerSelector.handleResult(this, httpHeaders, target);
} else {
// Normal struts execution (html o other struts result)
findResult();
http://git-wip-us.apache.org/repos/asf/struts/blob/a64da53d/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
index 0b2ac07..8d2f346 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java
@@ -221,7 +221,7 @@ public class RestWorkflowInterceptor extends MethodFilterInterceptor {
errors.put("actionErrors", validationAwareAction.getActionErrors());
errors.put("fieldErrors", validationAwareAction.getFieldErrors());
- return manager.handleResult(invocation.getProxy().getConfig(), info, errors);
+ return manager.handleResult(invocation, info, errors);
}
}