Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improved error response code to include url encoded params which makes ec2 a lot easier to debug

This commit is contained in:
Adrian Cole 2010-11-07 01:45:40 +01:00
parent c253c1b77d
commit 8036bf08f0
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
core/src/main/java/org/jclouds/http/HttpResponseException.java
View File

@ -19,8 +19,13 @@
package org.jclouds.http; package org.jclouds.http;
import java.io.IOException;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.jclouds.io.payloads.StringPayload;
import org.jclouds.util.Utils;
/** /**
* Represents an error obtained from an HttpResponse. * Represents an error obtained from an HttpResponse.
* *
@ -34,15 +39,14 @@ public class HttpResponseException extends RuntimeException {
protected final HttpResponse response; protected final HttpResponse response;
private String content; private String content;
public HttpResponseException(String message, HttpCommand command, public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response, Throwable cause) {
@Nullable HttpResponse response, Throwable cause) {
super(message, cause); super(message, cause);
this.command = command; this.command = command;
this.response = response; this.response = response;
} }
public HttpResponseException(String message, HttpCommand command, public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response, String content,
@Nullable HttpResponse response, String content, Throwable cause) { Throwable cause) {
super(message, cause); super(message, cause);
this.command = command; this.command = command;
this.response = response; this.response = response;
@ -50,15 +54,13 @@ public class HttpResponseException extends RuntimeException {
} }
public HttpResponseException(HttpCommand command, HttpResponse response, Throwable cause) { public HttpResponseException(HttpCommand command, HttpResponse response, Throwable cause) {
this(String.format("command: %1$s failed with response: %2$s", command.getRequest() this(String.format("command: %1$s failed with response: %2$s", command.getRequest().getRequestLine(),
.getRequestLine(), response.getStatusLine()), command, response, cause); response.getStatusLine()), command, response, cause);
} }
public HttpResponseException(HttpCommand command, HttpResponse response, String content, public HttpResponseException(HttpCommand command, HttpResponse response, String content, Throwable cause) {
Throwable cause) { this(String.format("command: %1$s failed with response: %2$s; content: [%3$s]", command.getRequest()
this(String.format("command: %1$s failed with response: %2$s; content: [%3$s]", command .getRequestLine(), response.getStatusLine()), command, response, content, cause);
.getRequest().getRequestLine(), response.getStatusLine()), command, response,
content, cause);
} }
public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response) { public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response) {
@ -67,8 +69,7 @@ public class HttpResponseException extends RuntimeException {
this.response = response; this.response = response;
} }
public HttpResponseException(String message, HttpCommand command, public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response, String content) {
@Nullable HttpResponse response, String content) {
super(message); super(message);
this.command = command; this.command = command;
this.response = response; this.response = response;
@ -76,14 +77,29 @@ public class HttpResponseException extends RuntimeException {
} }
public HttpResponseException(HttpCommand command, HttpResponse response) { public HttpResponseException(HttpCommand command, HttpResponse response) {
this(String.format("command: %1$s failed with response: %2$s", command.getRequest() this(String.format("request: %s %sfailed with response: %s", command.getRequest().getRequestLine(),
.getRequestLine(), response.getStatusLine()), command, response); requestPayloadIfStringOrFormIfNotReturnEmptyString(command.getRequest()), response.getStatusLine()),
command, response);
}
static String requestPayloadIfStringOrFormIfNotReturnEmptyString(HttpRequest request) {
if (request.getPayload() != null
&& ("application/x-www-form-urlencoded".equals(request.getPayload().getContentMetadata().getContentType()) || request
.getPayload() instanceof StringPayload)
&& request.getPayload().getContentMetadata().getContentLength() != null
&& request.getPayload().getContentMetadata().getContentLength() < 1024) {
try {
return String.format(" [%s] ", request.getPayload() instanceof StringPayload ? request.getPayload()
.getRawContent() : Utils.toStringAndClose(request.getPayload().getInput()));
} catch (IOException e) {
}
}
return "";
} }
public HttpResponseException(HttpCommand command, HttpResponse response, String content) { public HttpResponseException(HttpCommand command, HttpResponse response, String content) {
this(String.format("command: %1$s failed with response: %2$s; content: [%3$s]", command this(String.format("command: %s failed with response: %s; content: [%s]", command.getRequest().getRequestLine(),
.getRequest().getRequestLine(), response.getStatusLine(), content), command, response.getStatusLine(), content), command, response, content);
response, content);
} }
public HttpCommand getCommand() { public HttpCommand getCommand() {