From 647317b9b4a8028f754a3a169acfccb3db17a9eb Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 15 Jul 2012 15:47:44 -0700 Subject: [PATCH] Issue 1022:Move naming convention to Api from Client or Services:: cdmi --- .../cdmi/v1/{CDMIClient.java => CDMIApi.java} | 16 +- .../jclouds/snia/cdmi/v1/CDMIApiMetadata.java | 4 +- ...CDMIAsyncClient.java => CDMIAsyncApi.java} | 16 +- .../org/jclouds/snia/cdmi/v1/ObjectTypes.java | 2 +- .../cdmi/v1/config/CDMIRestClientModule.java | 22 +-- ...ContainerClient.java => ContainerApi.java} | 4 +- ...syncClient.java => ContainerAsyncApi.java} | 10 +- .../{DataClient.java => DataApi.java} | 4 +- ...DataAsyncClient.java => DataAsyncApi.java} | 12 +- .../{DomainClient.java => DomainApi.java} | 4 +- ...inAsyncClient.java => DomainAsyncApi.java} | 4 +- .../BasicAuthenticationAndTenantId.java | 2 +- .../v1/filters/StripExtraAcceptHeader.java | 2 +- ...tTest.java => ContainerApiExpectTest.java} | 12 +- ...iveTest.java => ContainerApiLiveTest.java} | 18 +- ...ExpectTest.java => DataApiExpectTest.java} | 6 +- ...ientLiveTest.java => DataApiLiveTest.java} | 186 +++++++++--------- ...pectTest.java => DomainApiExpectTest.java} | 6 +- ...ntLiveTest.java => DomainApiLiveTest.java} | 6 +- ...ctTest.java => BaseCDMIApiExpectTest.java} | 6 +- ...LiveTest.java => BaseCDMIApiLiveTest.java} | 14 +- ...t.java => BaseCDMIAsyncApiExpectTest.java} | 10 +- .../cdmi/v1/internal/BaseCDMIExpectTest.java | 4 +- 23 files changed, 185 insertions(+), 185 deletions(-) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/{CDMIClient.java => CDMIApi.java} (81%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/{CDMIAsyncClient.java => CDMIAsyncApi.java} (78%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/{ContainerClient.java => ContainerApi.java} (95%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/{ContainerAsyncClient.java => ContainerAsyncApi.java} (93%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/{DataClient.java => DataApi.java} (96%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/{DataAsyncClient.java => DataAsyncApi.java} (94%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/{DomainClient.java => DomainApi.java} (95%) rename labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/{DomainAsyncClient.java => DomainAsyncApi.java} (96%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/{ContainerClientExpectTest.java => ContainerApiExpectTest.java} (82%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/{ContainerClientLiveTest.java => ContainerApiLiveTest.java} (89%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/{DataClientExpectTest.java => DataApiExpectTest.java} (82%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/{DataClientLiveTest.java => DataApiLiveTest.java} (80%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/{DomainClientExpectTest.java => DomainApiExpectTest.java} (82%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/{DomainClientLiveTest.java => DomainApiLiveTest.java} (82%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/{BaseCDMIClientExpectTest.java => BaseCDMIApiExpectTest.java} (82%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/{BaseCDMIClientLiveTest.java => BaseCDMIApiLiveTest.java} (78%) rename labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/{BaseCDMIAsyncClientExpectTest.java => BaseCDMIAsyncApiExpectTest.java} (77%) diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApi.java similarity index 81% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApi.java index 3f1d369e67..f5a165034e 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApi.java @@ -22,36 +22,36 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.snia.cdmi.v1.features.ContainerClient; -import org.jclouds.snia.cdmi.v1.features.DataClient; -import org.jclouds.snia.cdmi.v1.features.DomainClient; +import org.jclouds.snia.cdmi.v1.features.ContainerApi; +import org.jclouds.snia.cdmi.v1.features.DataApi; +import org.jclouds.snia.cdmi.v1.features.DomainApi; /** * Provides synchronous access to CDMI. *

* - * @see CDMIAsyncClient + * @see CDMIAsyncApi * @see api doc * @author Adrian Cole */ @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS) -public interface CDMIClient { +public interface CDMIApi { /** * Provides synchronous access to Domain Object Resource Operations. */ @Delegate - DomainClient getDomainClient(); + DomainApi getDomainApi(); /** * Provides synchronous access to Container Object Resource Operations. */ @Delegate - ContainerClient getContainerClient(); + ContainerApi getContainerApi(); /** * Provides synchronous access to Data Object Resource Operations. */ @Delegate - DataClient getDataClient(); + DataApi getDataApi(); } diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java index a01b8c47ca..0af9378e31 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java @@ -40,7 +40,7 @@ public class CDMIApiMetadata extends BaseRestApiMetadata { /** The serialVersionUID */ private static final long serialVersionUID = 6725672099385580694L; - public static final TypeToken> CONTEXT_TOKEN = new TypeToken>() { + public static final TypeToken> CONTEXT_TOKEN = new TypeToken>() { private static final long serialVersionUID = -5070937833892503232L; }; @@ -65,7 +65,7 @@ public class CDMIApiMetadata extends BaseRestApiMetadata { public static class Builder extends BaseRestApiMetadata.Builder { protected Builder() { - super(CDMIClient.class, CDMIAsyncClient.class); + super(CDMIApi.class, CDMIAsyncApi.class); id("cdmi") .name("SNIA CDMI API") .identityName("tenantId:user") diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIAsyncClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIAsyncApi.java similarity index 78% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIAsyncClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIAsyncApi.java index e8c80e56b8..f113142ce4 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIAsyncClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIAsyncApi.java @@ -19,35 +19,35 @@ package org.jclouds.snia.cdmi.v1; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.snia.cdmi.v1.features.ContainerAsyncClient; -import org.jclouds.snia.cdmi.v1.features.DataAsyncClient; -import org.jclouds.snia.cdmi.v1.features.DomainAsyncClient; +import org.jclouds.snia.cdmi.v1.features.ContainerAsyncApi; +import org.jclouds.snia.cdmi.v1.features.DataAsyncApi; +import org.jclouds.snia.cdmi.v1.features.DomainAsyncApi; /** * Provides asynchronous access to CDMI via their REST API. *

* - * @see CDMIClient + * @see CDMIApi * @see api doc * @author Adrian Cole */ -public interface CDMIAsyncClient { +public interface CDMIAsyncApi { /** * Provides asynchronous access to Domain Object Resource Operations. */ @Delegate - DomainAsyncClient getDomainClient(); + DomainAsyncApi getDomainApi(); /** * Provides asynchronous access to Container Object Resource Operations. */ @Delegate - ContainerAsyncClient getContainerClient(); + ContainerAsyncApi getContainerApi(); /** * Provides asynchronous access to Data Object Resource Operations. */ @Delegate - DataAsyncClient getDataClient(); + DataAsyncApi getDataApi(); } diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/ObjectTypes.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/ObjectTypes.java index ed841c5f1a..8d93a0b4f7 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/ObjectTypes.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/ObjectTypes.java @@ -28,4 +28,4 @@ public interface ObjectTypes { public static final String CONTAINER = "application/cdmi-container"; public static final String DATAOBJECT = "application/cdmi-object"; public static final String CDMIOBJECT = "application/cdmi-object"; -} \ No newline at end of file +} diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/config/CDMIRestClientModule.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/config/CDMIRestClientModule.java index cfe0250965..865090a474 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/config/CDMIRestClientModule.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/config/CDMIRestClientModule.java @@ -26,14 +26,14 @@ import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.config.RestClientModule; -import org.jclouds.snia.cdmi.v1.CDMIAsyncClient; -import org.jclouds.snia.cdmi.v1.CDMIClient; -import org.jclouds.snia.cdmi.v1.features.ContainerAsyncClient; -import org.jclouds.snia.cdmi.v1.features.ContainerClient; -import org.jclouds.snia.cdmi.v1.features.DataAsyncClient; -import org.jclouds.snia.cdmi.v1.features.DataClient; -import org.jclouds.snia.cdmi.v1.features.DomainAsyncClient; -import org.jclouds.snia.cdmi.v1.features.DomainClient; +import org.jclouds.snia.cdmi.v1.CDMIAsyncApi; +import org.jclouds.snia.cdmi.v1.CDMIApi; +import org.jclouds.snia.cdmi.v1.features.ContainerAsyncApi; +import org.jclouds.snia.cdmi.v1.features.ContainerApi; +import org.jclouds.snia.cdmi.v1.features.DataAsyncApi; +import org.jclouds.snia.cdmi.v1.features.DataApi; +import org.jclouds.snia.cdmi.v1.features.DomainAsyncApi; +import org.jclouds.snia.cdmi.v1.features.DomainApi; import org.jclouds.snia.cdmi.v1.handlers.CDMIErrorHandler; import com.google.common.collect.ImmutableMap; @@ -44,11 +44,11 @@ import com.google.common.collect.ImmutableMap; * @author Adrian Cole */ @ConfiguresRestClient -public class CDMIRestClientModule extends RestClientModule { +public class CDMIRestClientModule extends RestClientModule { public static final Map, Class> DELEGATE_MAP = ImmutableMap., Class> builder().put( - DomainClient.class, DomainAsyncClient.class).put(ContainerClient.class, ContainerAsyncClient.class).put( - DataClient.class, DataAsyncClient.class).build(); + DomainApi.class, DomainAsyncApi.class).put(ContainerApi.class, ContainerAsyncApi.class).put( + DataApi.class, DataAsyncApi.class).build(); public CDMIRestClientModule() { super(DELEGATE_MAP); diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java similarity index 95% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java index ac4d0c84c8..6f005f4813 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerApi.java @@ -27,12 +27,12 @@ import org.jclouds.snia.cdmi.v1.options.CreateContainerOptions; /** * Container Object Resource Operations * - * @see ContainerAsyncClient + * @see ContainerAsyncApi * @author Kenneth Nagin * @see api doc */ @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) -public interface ContainerClient { +public interface ContainerApi { Container createContainer(String containerName, CreateContainerOptions... options); diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerAsyncClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerAsyncApi.java similarity index 93% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerAsyncClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerAsyncApi.java index 3fe3a10c45..83c6be2503 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerAsyncClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/ContainerAsyncApi.java @@ -45,17 +45,17 @@ import com.google.common.util.concurrent.ListenableFuture; /** * Container Object Resource Operations * - * @see ContainerClient + * @see ContainerApi * @author Kenneth Nagin * @see api doc */ @SkipEncoding( { '/', '=' }) @RequestFilters( { BasicAuthenticationAndTenantId.class, StripExtraAcceptHeader.class }) @Headers(keys="X-CDMI-Specification-Version", values = "{jclouds.api-version}") -public interface ContainerAsyncClient { +public interface ContainerAsyncApi { /** - * @see ContainerClient#listContainers() + * @see ContainerApi#listContainers() */ @GET @Consumes( { ObjectTypes.CONTAINER, MediaType.APPLICATION_JSON }) @@ -64,7 +64,7 @@ public interface ContainerAsyncClient { ListenableFuture getContainer(@PathParam("containerName") String containerName); /** - * @see ContainerClient#createContainer + * @see ContainerApi#createContainer */ @PUT @Consumes( { ObjectTypes.CONTAINER, MediaType.APPLICATION_JSON }) @@ -75,7 +75,7 @@ public interface ContainerAsyncClient { CreateContainerOptions... options); /** - * @see ContainerClient#createContainer() + * @see ContainerApi#createContainer() */ @DELETE @Consumes( MediaType.APPLICATION_JSON ) diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java similarity index 96% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java index ded7e36942..726205e254 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataApi.java @@ -27,12 +27,12 @@ import org.jclouds.snia.cdmi.v1.options.CreateDataObjectOptions; /** * Data Object Resource Operations * - * @see DataAsyncClient + * @see DataAsyncApi * @author Kenneth Nagin * @see api doc */ @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) -public interface DataClient { +public interface DataApi { DataObject createDataObject(String containerName, String dataObjectName, CreateDataObjectOptions... options); diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataAsyncClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataAsyncApi.java similarity index 94% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataAsyncClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataAsyncApi.java index 902bd95145..af20549bf2 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataAsyncClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DataAsyncApi.java @@ -44,16 +44,16 @@ import com.google.common.util.concurrent.ListenableFuture; /** * Data Object Resource Operations * - * @see DataClient + * @see DataApi * @author Kenneth Nagin * @see api doc */ @SkipEncoding({ '/', '=' }) @RequestFilters({ BasicAuthenticationAndTenantId.class, StripExtraAcceptHeader.class }) -public interface DataAsyncClient { +public interface DataAsyncApi { /** - * @see DataClient#getDataObject() + * @see DataApi#getDataObject() */ @Headers(keys = "X-CDMI-Specification-Version", values = "{jclouds.api-version}") @GET @@ -65,7 +65,7 @@ public interface DataAsyncClient { @PathParam("dataObjectName") String dataObjectName); /** - * @see DataClient#createDataObject + * @see DataApi#createDataObject */ @Headers(keys = "X-CDMI-Specification-Version", values = "{jclouds.api-version}") @PUT @@ -79,7 +79,7 @@ public interface DataAsyncClient { CreateDataObjectOptions... options); /** - * @see DataClient#createDataObjectNonCDMI + * @see DataApi#createDataObjectNonCDMI */ @PUT @Consumes({ "text/plain" }) @@ -92,7 +92,7 @@ public interface DataAsyncClient { CreateDataObjectNonCDMIOptions... options); /** - * @see DataClient#deleteDataObject() + * @see DataApi#deleteDataObject() */ @Headers(keys = "X-CDMI-Specification-Version", values = "{jclouds.api-version}") @DELETE diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainApi.java similarity index 95% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainApi.java index c0488895bc..e224e0f7ea 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainApi.java @@ -25,12 +25,12 @@ import org.jclouds.concurrent.Timeout; /** * Domain Object Resource Operations * - * @see DomainAsyncClient + * @see DomainAsyncApi * @author Adrian Cole * @see api doc */ @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) -public interface DomainClient { +public interface DomainApi { } diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainAsyncClient.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainAsyncApi.java similarity index 96% rename from labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainAsyncClient.java rename to labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainAsyncApi.java index db00154a4a..257a93c06d 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainAsyncClient.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/features/DomainAsyncApi.java @@ -27,14 +27,14 @@ import org.jclouds.snia.cdmi.v1.filters.StripExtraAcceptHeader; /** * Domain Object Resource Operations * - * @see DomainClient + * @see DomainApi * @author Adrian Cole * @see api doc */ @SkipEncoding( { '/', '=' }) @RequestFilters( { BasicAuthenticationAndTenantId.class, StripExtraAcceptHeader.class }) @Headers(keys="X-CDMI-Specification-Version", values = "{jclouds.api-version}") -public interface DomainAsyncClient { +public interface DomainAsyncApi { } diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/BasicAuthenticationAndTenantId.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/BasicAuthenticationAndTenantId.java index d23cbfa048..e94b94dfcf 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/BasicAuthenticationAndTenantId.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/BasicAuthenticationAndTenantId.java @@ -58,4 +58,4 @@ public class BasicAuthenticationAndTenantId implements HttpRequestFilter { public HttpRequest filter(HttpRequest request) throws HttpException { return basicAuthentication.filter(request.toBuilder().replaceHeader("TID", tenantId).build()); } -} \ No newline at end of file +} diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/StripExtraAcceptHeader.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/StripExtraAcceptHeader.java index 3c70052fe4..332ff0f4ff 100644 --- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/StripExtraAcceptHeader.java +++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/filters/StripExtraAcceptHeader.java @@ -39,4 +39,4 @@ public class StripExtraAcceptHeader implements HttpRequestFilter { public HttpRequest filter(HttpRequest request) throws HttpException { return request.toBuilder().replaceHeader("Accept", request.getFirstHeaderOrNull("Accept")).build(); } -} \ No newline at end of file +} diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerClientExpectTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiExpectTest.java similarity index 82% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerClientExpectTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiExpectTest.java index ec1417fccf..60df8035aa 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerClientExpectTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiExpectTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.assertEquals; import org.jclouds.crypto.CryptoStreams; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.snia.cdmi.v1.CDMIClient; -import org.jclouds.snia.cdmi.v1.internal.BaseCDMIClientExpectTest; +import org.jclouds.snia.cdmi.v1.CDMIApi; +import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiExpectTest; import org.jclouds.snia.cdmi.v1.parse.ParseContainerTest; import org.testng.annotations.Test; @@ -34,8 +34,8 @@ import com.google.common.collect.ImmutableMultimap; * * @author Adrian Cole */ -@Test(groups = "unit", testName = "ContainerAsyncClientTest") -public class ContainerClientExpectTest extends BaseCDMIClientExpectTest { +@Test(groups = "unit", testName = "ContainerAsyncApiTest") +public class ContainerApiExpectTest extends BaseCDMIApiExpectTest { public void testGetContainerWhenResponseIs2xx() throws Exception { @@ -55,10 +55,10 @@ public class ContainerClientExpectTest extends BaseCDMIClientExpectTest { .payload(payloadFromResource("/container.json")) .build(); - CDMIClient clientWhenContainersExist = requestSendsResponse(getContainer, getContainerResponse); + CDMIApi apiWhenContainersExist = requestSendsResponse(getContainer, getContainerResponse); assertEquals( - clientWhenContainersExist.getContainerClient().getContainer("MyContainer"), + apiWhenContainersExist.getContainerApi().getContainer("MyContainer"), new ParseContainerTest().expected()); } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerClientLiveTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiLiveTest.java similarity index 89% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerClientLiveTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiLiveTest.java index 43874feccb..a6d51284b4 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerClientLiveTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/ContainerApiLiveTest.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; import org.jclouds.domain.JsonBall; import org.jclouds.snia.cdmi.v1.ObjectTypes; import org.jclouds.snia.cdmi.v1.domain.Container; -import org.jclouds.snia.cdmi.v1.internal.BaseCDMIClientLiveTest; +import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiLiveTest; import org.jclouds.snia.cdmi.v1.options.CreateContainerOptions; import org.testng.annotations.Test; @@ -39,8 +39,8 @@ import org.testng.annotations.Test; * @author Kenneth Nagin */ -@Test(groups = "live", testName = "ContainerClientLiveTest") -public class ContainerClientLiveTest extends BaseCDMIClientLiveTest { +@Test(groups = "live", testName = "ContainerApiLiveTest") +public class ContainerApiLiveTest extends BaseCDMIApiLiveTest { @Test public void testCreateContainer() throws Exception { @@ -52,14 +52,14 @@ public class ContainerClientLiveTest extends BaseCDMIClientLiveTest { pContainerMetaDataIn.put("containerkey3", "value3"); CreateContainerOptions pCreateContainerOptions = CreateContainerOptions.Builder .withMetadata(pContainerMetaDataIn); - ContainerClient client = cdmiContext.getApi().getContainerClient(); + ContainerApi api = cdmiContext.getApi().getContainerApi(); Logger.getAnonymousLogger().info("createContainer: " + pContainerName); - Container container = client.createContainer(pContainerName, + Container container = api.createContainer(pContainerName, pCreateContainerOptions); assertNotNull(container); System.out.println(container); Logger.getAnonymousLogger().info("getContainer: " + pContainerName); - container = client.getContainer(pContainerName); + container = api.getContainer(pContainerName); assertNotNull(container); System.out.println(container); assertEquals(container.getObjectType(), ObjectTypes.CONTAINER); @@ -96,13 +96,13 @@ public class ContainerClientLiveTest extends BaseCDMIClientLiveTest { for (Map aclMap : aclMetadataOut) { System.out.println(aclMap); } - container = client.getContainer("/"); + container = api.getContainer("/"); System.out.println("root container: " + container); assertEquals(container.getChildren().contains(pContainerName + "/"), true); Logger.getAnonymousLogger().info("deleteContainer: " + pContainerName); - client.deleteContainer(pContainerName); - container = client.getContainer("/"); + api.deleteContainer(pContainerName); + container = api.getContainer("/"); System.out.println("root container: " + container); assertEquals(container.getChildren().contains(pContainerName + "/"), false); diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataClientExpectTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiExpectTest.java similarity index 82% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataClientExpectTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiExpectTest.java index 8ca2a21af2..8d522b2dce 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataClientExpectTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiExpectTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.snia.cdmi.v1.features; -import org.jclouds.snia.cdmi.v1.internal.BaseCDMIClientExpectTest; +import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiExpectTest; import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "DataAsyncClientTest") -public class DataClientExpectTest extends BaseCDMIClientExpectTest { +@Test(groups = "unit", testName = "DataAsyncApiTest") +public class DataApiExpectTest extends BaseCDMIApiExpectTest { } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataClientLiveTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiLiveTest.java similarity index 80% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataClientLiveTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiLiveTest.java index f6f3235988..7a0c295f5d 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataClientLiveTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataApiLiveTest.java @@ -35,7 +35,7 @@ import java.util.logging.Logger; import org.jclouds.snia.cdmi.v1.domain.Container; import org.jclouds.snia.cdmi.v1.domain.DataObject; -import org.jclouds.snia.cdmi.v1.internal.BaseCDMIClientLiveTest; +import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiLiveTest; import org.jclouds.snia.cdmi.v1.options.CreateContainerOptions; import org.jclouds.snia.cdmi.v1.options.CreateDataObjectNonCDMIOptions; import org.jclouds.snia.cdmi.v1.options.CreateDataObjectOptions; @@ -48,8 +48,8 @@ import com.google.common.io.Files; /** * @author Kenneth Nagin */ -@Test(groups = "live", testName = "DataClientLiveTest") -public class DataClientLiveTest extends BaseCDMIClientLiveTest { +@Test(groups = "live", testName = "DataApiLiveTest") +public class DataApiLiveTest extends BaseCDMIApiLiveTest { @Test public void testCreateDataObjects() throws Exception { @@ -72,16 +72,16 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { CreateContainerOptions pCreateContainerOptions = CreateContainerOptions.Builder .withMetadata(pContainerMetaDataIn); - ContainerClient containerClient = cdmiContext.getApi() - .getContainerClient(); - DataClient dataClient = cdmiContext.getApi().getDataClient(); + ContainerApi containerApi = cdmiContext.getApi() + .getContainerApi(); + DataApi dataApi = cdmiContext.getApi().getDataApi(); Logger.getAnonymousLogger().info("createContainer: " + containerName); - Container container = containerClient.createContainer(containerName, + Container container = containerApi.createContainer(containerName, pCreateContainerOptions); try { assertNotNull(container); System.out.println(container); - container = containerClient.getContainer(containerName); + container = containerApi.getContainer(containerName); assertNotNull(container); assertNotNull(container.getChildren()); assertEquals(container.getChildren().isEmpty(), true); @@ -90,10 +90,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { value = "Hello CDMI World1"; CreateDataObjectNonCDMIOptions pCreateDataObjectNoneCDMIOptions = CreateDataObjectNonCDMIOptions.Builder .withStringPayload(value); - dataClient.createDataObjectNonCDMI(containerName, dataObjectNameIn, + dataApi.createDataObjectNonCDMI(containerName, dataObjectNameIn, pCreateDataObjectNoneCDMIOptions); - System.out.println(containerClient.getContainer(containerName)); - dataObject = dataClient.getDataObject(containerName, + System.out.println(containerApi.getContainer(containerName)); + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -106,10 +106,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with value mimetype and metadata @@ -117,10 +117,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(value).mimetype("text/plain") .metadata(pDataObjectMetaDataIn); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -142,10 +142,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // verify that options order does not matter @@ -153,10 +153,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { pCreateDataObjectOptions = CreateDataObjectOptions.Builder .metadata(pDataObjectMetaDataIn).mimetype("text/plain") .value(value); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -178,10 +178,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with empty metadata @@ -190,10 +190,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(value).mimetype("text/plain") .metadata(pDataObjectMetaDataIn); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -209,20 +209,20 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with null metadata value = "Hello CDMI World5"; pCreateDataObjectOptions = CreateDataObjectOptions.Builder.value( value).mimetype("text/plain"); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -238,20 +238,20 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with only value value = "Hello CDMI World6"; pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(value); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -266,20 +266,20 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with empty mimetype only value = ""; pCreateDataObjectOptions = CreateDataObjectOptions.Builder .mimetype(new String()); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -290,15 +290,15 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertNotNull(dataObjectMetaDataOut); assertEquals(true, dataObjectMetaDataOut.isEmpty()); - dataClient.deleteDataObject(containerName, dataObjectNameIn); + dataApi.deleteDataObject(containerName, dataObjectNameIn); // exercise create data object with no value value = ""; pCreateDataObjectOptions = CreateDataObjectOptions.Builder.value(); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -313,10 +313,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with byte array @@ -328,10 +328,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { byte[] bytes = bos.toByteArray(); pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(bytes); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -344,10 +344,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with an existing file @@ -356,10 +356,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(true, inFile.isFile()); pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(inFile); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -374,10 +374,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with a temporary file that we create @@ -387,10 +387,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { Files.write(value, tmpFileIn, Charsets.UTF_8); pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(tmpFileIn); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -405,10 +405,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with a temporary file that we create @@ -417,10 +417,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { Files.write(value, tmpFileIn, Charsets.UTF_8); pCreateDataObjectOptions = CreateDataObjectOptions.Builder.value( tmpFileIn, Charsets.UTF_8); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -435,10 +435,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with a temporary file that we create @@ -447,10 +447,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { Files.write(value, tmpFileIn, Charsets.US_ASCII); pCreateDataObjectOptions = CreateDataObjectOptions.Builder.value( tmpFileIn, Charsets.US_ASCII); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -465,10 +465,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with a temporary file with multiple @@ -479,10 +479,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { Files.append("\nline3", tmpFileIn, Charsets.UTF_8); pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(tmpFileIn); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -498,10 +498,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with a temporary file with multiple @@ -512,10 +512,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { Files.append("\nline3", tmpFileIn, Charsets.UTF_8); pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(new FileInputStream(tmpFileIn)); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -531,10 +531,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with a temporary file with multiple @@ -545,10 +545,10 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { Files.append("\nline3", tmpFileIn, Charsets.ISO_8859_1); pCreateDataObjectOptions = CreateDataObjectOptions.Builder.value( new FileInputStream(tmpFileIn), Charsets.ISO_8859_1); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -564,20 +564,20 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); // exercise create data object with an inputstream is = new ByteArrayInputStream(value.getBytes()); pCreateDataObjectOptions = CreateDataObjectOptions.Builder .value(is); - dataObject = dataClient.createDataObject(containerName, + dataObject = dataApi.createDataObject(containerName, dataObjectNameIn, pCreateDataObjectOptions); assertNotNull(dataObject); - dataObject = dataClient.getDataObject(containerName, + dataObject = dataApi.getDataObject(containerName, dataObjectNameIn); assertNotNull(dataObject); System.out.println(dataObject); @@ -592,15 +592,15 @@ public class DataClientLiveTest extends BaseCDMIClientLiveTest { assertEquals(dataObject.getObjectName(), dataObjectNameIn); assertEquals(dataObject.getObjectType(), "application/cdmi-object"); assertEquals(dataObject.getParentURI(), "/" + containerName + "/"); - assertEquals(containerClient.getContainer(containerName) + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), true); - dataClient.deleteDataObject(containerName, dataObjectNameIn); - assertEquals(containerClient.getContainer(containerName) + dataApi.deleteDataObject(containerName, dataObjectNameIn); + assertEquals(containerApi.getContainer(containerName) .getChildren().contains(dataObjectNameIn), false); } finally { tmpFileIn.delete(); - containerClient.deleteContainer(containerName); + containerApi.deleteContainer(containerName); } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainClientExpectTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainApiExpectTest.java similarity index 82% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainClientExpectTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainApiExpectTest.java index 368f99fb06..39891a0aaf 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainClientExpectTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainApiExpectTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.snia.cdmi.v1.features; -import org.jclouds.snia.cdmi.v1.internal.BaseCDMIClientExpectTest; +import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiExpectTest; import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "unit", testName = "DomainClientExpectTest") -public class DomainClientExpectTest extends BaseCDMIClientExpectTest { +@Test(groups = "unit", testName = "DomainApiExpectTest") +public class DomainApiExpectTest extends BaseCDMIApiExpectTest { } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainClientLiveTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainApiLiveTest.java similarity index 82% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainClientLiveTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainApiLiveTest.java index 6d21f4d66f..9fa884edd5 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainClientLiveTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DomainApiLiveTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.snia.cdmi.v1.features; -import org.jclouds.snia.cdmi.v1.internal.BaseCDMIClientLiveTest; +import org.jclouds.snia.cdmi.v1.internal.BaseCDMIApiLiveTest; import org.testng.annotations.Test; /** * @author Adrian Cole */ -@Test(groups = "live", testName = "ContainerClientLiveTest") -public class DomainClientLiveTest extends BaseCDMIClientLiveTest { +@Test(groups = "live", testName = "ContainerApiLiveTest") +public class DomainApiLiveTest extends BaseCDMIApiLiveTest { } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIClientExpectTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIApiExpectTest.java similarity index 82% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIClientExpectTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIApiExpectTest.java index 2e6871e9dc..76ea968b82 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIClientExpectTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIApiExpectTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.snia.cdmi.v1.internal; -import org.jclouds.snia.cdmi.v1.CDMIClient; +import org.jclouds.snia.cdmi.v1.CDMIApi; /** - * Base class for writing KeyStone Rest Client Expect tests + * Base class for writing KeyStone Rest Api Expect tests * * @author Adrian Cole */ -public class BaseCDMIClientExpectTest extends BaseCDMIExpectTest { +public class BaseCDMIApiExpectTest extends BaseCDMIExpectTest { } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIClientLiveTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIApiLiveTest.java similarity index 78% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIClientLiveTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIApiLiveTest.java index 0958b6e73b..c7afe80d70 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIClientLiveTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIApiLiveTest.java @@ -21,8 +21,8 @@ package org.jclouds.snia.cdmi.v1.internal; import org.jclouds.apis.BaseContextLiveTest; import org.jclouds.rest.RestContext; import org.jclouds.snia.cdmi.v1.CDMIApiMetadata; -import org.jclouds.snia.cdmi.v1.CDMIAsyncClient; -import org.jclouds.snia.cdmi.v1.CDMIClient; +import org.jclouds.snia.cdmi.v1.CDMIAsyncApi; +import org.jclouds.snia.cdmi.v1.CDMIApi; import org.testng.annotations.AfterGroups; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; @@ -30,18 +30,18 @@ import org.testng.annotations.Test; import com.google.common.reflect.TypeToken; /** - * Tests behavior of {@code CDMIClient} + * Tests behavior of {@code CDMIApi} * * @author Adrian Cole */ @Test(groups = "live") -public class BaseCDMIClientLiveTest extends BaseContextLiveTest> { +public class BaseCDMIApiLiveTest extends BaseContextLiveTest> { - public BaseCDMIClientLiveTest() { + public BaseCDMIApiLiveTest() { provider = "cdmi"; } - protected RestContext cdmiContext; + protected RestContext cdmiContext; @BeforeGroups(groups = { "integration", "live" }) @Override @@ -57,7 +57,7 @@ public class BaseCDMIClientLiveTest extends BaseContextLiveTest> contextType() { + protected TypeToken> contextType() { return CDMIApiMetadata.CONTEXT_TOKEN; } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIAsyncClientExpectTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIAsyncApiExpectTest.java similarity index 77% rename from labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIAsyncClientExpectTest.java rename to labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIAsyncApiExpectTest.java index 46ca56bc76..25f4c2a9a7 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIAsyncClientExpectTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIAsyncApiExpectTest.java @@ -22,18 +22,18 @@ import java.util.Properties; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.snia.cdmi.v1.CDMIAsyncClient; +import org.jclouds.snia.cdmi.v1.CDMIAsyncApi; import com.google.common.base.Function; import com.google.inject.Module; /** - * Base class for writing KeyStone Rest Client Expect tests + * Base class for writing KeyStone Rest Api Expect tests * * @author Adrian Cole */ -public class BaseCDMIAsyncClientExpectTest extends BaseCDMIExpectTest { - public CDMIAsyncClient createClient(Function fn, Module module, Properties props) { - return createInjector(fn, module, props).getInstance(CDMIAsyncClient.class); +public class BaseCDMIAsyncApiExpectTest extends BaseCDMIExpectTest { + public CDMIAsyncApi createClient(Function fn, Module module, Properties props) { + return createInjector(fn, module, props).getInstance(CDMIAsyncApi.class); } } diff --git a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIExpectTest.java b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIExpectTest.java index 84457451ec..3c7d876704 100644 --- a/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIExpectTest.java +++ b/labs/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/internal/BaseCDMIExpectTest.java @@ -18,14 +18,14 @@ */ package org.jclouds.snia.cdmi.v1.internal; -import org.jclouds.rest.internal.BaseRestClientExpectTest; +import org.jclouds.rest.internal.BaseRestApiExpectTest; /** * Base class for writing CDMI Expect tests * * @author Adrian Cole */ -public class BaseCDMIExpectTest extends BaseRestClientExpectTest { +public class BaseCDMIExpectTest extends BaseRestApiExpectTest { public BaseCDMIExpectTest() { provider = "cdmi";