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 2016/01/19 08:47:44 UTC
[3/4] struts git commit: increased visibilty of methods and constants
for better extensibility
increased visibilty of methods and constants for better extensibility
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b0a66b47
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b0a66b47
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b0a66b47
Branch: refs/heads/master
Commit: b0a66b47ac6475e9d8d05fc24b709e5acd54447e
Parents: 7bd8dd9
Author: cnenning <cn...@apache.org>
Authored: Thu Jan 14 09:33:50 2016 +0100
Committer: cnenning <cn...@apache.org>
Committed: Thu Jan 14 09:33:50 2016 +0100
----------------------------------------------------------------------
.../org/apache/struts2/json/JSONActionRedirectResult.java | 8 ++++----
.../org/apache/struts2/json/JSONValidationInterceptor.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b0a66b47/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
index 40aa092..4b8b948 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
@@ -44,12 +44,12 @@ public class JSONActionRedirectResult extends ServletActionRedirectResult {
* @return true if a JSON response shall be generated, false if a redirect
* shall be sent.
*/
- private boolean sendJsonInsteadOfRedirect() {
+ protected boolean sendJsonInsteadOfRedirect() {
HttpServletRequest request = ServletActionContext.getRequest();
return isJsonEnabled(request) && !isValidateOnly(request);
}
- private void printJson(HttpServletResponse response, String finalLocation) throws IOException {
+ protected void printJson(HttpServletResponse response, String finalLocation) throws IOException {
response.setStatus(HttpServletResponse.SC_OK);
response.setContentType("application/json");
response.setHeader("Location", finalLocation);
@@ -60,11 +60,11 @@ public class JSONActionRedirectResult extends ServletActionRedirectResult {
writer.close();
}
- private boolean isJsonEnabled(HttpServletRequest request) {
+ protected boolean isJsonEnabled(HttpServletRequest request) {
return "true".equals(request.getParameter(JSONValidationInterceptor.VALIDATE_JSON_PARAM));
}
- private boolean isValidateOnly(HttpServletRequest request) {
+ protected boolean isValidateOnly(HttpServletRequest request) {
return "true".equals(request.getParameter(JSONValidationInterceptor.VALIDATE_ONLY_PARAM));
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/b0a66b47/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
index 0fc7902..20ffb50 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
@@ -74,11 +74,11 @@ public class JSONValidationInterceptor extends MethodFilterInterceptor {
private static final Logger LOG = LogManager.getLogger(JSONValidationInterceptor.class);
- static final String VALIDATE_ONLY_PARAM = "struts.validateOnly";
- static final String VALIDATE_JSON_PARAM = "struts.enableJSONValidation";
- private static final String NO_ENCODING_SET_PARAM = "struts.JSONValidation.no.encoding";
+ public static final String VALIDATE_ONLY_PARAM = "struts.validateOnly";
+ public static final String VALIDATE_JSON_PARAM = "struts.enableJSONValidation";
+ public static final String NO_ENCODING_SET_PARAM = "struts.JSONValidation.no.encoding";
- private static final String DEFAULT_ENCODING = "UTF-8";
+ public static final String DEFAULT_ENCODING = "UTF-8";
private int validationFailedStatus = -1;