Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 23:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

made methods non static and private, javadoc updates

Browse Source
This commit is contained in:
cnenning
2016-01-12 14:14:09 +01:00
parent 69bc2947c1
commit 6438396ef8
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.opensymphony.xwork2.validator.annotations.UrlValidator;
* <ul>
* <li>Depends on <code>json-plugin</code>.</li>
* <li>Requires <code>jsonValidationInterceptor</code> to be on stack.</li>
* <li>Uses a special json redirect result type.</li>
* <li>Uses result type <code>jsonActionRedirect</code>.</li>
* <li>Uses http parameters <code>struts.enableJSONValidation=true</code> and <code>struts.validateOnly=false</code>.</li>
* <li>Uses a customized theme to make sure html elements required as error containers are always present and easily selectable in JS.</li>
* <li>Uses some custom JS code depending on jQuery to issue AJAX request and to render errors in html.</li>
plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
+11 -12
View File
@@ -16,13 +16,12 @@ import org.apache.struts2.dispatcher.ServletActionRedirectResult;
* don't pass them to JS handlers. So this result produces a JSON response
* containing redirect data.
*
*<p>
* To be used along with {@link JSONValidationInterceptor}.
*</p>
*<p>
* Response JSON looks like this:
* <pre>{"location": "$redirect url$"}</pre>
*</p>
* <p>To be used along with {@link JSONValidationInterceptor}.</p>
*
* <p>Response JSON looks like this:
*
* <pre>{"location": "$redirect url$"}</pre>
* </p>
*
*/
public class JSONActionRedirectResult extends ServletActionRedirectResult {
@@ -30,7 +29,7 @@ public class JSONActionRedirectResult extends ServletActionRedirectResult {
private static final long serialVersionUID = 3107276294073879542L;
@Override
protected void sendRedirect(HttpServletResponse response, String finalLocation) throws IOException {
protected void sendRedirect(HttpServletResponse response, String finalLocation) throws IOException {
if (sendJsonInsteadOfRedirect()) {
printJson(response, finalLocation);
} else {
@@ -45,12 +44,12 @@ public class JSONActionRedirectResult extends ServletActionRedirectResult {
* @return true if a JSON response shall be generated, false if a redirect
* shall be sent.
*/
static boolean sendJsonInsteadOfRedirect() {
private boolean sendJsonInsteadOfRedirect() {
HttpServletRequest request = ServletActionContext.getRequest();
return isJsonEnabled(request) && !isValidateOnly(request);
}
static void printJson(HttpServletResponse response, String finalLocation) throws IOException {
private void printJson(HttpServletResponse response, String finalLocation) throws IOException {
response.setStatus(HttpServletResponse.SC_OK);
response.setContentType("application/json");
response.setHeader("Location", finalLocation);
@@ -61,11 +60,11 @@ public class JSONActionRedirectResult extends ServletActionRedirectResult {
writer.close();
}
private static boolean isJsonEnabled(HttpServletRequest request) {
private boolean isJsonEnabled(HttpServletRequest request) {
return "true".equals(request.getParameter(JSONValidationInterceptor.VALIDATE_JSON_PARAM));
}
private static boolean isValidateOnly(HttpServletRequest request) {
private boolean isValidateOnly(HttpServletRequest request) {
return "true".equals(request.getParameter(JSONValidationInterceptor.VALIDATE_ONLY_PARAM));
}
}