mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add variant of sendSimpleErrorResponse w/o extra

pull/16/head
Andrew Gaul 2014-07-29 17:06:12 -07:00
rodzic 8631271086
commit 3f52992a25
1 zmienionych plików z 16 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -225,7 +225,7 @@ final class S3ProxyHandler extends AbstractHandler {
if (!blobStore.containerExists(containerName)) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_NOT_FOUND, "NoSuchBucket",
"Not Found", Optional.<String>absent());
"Not Found");
return;
}
}
@ -235,15 +235,13 @@ final class S3ProxyHandler extends AbstractHandler {
if (containerName.isEmpty()) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_METHOD_NOT_ALLOWED,
"MethodNotAllowed", "Method Not Allowed",
Optional.<String>absent());
"MethodNotAllowed", "Method Not Allowed");
return;
}
if (containerName.length() < 3 || containerName.length() > 255) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_BAD_REQUEST,
"InvalidBucketName", "Bad Request",
Optional.<String>absent());
"InvalidBucketName", "Bad Request");
return;
}
@ -301,7 +299,7 @@ final class S3ProxyHandler extends AbstractHandler {
} catch (NumberFormatException nfe) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_BAD_REQUEST, "InvalidArgument",
"Bad Request", Optional.<String>absent());
"Bad Request");
return;
}
}
@ -447,7 +445,7 @@ final class S3ProxyHandler extends AbstractHandler {
if (blob == null) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_NOT_FOUND, "NoSuchKey",
"Not Found", Optional.<String>absent());
"Not Found");
return;
}
@ -506,7 +504,7 @@ final class S3ProxyHandler extends AbstractHandler {
if (!validDigest) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_BAD_REQUEST, "InvalidDigest",
"Bad Request", Optional.<String>absent());
"Bad Request");
return;
}
}
@ -514,8 +512,7 @@ final class S3ProxyHandler extends AbstractHandler {
if (!hasContentLength) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_LENGTH_REQUIRED,
"MissingContentLength", "Length Required",
Optional.<String>absent());
"MissingContentLength", "Length Required");
return;
}
long contentLength = 0;
@ -534,7 +531,7 @@ final class S3ProxyHandler extends AbstractHandler {
if (!validContentLength || contentLength < 0) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_BAD_REQUEST, "InvalidArgument",
"Invalid Argument", Optional.<String>absent());
"Invalid Argument");
return;
}
@ -564,13 +561,13 @@ final class S3ProxyHandler extends AbstractHandler {
} catch (ContainerNotFoundException cnfe) {
sendSimpleErrorResponse(response,
HttpServletResponse.SC_NOT_FOUND, "NoSuchBucket",
"Not Found", Optional.<String>absent());
"Not Found");
return;
} catch (HttpResponseException hre) {
int status = hre.getResponse().getStatusCode();
if (status == HttpServletResponse.SC_BAD_REQUEST) {
sendSimpleErrorResponse(response, status, "InvalidDigest",
"Bad Request", Optional.<String>absent());
"Bad Request");
} else {
// TODO: emit hre.getContent() ?
response.sendError(status);
@ -613,6 +610,12 @@ final class S3ProxyHandler extends AbstractHandler {
}
}
private static void sendSimpleErrorResponse(HttpServletResponse response,
int status, String code, String message) {
sendSimpleErrorResponse(response, status, code, message,
Optional.<String>absent());
}
private static void sendSimpleErrorResponse(HttpServletResponse response,
int status, String code, String message, Optional<String> extra) {
try (Writer writer = response.getWriter()) {