You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2017/03/28 23:30:55 UTC
asterixdb git commit: Provide error message with 405 status code.
Repository: asterixdb
Updated Branches:
refs/heads/master fc3fea83d -> 2bb5be85d
Provide error message with 405 status code.
Change-Id: I6aa416828e0001c1c4ef9260390b2f950e899533
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1626
Reviewed-by: Michael Blow <mb...@apache.org>
Integration-Tests: Michael Blow <mb...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/2bb5be85
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/2bb5be85
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/2bb5be85
Branch: refs/heads/master
Commit: 2bb5be85dad8dd204f07a7e766d21317ad23752c
Parents: fc3fea8
Author: Till Westmann <ti...@apache.org>
Authored: Tue Mar 28 13:35:57 2017 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Tue Mar 28 16:30:35 2017 -0700
----------------------------------------------------------------------
.../hyracks/http/server/AbstractServlet.java | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2bb5be85/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
index 252328c..d029bbc 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java
@@ -18,6 +18,7 @@
*/
package org.apache.hyracks.http.server;
+import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
@@ -26,6 +27,7 @@ import java.util.logging.Logger;
import org.apache.hyracks.http.api.IServlet;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
+import org.apache.hyracks.http.server.utils.HttpUtil;
import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpMethod;
@@ -81,7 +83,7 @@ public abstract class AbstractServlet implements IServlet {
} else if (HttpMethod.OPTIONS.equals(method)) {
options(request, response);
} else {
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(method, response);
}
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unhandled exception", e);
@@ -89,40 +91,46 @@ public abstract class AbstractServlet implements IServlet {
}
}
+ protected void notAllowed(HttpMethod method, IServletResponse response) throws IOException {
+ response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_PLAIN, HttpUtil.Encoding.UTF8);
+ response.writer().write("Method " + method + " not allowed for the requested resource.\n");
+ }
+
@SuppressWarnings("squid:S1172")
protected void get(IServletRequest request, IServletResponse response) throws Exception {
// designed to be extended but an error in standard case
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(HttpMethod.GET, response);
}
@SuppressWarnings("squid:S1172")
protected void head(IServletRequest request, IServletResponse response) throws Exception {
// designed to be extended but an error in standard case
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(HttpMethod.HEAD, response);
}
@SuppressWarnings("squid:S1172")
protected void post(IServletRequest request, IServletResponse response) throws Exception {
// designed to be extended but an error in standard case
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(HttpMethod.POST, response);
}
@SuppressWarnings("squid:S1172")
protected void put(IServletRequest request, IServletResponse response) throws Exception {
// designed to be extended but an error in standard case
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(HttpMethod.PUT, response);
}
@SuppressWarnings("squid:S1172")
protected void delete(IServletRequest request, IServletResponse response) throws Exception {
// designed to be extended but an error in standard case
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(HttpMethod.DELETE, response);
}
@SuppressWarnings("squid:S1172")
protected void options(IServletRequest request, IServletResponse response) throws Exception {
// designed to be extended but an error in standard case
- response.setStatus(HttpResponseStatus.METHOD_NOT_ALLOWED);
+ notAllowed(HttpMethod.OPTIONS, response);
}
public String host(IServletRequest request) {