From 8b56ded41b3d3fd7dc6243f2297d8e47214803d8 Mon Sep 17 00:00:00 2001 From: danikov Date: Mon, 6 Feb 2012 14:44:20 +0000 Subject: [PATCH] fix exception by changing the return type to match --- .../jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java | 3 ++- .../vcloud/director/v1_5/features/OrgClientExpectTest.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java index 5aea14eb28..4b513a5e9e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java @@ -29,6 +29,7 @@ import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.JAXBResponseParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; +import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; @@ -58,5 +59,5 @@ public interface OrgAsyncClient { @Consumes @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getOrg(@EndpointParam URI uri); + ListenableFuture getOrg(@EndpointParam URI uri); } diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java index bfc10bfcd7..f95fb4ef33 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java @@ -69,8 +69,7 @@ public class OrgClientExpectTest extends BaseVCloudDirectorRestClientExpectTest } - // please help solve javax.xml.bind.UnmarshalException - @Test(enabled = false) + @Test public void testWhenResponseIs2xxLoginReturnsValidOrg() { URI orgRef = URI.create("https://vcloudbeta.bluelock.com/api/org/6f312e42-cd2b-488d-a2bb-97519cd57ed0");