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/377c6cdd Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/377c6cdd Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/377c6cdd Branch: refs/heads/support-2-3 Commit: 377c6cdda03cd1faf95c664e706b7e389f12058b Parents: 6438396 Author: cnenning <cnenn...@apache.org> Authored: Thu Jan 14 09:33:50 2016 +0100 Committer: cnenning <cnenn...@apache.org> Committed: Fri Jan 29 13:54:08 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/377c6cdd/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 65d0bd3..d672c91 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/377c6cdd/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 1c7fd54..fc65324 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 = LoggerFactory.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;
