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

slicehost fixes

This commit is contained in:
Adrian Cole 2011-01-23 23:18:28 -08:00
parent 89e7fd6092
commit b1b29ec222
3 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostAsyncClient.java
View File

@ -38,6 +38,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
import org.jclouds.rest.annotations.XMLResponseParser;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
import org.jclouds.slicehost.binders.BindCreateSliceToXmlPayload;
import org.jclouds.slicehost.domain.Backup;
import org.jclouds.slicehost.domain.Flavor;
@ -92,6 +93,7 @@ public interface SlicehostAsyncClient {
* @see SlicehostClient#destroySlice
*/
@DELETE
@ExceptionParser(ReturnVoidOnNotFoundOr404.class)
@Path("/slices/{id}/destroy.xml")
ListenableFuture<Void> destroySlice(@PathParam("id") int id);

58
providers/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java
View File

@ -21,6 +21,7 @@ package org.jclouds.slicehost.handlers;
import static org.jclouds.http.HttpUtils.releasePayload;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -41,6 +42,7 @@ import org.jclouds.logging.Logger;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.slicehost.xml.ErrorHandler;
import org.jclouds.util.Strings2;
/**
* This will parse and set an appropriate exception on the command object.
@ -67,28 +69,28 @@ public class ParseSlicehostErrorFromHttpResponse implements HttpErrorHandler {
String content = response.getStatusCode() != 401 ? parseErrorFromContentOrNull(command, response) : null;
exception = content != null ? new HttpResponseException(command, response, content) : exception;
switch (response.getStatusCode()) {
case 401:
exception = new AuthorizationException(exception.getMessage(), exception);
break;
case 403:
case 404:
if (!command.getCurrentRequest().getMethod().equals("DELETE")) {
String path = command.getCurrentRequest().getEndpoint().getPath();
Matcher matcher = RESOURCE_PATTERN.matcher(path);
String message;
if (matcher.find()) {
message = String.format("%s %s not found", matcher.group(1), matcher.group(2));
} else {
message = path;
case 401:
exception = new AuthorizationException(exception.getMessage(), exception);
break;
case 403:
case 404:
if (!command.getCurrentRequest().getMethod().equals("DELETE")) {
String path = command.getCurrentRequest().getEndpoint().getPath();
Matcher matcher = RESOURCE_PATTERN.matcher(path);
String message;
if (matcher.find()) {
message = String.format("%s %s not found", matcher.group(1), matcher.group(2));
} else {
message = path;
}
exception = new ResourceNotFoundException(message);
}
exception = new ResourceNotFoundException(message);
}
break;
case 422:
exception = new IllegalStateException(content);
break;
default:
exception = new HttpResponseException(command, response, content);
break;
case 422:
exception = new IllegalStateException(content);
break;
default:
exception = new HttpResponseException(command, response, content);
}
} finally {
releasePayload(response);
@ -124,8 +126,18 @@ public class ParseSlicehostErrorFromHttpResponse implements HttpErrorHandler {
String parseErrorFromContentOrNull(HttpCommand command, HttpResponse response) {
// slicehost returns " " which is unparsable
if (response.getPayload() != null && response.getPayload().getContentMetadata().getContentLength() != 1) {
return errorParser.parse(response.getPayload());
if (response.getPayload() != null) {
String contentType = response.getPayload().getContentMetadata().getContentType();
if (response.getPayload().getContentMetadata().getContentLength() != 1) {
response.getPayload().release();
} else if (contentType != null && contentType.indexOf("xml") != -1) {
return errorParser.parse(response.getPayload());
} else {
try {
return Strings2.toStringAndClose(response.getPayload().getInput());
} catch (IOException e) {
}
}
}
return null;
}

3
providers/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java
View File

@ -33,6 +33,7 @@ import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextSpec;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
import org.jclouds.rest.internal.RestAnnotationProcessor;
import org.jclouds.slicehost.filters.SlicehostBasic;
import org.jclouds.slicehost.xml.FlavorHandler;
@ -83,7 +84,7 @@ public class SlicehostAsyncClientTest extends RestClientTest<SlicehostAsyncClien
assertResponseParserClassEquals(method, request, ReleasePayloadAndReturn.class);
assertSaxResponseParserClassEquals(method, null);
assertExceptionParserClassEquals(method, null);
assertExceptionParserClassEquals(method, ReturnVoidOnNotFoundOr404.class);
checkFilters(request);
}