You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/08/22 20:07:05 UTC
[2/2] git commit: Swift API region cleanup
Swift API region cleanup
Conflicts:
openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/23a293ec
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/23a293ec
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/23a293ec
Branch: refs/heads/master
Commit: 23a293ec59abc8fa9cd80c1ca253469525f5572d
Parents: d65048d
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Tue Aug 12 09:53:50 2014 -0700
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Fri Aug 22 11:06:48 2014 -0700
----------------------------------------------------------------------
.../openstack/swift/v1/CopyObjectException.java | 5 +-
.../jclouds/openstack/swift/v1/SwiftApi.java | 24 ++--
.../openstack/swift/v1/SwiftApiMetadata.java | 6 +-
.../blobstore/RegionScopedBlobStoreContext.java | 52 +--------
.../blobstore/RegionScopedSwiftBlobStore.java | 32 +++---
.../RegionScopedTemporaryUrlBlobSigner.java | 2 +-
.../openstack/swift/v1/features/AccountApi.java | 22 ++--
.../openstack/swift/v1/features/BulkApi.java | 9 +-
.../swift/v1/features/ContainerApi.java | 84 ++++----------
.../openstack/swift/v1/features/ObjectApi.java | 111 ++++++-------------
.../swift/v1/features/StaticLargeObjectApi.java | 9 +-
.../swift/v1/AuthenticationMockTest.java | 2 +-
.../swift/v1/TemporaryUrlSignerLiveTest.java | 14 +--
.../swift/v1/TemporaryUrlSignerMockTest.java | 4 +-
.../RegionScopedBlobStoreContextLiveTest.java | 8 +-
.../swift/v1/features/AccountApiLiveTest.java | 12 +-
.../swift/v1/features/AccountApiMockTest.java | 20 ++--
.../swift/v1/features/BulkApiLiveTest.java | 16 +--
.../swift/v1/features/BulkApiMockTest.java | 2 +-
.../swift/v1/features/ContainerApiLiveTest.java | 36 +++---
.../swift/v1/features/ContainerApiMockTest.java | 46 ++++----
.../features/CreatePublicContainerLiveTest.java | 6 +-
.../swift/v1/features/ObjectApiLiveTest.java | 46 ++++----
.../swift/v1/features/ObjectApiMockTest.java | 38 +++----
.../features/StaticLargeObjectApiLiveTest.java | 20 ++--
.../features/StaticLargeObjectApiMockTest.java | 8 +-
.../swift/v1/internal/BaseSwiftApiLiveTest.java | 2 +-
.../rackspace/cloudfiles/v1/CloudFilesApi.java | 12 --
.../features/CloudFilesAccountApiLiveTest.java | 4 +-
.../v1/features/CloudFilesCDNApiLiveTest.java | 56 +++++-----
30 files changed, 279 insertions(+), 429 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
index 9a1925a..a7fd09d 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
@@ -20,10 +20,11 @@ import org.jclouds.rest.ResourceNotFoundException;
/**
* Thrown when an object cannot be copied.
- *
- *
+ *
+ *
* @see {@link SwiftErrorHandler#handleError(HttpCommand, HttpResponse)}
*/
+@SuppressWarnings("serial")
public class CopyObjectException extends ResourceNotFoundException {
private String sourcePath;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
index 857978a..d5b4ba3 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
@@ -40,7 +40,7 @@ import com.google.inject.Provides;
* <p/>
* OpenStack Object Storage is an object-based storage system that stores content and metadata
* as objects. You create, modify, and get objects and metadata using this API.
- * <p/>8
+ * <p/>
*/
@Beta
public interface SwiftApi extends Closeable {
@@ -60,47 +60,53 @@ public interface SwiftApi extends Closeable {
@Delegate
@Path("/{containerName}")
- ObjectApi getObjectApiForContainer(@EndpointParam(parser = RegionToEndpoint.class) String region,
+ ObjectApi getObjectApi(@EndpointParam(parser = RegionToEndpoint.class) String region,
@PathParam("containerName") String containerName);
@Delegate
@Path("/{containerName}")
- StaticLargeObjectApi getStaticLargeObjectApiForContainer(
- @EndpointParam(parser = RegionToEndpoint.class) String region,
+ StaticLargeObjectApi getStaticLargeObjectApi(@EndpointParam(parser = RegionToEndpoint.class) String region,
@PathParam("containerName") String containerName);
/**
- * @deprecated Please use {@link #getAccountApi(String)} as this method will be removed in jclouds 2.0.
+ * @deprecated Please use {@link #getAccountApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
AccountApi getAccountApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
- * @deprecated Please use {@link #getBulkApi(String)} as this method will be removed in jclouds 2.0.
+ * @deprecated Please use {@link #getBulkApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
BulkApi getBulkApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
- * @deprecated Please use {@link #getContainerApi(String)} as this method will be removed in jclouds 2.0.
+ * @deprecated Please use {@link #getContainerApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
ContainerApi getContainerApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
- * @deprecated Please use {@link #getObjectApiForContainer(String)} as this method will be removed in jclouds 2.0.
+ * @deprecated Please use {@link #getObjectApi(String, String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/{containerName}")
ObjectApi getObjectApiForRegionAndContainer(@EndpointParam(parser = RegionToEndpoint.class) String region,
@PathParam("containerName") String containerName);
/**
- * @deprecated Please use {@link #getStaticLargeObjectApiForContainer(String)} as this method will be removed in jclouds 2.0.
+ * @deprecated Please use {@link #getStaticLargeObjectApi(String, String)} as this method
+ * will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
@Path("/{containerName}")
StaticLargeObjectApi getStaticLargeObjectApiForRegionAndContainer(
@EndpointParam(parser = RegionToEndpoint.class) String region,
@PathParam("containerName") String containerName);
+
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
index 9f110f4..8d77bb0 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
@@ -42,7 +42,7 @@ import com.google.inject.Module;
* Implementation of {@link ApiMetadata} for the Swift API.
*/
public class SwiftApiMetadata extends BaseHttpApiMetadata<SwiftApi> {
-
+
@Override
public Builder toBuilder() {
return new Builder().fromApiMetadata(this);
@@ -67,7 +67,7 @@ public class SwiftApiMetadata extends BaseHttpApiMetadata<SwiftApi> {
protected Builder() {
id("openstack-swift")
- .name("OpenStack Swift Grizzly+ API")
+ .name("OpenStack Swift API")
.identityName("${tenantName}:${userName} or ${userName}, if your keystone supports a default tenant")
.credentialName("${password}")
.documentation(URI.create("http://docs.openstack.org/api/openstack-object-storage/1.0/content/ch_object-storage-dev-overview.html"))
@@ -85,7 +85,7 @@ public class SwiftApiMetadata extends BaseHttpApiMetadata<SwiftApi> {
.add(SwiftBlobStoreContextModule.class)
.add(SignUsingTemporaryUrls.class).build());
}
-
+
@Override
public SwiftApiMetadata build() {
return new SwiftApiMetadata(this);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
index e6df22f..4dc91b2 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
@@ -62,16 +62,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
/**
* @return regions supported in this context.
- *
- * @deprecated Please use {{@link #getConfiguredRegions()} as this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public Set<String> configuredRegions() {
- return getConfiguredRegions();
- }
-
- /**
- * @return regions supported in this context.
*/
public Set<String> getConfiguredRegions() {
return regionIds.get();
@@ -82,19 +72,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
* valid region id from {@link #getConfiguredRegions()}
* @throws IllegalArgumentException
* if {@code regionId} was invalid.
- *
- * @deprecated Please use {{@link #getBlobStore(String)} as this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public BlobStore blobStoreInRegion(String regionId) {
- return getBlobStore(regionId);
- }
-
- /**
- * @param regionId
- * valid region id from {@link #getConfiguredRegions()}
- * @throws IllegalArgumentException
- * if {@code regionId} was invalid.
*/
public BlobStore getBlobStore(String regionId) {
checkRegionId(regionId);
@@ -106,19 +83,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
* valid region id from {@link #getConfiguredRegions()}
* @throws IllegalArgumentException
* if {@code regionId} was invalid.
- *
- * @deprecated Please use {{@link #getSigner(String)} as this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public BlobRequestSigner signerInRegion(String regionId) {
- return getSigner(regionId);
- }
-
- /**
- * @param regionId
- * valid region id from {@link #getConfiguredRegions()}
- * @throws IllegalArgumentException
- * if {@code regionId} was invalid.
*/
public BlobRequestSigner getSigner(String regionId) {
checkRegionId(regionId);
@@ -129,20 +93,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
* @param regionId
* valid region id from {@link #getConfiguredRegions()}
* @throws IllegalArgumentException
- * if {@code regionId} was invalid.
- *
- * @deprecated {@link AsyncBlobStore} is no longer supported. Please use {@link BlobStore} as
- * this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public AsyncBlobStore asyncBlobStoreInRegion(String regionId) {
- return getAsyncBlobStore(regionId);
- }
-
- /**
- * @param regionId
- * valid region id from {@link #getConfiguredRegions()}
- * @throws IllegalArgumentException
* if {@code regionId} was invalid. longer supported. Please use {@link BlobStore}.
*
* @deprecated {@link AsyncBlobStore} is no longer supported. Please use {@link BlobStore} as
@@ -151,7 +101,7 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
@Deprecated
public AsyncBlobStore getAsyncBlobStore(String regionId) {
checkRegionId(regionId);
- return new SubmissionAsyncBlobStore(blobStoreInRegion(regionId), executor);
+ return new SubmissionAsyncBlobStore(getBlobStore(regionId), executor);
}
protected void checkRegionId(String regionId) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
index 4ba6a1e..c0f65c5 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStore.java
@@ -113,14 +113,14 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public PageSet<? extends StorageMetadata> list() {
// TODO: there may eventually be >10k containers..
- FluentIterable<StorageMetadata> containers = api.getContainerApiForRegion(regionId).list()
+ FluentIterable<StorageMetadata> containers = api.getContainerApi(regionId).list()
.transform(toResourceMetadata);
return new PageSetImpl<StorageMetadata>(containers, null);
}
@Override
public boolean containerExists(String container) {
- Container val = api.getContainerApiForRegion(regionId).get(container);
+ Container val = api.getContainerApi(regionId).get(container);
containerCache.put(container, Optional.fromNullable(val));
return val != null;
}
@@ -134,9 +134,9 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
public boolean createContainerInLocation(Location location, String container, CreateContainerOptions options) {
checkArgument(location == null || location.equals(region), "location must be null or %s", region);
if (options.isPublicRead()) {
- return api.getContainerApiForRegion(regionId).create(container, ANYBODY_READ);
+ return api.getContainerApi(regionId).create(container, ANYBODY_READ);
}
- return api.getContainerApiForRegion(regionId).create(container, BASIC_CONTAINER);
+ return api.getContainerApi(regionId).create(container, BASIC_CONTAINER);
}
private static final org.jclouds.openstack.swift.v1.options.CreateContainerOptions BASIC_CONTAINER = new org.jclouds.openstack.swift.v1.options.CreateContainerOptions();
@@ -150,7 +150,7 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public PageSet<? extends StorageMetadata> list(final String container, ListContainerOptions options) {
- ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, container);
+ ObjectApi objectApi = api.getObjectApi(regionId, container);
ObjectList objects = objectApi.list(toListContainerOptions.apply(options));
if (objects == null) {
containerCache.put(container, Optional.<Container> absent());
@@ -191,13 +191,13 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
if (options.isMultipart()) {
throw new UnsupportedOperationException();
}
- ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, container);
+ ObjectApi objectApi = api.getObjectApi(regionId, container);
return objectApi.put(blob.getMetadata().getName(), blob.getPayload(), metadata(blob.getMetadata().getUserMetadata()));
}
@Override
public BlobMetadata blobMetadata(String container, String name) {
- SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, container).get(name);
+ SwiftObject object = api.getObjectApi(regionId, container).get(name);
if (object == null) {
return null;
}
@@ -211,7 +211,7 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public Blob getBlob(String container, String name, GetOptions options) {
- ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, container);
+ ObjectApi objectApi = api.getObjectApi(regionId, container);
SwiftObject object = objectApi.get(name, toGetOptions.apply(options));
if (object == null) {
return null;
@@ -224,7 +224,7 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public void removeBlob(String container, String name) {
- api.getObjectApiForRegionAndContainer(regionId, container).delete(name);
+ api.getObjectApi(regionId, container).delete(name);
}
@Override
@@ -239,13 +239,13 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public boolean directoryExists(String containerName, String directory) {
- return api.getObjectApiForRegionAndContainer(regionId, containerName)
+ return api.getObjectApi(regionId, containerName)
.get(directory) != null;
}
@Override
public void createDirectory(String containerName, String directory) {
- api.getObjectApiForRegionAndContainer(regionId, containerName)
+ api.getObjectApi(regionId, containerName)
.put(directory, directoryPayload);
}
@@ -257,12 +257,12 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public void deleteDirectory(String containerName, String directory) {
- api.getObjectApiForRegionAndContainer(regionId, containerName).delete(directory);
+ api.getObjectApi(regionId, containerName).delete(directory);
}
@Override
public long countBlobs(String containerName) {
- Container container = api.getContainerApiForRegion(regionId).get(containerName);
+ Container container = api.getContainerApi(regionId).get(containerName);
// undefined if container doesn't exist, so default to zero
return container != null ? container.getObjectCount() : 0;
}
@@ -281,13 +281,13 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
@Override
public void deleteContainer(String container) {
clearContainer(container, recursive());
- api.getContainerApiForRegion(regionId).deleteIfEmpty(container);
+ api.getContainerApi(regionId).deleteIfEmpty(container);
containerCache.invalidate(container);
}
@Override
public boolean deleteContainerIfEmpty(String container) {
- boolean deleted = api.getContainerApiForRegion(regionId).deleteIfEmpty(container);
+ boolean deleted = api.getContainerApi(regionId).deleteIfEmpty(container);
if (deleted) {
containerCache.invalidate(container);
}
@@ -297,7 +297,7 @@ public class RegionScopedSwiftBlobStore implements BlobStore {
protected final LoadingCache<String, Optional<Container>> containerCache = CacheBuilder.newBuilder().build(
new CacheLoader<String, Optional<Container>>() {
public Optional<Container> load(String container) {
- return Optional.fromNullable(api.getContainerApiForRegion(regionId).get(container));
+ return Optional.fromNullable(api.getContainerApi(regionId).get(container));
}
});
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java
index 41ae522..5134efa 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedTemporaryUrlBlobSigner.java
@@ -53,7 +53,7 @@ public class RegionScopedTemporaryUrlBlobSigner implements BlobRequestSigner {
@Assisted String regionId) {
checkNotNull(regionId, "regionId");
this.timestamp = timestamp;
- this.signer = TemporaryUrlSigner.checkApiEvery(api.getAccountApiForRegion(regionId), seconds);
+ this.signer = TemporaryUrlSigner.checkApiEvery(api.getAccountApi(regionId), seconds);
this.storageUrl = regionToUris.get().get(regionId).get();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
index 21582a1..c9d5b9d 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
@@ -26,7 +26,6 @@ import javax.ws.rs.Consumes;
import javax.ws.rs.HEAD;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
-import javax.ws.rs.Path;
import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
@@ -43,7 +42,7 @@ import com.google.common.annotations.Beta;
/**
* Provides access to the OpenStack Object Storage (Swift) Account API features.
- *
+ *
* <p/>
* Account metadata prefixed with {@code X-Account-Meta-} will be converted
* appropriately using a binder/parser.
@@ -51,8 +50,8 @@ import com.google.common.annotations.Beta;
* This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based
* on that feedback, minor changes to the interfaces may happen. This code will replace
* org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
- *
- *
+ *
+ *
* @see {@link Account}
*/
@Beta
@@ -62,27 +61,25 @@ public interface AccountApi {
/**
* Gets the {@link Account}.
- *
+ *
* @return The {@link Account} object.
*/
@Named("account:get")
@HEAD
@ResponseParser(ParseAccountFromHeaders.class)
- @Path("/")
Account get();
/**
* Creates or updates the {@link Account} metadata.
- *
+ *
* @param metadata the metadata to create or update.
- *
+ *
* @return {@code true} if the metadata was successfully created or updated,
* {@code false} if not.
*/
@Named("account:updateMetadata")
@POST
@Fallback(FalseOnNotFoundOr404.class)
- @Path("/")
boolean updateMetadata(@BinderParam(BindAccountMetadataToHeaders.class) Map<String, String> metadata);
/**
@@ -96,20 +93,19 @@ public interface AccountApi {
@Named("account:updateTemporaryUrlKey")
@POST
@Fallback(FalseOnNotFoundOr404.class)
- @Path("/")
boolean updateTemporaryUrlKey(@HeaderParam(ACCOUNT_TEMPORARY_URL_KEY) String temporaryUrlKey);
/**
* Deletes metadata from the {@link Account}.
- *
+ *
* @param metadata the metadata to delete.
- *
+ *
* @return {@code true} if the metadata was successfully deleted,
* {@code false} if not.
*/
@Named("account:deleteMetadata")
@POST
@Fallback(FalseOnNotFoundOr404.class)
- @Path("/")
boolean deleteMetadata(@BinderParam(BindRemoveAccountMetadataToHeaders.class) Map<String, String> metadata);
+
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
index 002ca3b..b62322f 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
@@ -58,14 +58,14 @@ public interface BulkApi {
/**
* Extracts a tar archive at the path specified as {@code path}.
- *
+ *
* @param path
* the path to extract under.
* @param payload
* the {@link Payload payload} archive.
* @param format
* one of {@code tar}, {@code tar.gz}, or {@code tar.bz2}
- *
+ *
* @return {@link BulkDeleteResponse#getErrors()} are empty on success.
*/
@Named("bulk:extractArchive")
@@ -76,16 +76,15 @@ public interface BulkApi {
/**
* Deletes multiple objects or containers, if present.
- *
+ *
* @param paths
* format of {@code container}, for an empty container, or
* {@code container/object} for an object.
- *
+ *
* @return {@link BulkDeleteResponse#getErrors()} are empty on success.
*/
@Named("bulk:delete")
@DELETE
- @Path("/")
@QueryParams(keys = "bulk-delete")
BulkDeleteResponse bulkDelete(@BinderParam(UrlEncodeAndJoinOnNewline.class) Iterable<String> paths);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
index eb33d7c..1eb7ddf 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
@@ -46,7 +46,6 @@ import org.jclouds.openstack.swift.v1.options.ListContainerOptions;
import org.jclouds.openstack.swift.v1.options.UpdateContainerOptions;
import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.ResponseParser;
@@ -67,39 +66,35 @@ public interface ContainerApi {
/**
* Lists up to 10,000 containers.
- *
+ *
* <h3>NOTE</h3>
* This method returns a list of {@link Container} objects <b>without</b> metadata. To retrieve
* the {@link Container} metadata, use the {@link #get(String)} method.
* <p/>
- *
+ *
* @return a list of {@link Container containers} ordered by name.
*/
@Named("container:list")
@GET
- @QueryParams(keys = "format", values = "json")
@Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- @Path("/")
FluentIterable<Container> list();
/**
* Lists containers with the supplied {@link ListContainerOptions}.
- *
+ *
* <h3>NOTE</h3>
* This method returns a list of {@link Container} objects <b>without</b> metadata. To retrieve
* the {@link Container} metadata, use the {@link #get(String)} method.
* <p/>
- *
+ *
* @param options
* the options to control the output list.
- *
+ *
* @return a list of {@link Container containers} ordered by name.
*/
@Named("container:list")
@GET
- @QueryParams(keys = "format", values = "json")
@Fallback(EmptyFluentIterableOnNotFoundOr404.class)
- @Path("/")
FluentIterable<Container> list(ListContainerOptions options);
/**
@@ -112,8 +107,8 @@ public interface ContainerApi {
*/
@Named("container:create")
@PUT
- @ResponseParser(FalseOnAccepted.class)
@Path("/{containerName}")
+ @ResponseParser(FalseOnAccepted.class)
boolean create(@PathParam("containerName") String containerName);
/**
@@ -128,23 +123,23 @@ public interface ContainerApi {
*/
@Named("container:create")
@PUT
- @ResponseParser(FalseOnAccepted.class)
@Path("/{containerName}")
+ @ResponseParser(FalseOnAccepted.class)
boolean create(@PathParam("containerName") String containerName, CreateContainerOptions options);
/**
* Gets the {@link Container}.
- *
+ *
* @param containerName
* corresponds to {@link Container#getName()}.
- *
+ *
* @return the {@link Container}, or {@code null} if not found.
*/
@Named("container:get")
@HEAD
+ @Path("/{containerName}")
@ResponseParser(ParseContainerFromHeaders.class)
@Fallback(NullOnNotFoundOr404.class)
- @Path("/{containerName}")
@Nullable
Container get(@PathParam("containerName") String containerName);
@@ -161,8 +156,8 @@ public interface ContainerApi {
*/
@Named("container:update")
@POST
- @Fallback(FalseOnNotFoundOr404.class)
@Path("/{containerName}")
+ @Fallback(FalseOnNotFoundOr404.class)
boolean update(@PathParam("containerName") String containerName, UpdateContainerOptions options);
/**
@@ -178,82 +173,43 @@ public interface ContainerApi {
*/
@Named("container:updateMetadata")
@POST
- @Fallback(FalseOnNotFoundOr404.class)
@Path("/{containerName}")
+ @Fallback(FalseOnNotFoundOr404.class)
boolean updateMetadata(@PathParam("containerName") String containerName,
@BinderParam(BindContainerMetadataToHeaders.class) Map<String, String> metadata);
/**
* Deletes {@link Container} metadata.
- *
+ *
* @param containerName
* corresponds to {@link Container#getName()}.
* @param metadata
* the container metadata to delete.
- *
- * @return {@code true} if the container metadata was successfully deleted,
+ *
+ * @return {@code true} if the container metadata was successfully deleted,
* {@code false} if not.
*/
@Named("container:deleteMetadata")
@POST
- @Fallback(FalseOnNotFoundOr404.class)
@Path("/{containerName}")
+ @Fallback(FalseOnNotFoundOr404.class)
boolean deleteMetadata(@PathParam("containerName") String containerName,
@BinderParam(BindRemoveContainerMetadataToHeaders.class) Map<String, String> metadata);
/**
* Deletes a {@link Container}, if empty.
- *
+ *
* @param containerName
* corresponds to {@link Container#getName()}.
- *
+ *
* @return {@code true} if the container was deleted or not present.
- *
+ *
* @throws IllegalStateException if the container was not empty.
*/
@Named("container:deleteIfEmpty")
@DELETE
- @Fallback(TrueOnNotFoundOr404.class)
@Path("/{containerName}")
+ @Fallback(TrueOnNotFoundOr404.class)
boolean deleteIfEmpty(@PathParam("containerName") String containerName) throws IllegalStateException;
- /**
- * Creates a container, if not already present.
- *
- * @param containerName
- * corresponds to {@link Container#getName()}.
- * @param options
- * the options to use when creating the container.
- *
- * @return {@code true} if the container was created, {@code false} if the container already existed.
- *
- * @deprecated Please use either {@link #create(String)} or {@link #create(String, CreateContainerOptions)}
- * as this method will be removed in jclouds 1.8.
- */
- @Deprecated
- @Named("container:createIfAbsent")
- @PUT
- @ResponseParser(FalseOnAccepted.class)
- @Path("/{containerName}")
- boolean createIfAbsent(@PathParam("containerName") String containerName, CreateContainerOptions options);
-
- /**
- * Gets the {@link Container} metadata, including the number of objects in the container and
- * the total bytes for all objects stored in the container.
- *
- * @param containerName
- * corresponds to {@link Container#getName()}.
- *
- * @return the {@link Container}, or {@code null} if not found.
- *
- * @deprecated Please use {@link #get(String)} as this method will be removed in jclouds 1.8.
- */
- @Deprecated
- @Named("container:get")
- @HEAD
- @ResponseParser(ParseContainerFromHeaders.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Path("/{containerName}")
- @Nullable
- Container head(@PathParam("containerName") String containerName);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
index e4fccc6..4d4d603 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
@@ -54,7 +54,6 @@ import org.jclouds.openstack.swift.v1.options.PutOptions;
import org.jclouds.rest.annotations.BinderParam;
import org.jclouds.rest.annotations.Fallback;
import org.jclouds.rest.annotations.Headers;
-import org.jclouds.rest.annotations.QueryParams;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.ResponseParser;
@@ -74,15 +73,13 @@ public interface ObjectApi {
/**
* Lists up to 10,000 objects.
- *
+ *
* @return an {@link ObjectList} of {@link SwiftObject} ordered by name or {@code null}.
*/
@Named("object:list")
@GET
- @QueryParams(keys = "format", values = "json")
@ResponseParser(ParseObjectListFromResponse.class)
@Fallback(NullOnNotFoundOr404.class)
- @Path("/")
@Nullable
ObjectList list();
@@ -90,24 +87,22 @@ public interface ObjectApi {
* Lists up to 10,000 objects. To control a large list of containers beyond
* 10,000 objects, use the {@code marker} and {@code endMarker} parameters in the
* {@link ListContainerOptions} class.
- *
- * @param options
+ *
+ * @param options
* the {@link ListContainerOptions} for controlling the returned list.
- *
+ *
* @return an {@link ObjectList} of {@link SwiftObject} ordered by name or {@code null}.
*/
@Named("object:list")
@GET
- @QueryParams(keys = "format", values = "json")
@ResponseParser(ParseObjectListFromResponse.class)
@Fallback(NullOnNotFoundOr404.class)
- @Path("/")
@Nullable
ObjectList list(ListContainerOptions options);
/**
* Creates or updates a {@link SwiftObject}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
* @param payload
@@ -117,145 +112,145 @@ public interface ObjectApi {
*/
@Named("object:put")
@PUT
+ @Path("/{objectName}")
@Headers(keys = EXPECT, values = "100-continue")
@ResponseParser(ETagHeader.class)
- @Path("/{objectName}")
String put(@PathParam("objectName") String objectName, @BinderParam(SetPayload.class) Payload payload);
/**
* Creates or updates a {@link SwiftObject}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
* @param payload
* corresponds to {@link SwiftObject#getPayload()}.
* @param options
* {@link PutOptions options} to control creating the {@link SwiftObject}.
- *
+ *
* @return {@link SwiftObject#getETag()} of the object.
*/
@Named("object:put")
@PUT
+ @Path("/{objectName}")
@Headers(keys = EXPECT, values = "100-continue")
@ResponseParser(ETagHeader.class)
- @Path("/{objectName}")
String put(@PathParam("objectName") String objectName, @BinderParam(SetPayload.class) Payload payload,
PutOptions options);
/**
* Gets the {@link SwiftObject} metadata without its {@link Payload#openStream() body}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
- *
+ *
* @return the {@link SwiftObject} or {@code null}, if not found.
*/
@Named("object:getWithoutBody")
@HEAD
+ @Path("/{objectName}")
@ResponseParser(ParseObjectFromResponse.class)
@Fallback(NullOnNotFoundOr404.class)
- @Path("/{objectName}")
@Nullable
SwiftObject getWithoutBody(@PathParam("objectName") String objectName);
/**
* Gets the {@link SwiftObject} including its {@link Payload#openStream() body}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
- *
+ *
* @return the {@link SwiftObject} or {@code null}, if not found.
*/
@Named("object:get")
@GET
+ @Path("/{objectName}")
@ResponseParser(ParseObjectFromResponse.class)
@Fallback(NullOnNotFoundOr404.class)
- @Path("/{objectName}")
@Nullable
SwiftObject get(@PathParam("objectName") String objectName);
/**
* Gets the {@link SwiftObject} including its {@link Payload#openStream() body}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
* @param options
* options to control the download.
- *
+ *
* @return the {@link SwiftObject} or {@code null}, if not found.
*/
@Named("object:get")
@GET
+ @Path("/{objectName}")
@ResponseParser(ParseObjectFromResponse.class)
@Fallback(NullOnNotFoundOr404.class)
- @Path("/{objectName}")
@Nullable
SwiftObject get(@PathParam("objectName") String objectName, GetOptions options);
/**
* Creates or updates the metadata for a {@link SwiftObject}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
* @param metadata
* the metadata to create or update.
- *
- * @return {@code true} if the metadata was successfully created or updated,
+ *
+ * @return {@code true} if the metadata was successfully created or updated,
* {@code false} if not.
*/
@Named("object:updateMetadata")
@POST
- @Fallback(FalseOnNotFoundOr404.class)
@Path("/{objectName}")
@Produces("")
+ @Fallback(FalseOnNotFoundOr404.class)
boolean updateMetadata(@PathParam("objectName") String objectName,
@BinderParam(BindObjectMetadataToHeaders.class) Map<String, String> metadata);
/**
* Deletes the metadata from a {@link SwiftObject}.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
* @param metadata
* corresponds to {@link SwiftObject#getMetadata()}.
- *
- * @return {@code true} if the metadata was successfully deleted,
+ *
+ * @return {@code true} if the metadata was successfully deleted,
* {@code false} if not.
*/
@Named("object:deleteMetadata")
@POST
- @Fallback(FalseOnNotFoundOr404.class)
@Path("/{objectName}")
+ @Fallback(FalseOnNotFoundOr404.class)
boolean deleteMetadata(@PathParam("objectName") String objectName,
@BinderParam(BindRemoveObjectMetadataToHeaders.class) Map<String, String> metadata);
/**
* Deletes an object, if present.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
*/
@Named("object:delete")
@DELETE
- @Fallback(VoidOnNotFoundOr404.class)
@Path("/{objectName}")
+ @Fallback(VoidOnNotFoundOr404.class)
void delete(@PathParam("objectName") String objectName);
/**
- * Copies an object from one container to another.
- *
+ * Copies an object from one container to another.
+ *
* <h3>NOTE</h3>
* This is a server side copy.
- *
+ *
* @param destinationObject
* the destination object name.
* @param sourceContainer
* the source container name.
* @param sourceObject
* the source object name.
- *
+ *
* @return {@code true} if the object was successfully copied, {@code false} if not.
- *
+ *
* @throws org.jclouds.openstack.swift.v1.CopyObjectException if the source or destination container do not exist.
*/
@Named("object:copy")
@@ -267,44 +262,4 @@ public interface ObjectApi {
@PathParam("sourceContainer") String sourceContainer,
@PathParam("sourceObject") String sourceObject);
- /**
- * Gets the {@link SwiftObject} metadata without its {@link Payload#openStream() body}.
- *
- * @param objectName
- * corresponds to {@link SwiftObject#getName()}.
- *
- * @return the {@link SwiftObject} or {@code null}, if not found.
- *
- * @deprecated Please use {@link #getWithoutBody(String)} as this method will be removed in jclouds 1.8.
- */
- @Deprecated
- @Named("object:head")
- @HEAD
- @ResponseParser(ParseObjectFromResponse.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Path("/{objectName}")
- @Nullable
- SwiftObject head(@PathParam("objectName") String objectName);
-
- /**
- * Creates or updates a {@link SwiftObject}.
- *
- * @param objectName
- * corresponds to {@link SwiftObject#getName()}.
- * @param payload
- * corresponds to {@link SwiftObject#getPayload()}.
- * @param metadata
- * corresponds to {@link SwiftObject#getMetadata()}.
- *
- * @return {@link SwiftObject#getEtag()} of the object.
- *
- * @deprecated Please use {@link #put(String, Payload)} or {@link #put(String, Payload, PutOptions)}
- * as this method will be removed in jclouds 1.8.
- */
- @Named("object:replace")
- @PUT
- @ResponseParser(ETagHeader.class)
- @Path("/{objectName}")
- String replace(@PathParam("objectName") String objectName, @BinderParam(SetPayload.class) Payload payload,
- @BinderParam(BindObjectMetadataToHeaders.class) Map<String, String> metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
index 385428e..51ba30d 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
@@ -52,25 +52,25 @@ import com.google.common.annotations.Beta;
@Beta
@RequestFilters(AuthenticateRequest.class)
@Consumes(APPLICATION_JSON)
+@Path("/{objectName}")
public interface StaticLargeObjectApi {
/**
* Creates or updates a static large object's manifest.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
* @param segments
* ordered parts which will be concatenated upon download.
* @param metadata
* corresponds to {@link SwiftObject#getMetadata()}.
- *
+ *
* @return {@link SwiftObject#getEtag()} of the object, which is the MD5
* checksum of the concatenated ETag values of the {@code segments}.
*/
@Named("staticLargeObject:replaceManifest")
@PUT
@ResponseParser(ETagHeader.class)
- @Path("/{objectName}")
@QueryParams(keys = "multipart-manifest", values = "put")
String replaceManifest(@PathParam("objectName") String objectName,
@BinderParam(BindToJsonPayload.class) List<Segment> segments,
@@ -78,14 +78,13 @@ public interface StaticLargeObjectApi {
/**
* Deletes a static large object, if present, including all of its segments.
- *
+ *
* @param objectName
* corresponds to {@link SwiftObject#getName()}.
*/
@Named("staticLargeObject:delete")
@DELETE
@Fallback(VoidOnNotFoundOr404.class)
- @Path("/{objectName}")
@QueryParams(keys = "multipart-manifest", values = "delete")
void delete(@PathParam("objectName") String objectName);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
index d80eea3..8b5e895 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
@@ -58,7 +58,7 @@ public class AuthenticationMockTest extends BaseOpenStackMockTest<SwiftApi> {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides);
- api.getAccountApiForRegion("DFW").get();
+ api.getAccountApi("DFW").get();
assertEquals(server.getRequestCount(), 2);
RecordedRequest authRequest = server.takeRequest();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java
index bf2a4ff..dd65210 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerLiveTest.java
@@ -44,10 +44,10 @@ public class TemporaryUrlSignerLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void signForPublicAccess() throws Exception {
for (String regionId : api.getConfiguredRegions()) {
- SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name);
+ SwiftObject object = api.getObjectApi(regionId, containerName).get(name);
long expires = System.currentTimeMillis() / 1000 + 5;
- String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApiForRegion(regionId), 5)
+ String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApi(regionId), 5)
.sign("GET", object.getUri().getPath(), expires);
URI signed = URI.create(format("%s?temp_url_sig=%s&temp_url_expires=%s", object.getUri(), signature, expires));
@@ -71,9 +71,9 @@ public class TemporaryUrlSignerLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
super.setup();
String key = UUID.randomUUID().toString();
for (String regionId : api.getConfiguredRegions()) {
- api.getAccountApiForRegion(regionId).updateTemporaryUrlKey(key);
- api.getContainerApiForRegion(regionId).create(containerName);
- api.getObjectApiForRegionAndContainer(regionId, containerName)
+ api.getAccountApi(regionId).updateTemporaryUrlKey(key);
+ api.getContainerApi(regionId).create(containerName);
+ api.getObjectApi(regionId, containerName)
.put(name, newByteSourcePayload(ByteSource.wrap("swifty".getBytes())));
}
}
@@ -82,8 +82,8 @@ public class TemporaryUrlSignerLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
@AfterClass(groups = "live")
public void tearDown() {
for (String regionId : api.getConfiguredRegions()) {
- api.getObjectApiForRegionAndContainer(regionId, containerName).delete(name);
- api.getContainerApiForRegion(regionId).deleteIfEmpty(containerName);
+ api.getObjectApi(regionId, containerName).delete(name);
+ api.getContainerApi(regionId).deleteIfEmpty(containerName);
}
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
index f5de499..8f42cf3 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
@@ -49,7 +49,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi>
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
assertEquals(server.takeRequest().getRequestLine(),
- "HEAD /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/ HTTP/1.1");
+ "HEAD /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9 HTTP/1.1");
} finally {
server.shutdown();
}
@@ -69,7 +69,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi>
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
assertEquals(server.takeRequest().getRequestLine(),
- "HEAD /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/ HTTP/1.1");
+ "HEAD /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9 HTTP/1.1");
server.shutdown();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
index 673ee71..bba85bc 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
@@ -50,12 +50,12 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati
}
@Test
- public void regionsAreNotEmpty() {
+ public void testRegionsAreNotEmpty() {
assertFalse(RegionScopedBlobStoreContext.class.cast(view).getConfiguredRegions().isEmpty());
}
@Test
- public void locationsMatch() {
+ public void testLocationsMatch() {
RegionScopedBlobStoreContext ctx = RegionScopedBlobStoreContext.class.cast(view);
for (String regionId : ctx.getConfiguredRegions()) {
Set<? extends Location> locations = ctx.getBlobStore(regionId).listAssignableLocations();
@@ -66,7 +66,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati
}
@Test
- public void tryList() throws InterruptedException, ExecutionException {
+ public void testListBlobs() throws InterruptedException, ExecutionException {
RegionScopedBlobStoreContext ctx = RegionScopedBlobStoreContext.class.cast(view);
for (String regionId : ctx.getConfiguredRegions()) {
assertEquals(ctx.getAsyncBlobStore(regionId).list().get(), ctx.getBlobStore(regionId).list());
@@ -74,7 +74,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati
}
@Test
- public void trySign() throws InterruptedException, ExecutionException {
+ public void testSignBlob() throws InterruptedException, ExecutionException {
RegionScopedBlobStoreContext ctx = RegionScopedBlobStoreContext.class.cast(view);
for (String regionId : ctx.getConfiguredRegions()) {
BlobStore region = ctx.getBlobStore(regionId);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
index 7e54f4c..3841b33 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
@@ -35,8 +35,8 @@ import com.google.common.collect.ImmutableMap;
public class AccountApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void testGet() throws Exception {
- for (String region : regions) {
- AccountApi accountApi = api.getAccountApi(region);
+ for (String regionId : regions) {
+ AccountApi accountApi = api.getAccountApi(regionId);
Account account = accountApi.get();
assertNotNull(account);
@@ -47,8 +47,8 @@ public class AccountApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
}
public void testUpdateMetadata() throws Exception {
- for (String region : regions) {
- AccountApi accountApi = api.getAccountApi(region);
+ for (String regionId : regions) {
+ AccountApi accountApi = api.getAccountApi(regionId);
Map<String, String> meta = ImmutableMap.of("MyAdd1", "foo", "MyAdd2", "bar");
@@ -59,8 +59,8 @@ public class AccountApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
}
public void testDeleteMetadata() throws Exception {
- for (String region : regions) {
- AccountApi accountApi = api.getAccountApi(region);
+ for (String regionId : regions) {
+ AccountApi accountApi = api.getAccountApi(regionId);
Map<String, String> meta = ImmutableMap.of("MyDelete1", "foo", "MyDelete2", "bar");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
index 3e57527..84d08fe 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
@@ -52,7 +52,7 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- Account account = api.getAccountApiForRegion("DFW").get();
+ Account account = api.getAccountApi("DFW").get();
assertEquals(account.getContainerCount(), 3l);
assertEquals(account.getObjectCount(), 42l);
assertEquals(account.getBytesUsed(), 323479l);
@@ -62,7 +62,7 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
- assertRequest(server.takeRequest(), "HEAD", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/");
+ assertRequest(server.takeRequest(), "HEAD", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9");
} finally {
server.shutdown();
}
@@ -77,13 +77,13 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getAccountApiForRegion("DFW").updateMetadata(metadata));
+ assertTrue(api.getAccountApi("DFW").updateMetadata(metadata));
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
-
+
RecordedRequest replaceRequest = server.takeRequest();
- assertRequest(replaceRequest, "POST", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/");
+ assertRequest(replaceRequest, "POST", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9");
for (Entry<String, String> entry : metadata.entrySet()) {
assertEquals(replaceRequest.getHeader(ACCOUNT_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue());
}
@@ -99,13 +99,13 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getAccountApiForRegion("DFW").updateTemporaryUrlKey("foobar"));
+ assertTrue(api.getAccountApi("DFW").updateTemporaryUrlKey("foobar"));
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
-
+
RecordedRequest replaceRequest = server.takeRequest();
- assertRequest(replaceRequest, "POST", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/");
+ assertRequest(replaceRequest, "POST", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9");
assertEquals(replaceRequest.getHeader(ACCOUNT_TEMPORARY_URL_KEY), "foobar");
} finally {
server.shutdown();
@@ -119,13 +119,13 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getAccountApiForRegion("DFW").deleteMetadata(metadata));
+ assertTrue(api.getAccountApi("DFW").deleteMetadata(metadata));
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
RecordedRequest deleteRequest = server.takeRequest();
assertEquals(deleteRequest.getRequestLine(),
- "POST /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/ HTTP/1.1");
+ "POST /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9 HTTP/1.1");
for (String key : metadata.keySet()) {
assertEquals(deleteRequest.getHeader(ACCOUNT_REMOVE_METADATA_PREFIX + key.toLowerCase()), "ignored");
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
index bf313d7..6901ac9 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
@@ -53,7 +53,7 @@ public class BulkApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void testNotPresentWhenDeleting() throws Exception {
for (String regionId : regions) {
- BulkDeleteResponse deleteResponse = api.getBulkApiForRegion(regionId).bulkDelete(
+ BulkDeleteResponse deleteResponse = api.getBulkApi(regionId).bulkDelete(
ImmutableList.of(UUID.randomUUID().toString()));
assertEquals(deleteResponse.getDeleted(), 0);
assertEquals(deleteResponse.getNotFound(), 1);
@@ -65,14 +65,14 @@ public class BulkApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
for (String regionId : regions) {
Payload payload = new ByteSourcePayload(ByteSource.wrap(tarGz));
- ExtractArchiveResponse extractResponse = api.getBulkApiForRegion(regionId)
+ ExtractArchiveResponse extractResponse = api.getBulkApi(regionId)
.extractArchive(containerName, payload, "tar.gz");
assertEquals(extractResponse.getCreated(), OBJECT_COUNT);
assertTrue(extractResponse.getErrors().isEmpty());
- assertEquals(api.getContainerApiForRegion(regionId).get(containerName).getObjectCount(), OBJECT_COUNT);
+ assertEquals(api.getContainerApi(regionId).get(containerName).getObjectCount(), OBJECT_COUNT);
// repeat the command
- extractResponse = api.getBulkApiForRegion(regionId).extractArchive(containerName, payload, "tar.gz");
+ extractResponse = api.getBulkApi(regionId).extractArchive(containerName, payload, "tar.gz");
assertEquals(extractResponse.getCreated(), OBJECT_COUNT);
assertTrue(extractResponse.getErrors().isEmpty());
}
@@ -81,11 +81,11 @@ public class BulkApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
@Test(dependsOnMethods = "testExtractArchive")
public void testBulkDelete() throws Exception {
for (String regionId : regions) {
- BulkDeleteResponse deleteResponse = api.getBulkApiForRegion(regionId).bulkDelete(paths);
+ BulkDeleteResponse deleteResponse = api.getBulkApi(regionId).bulkDelete(paths);
assertEquals(deleteResponse.getDeleted(), OBJECT_COUNT);
assertEquals(deleteResponse.getNotFound(), 0);
assertTrue(deleteResponse.getErrors().isEmpty());
- assertEquals(api.getContainerApiForRegion(regionId).get(containerName).getObjectCount(), 0);
+ assertEquals(api.getContainerApi(regionId).get(containerName).getObjectCount(), 0);
}
}
@@ -94,7 +94,7 @@ public class BulkApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void setup() {
super.setup();
for (String regionId : regions) {
- boolean created = api.getContainerApiForRegion(regionId).create(containerName);
+ boolean created = api.getContainerApi(regionId).create(containerName);
if (!created) {
deleteAllObjectsInContainer(regionId, containerName);
}
@@ -118,7 +118,7 @@ public class BulkApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void tearDown() {
for (String regionId : regions) {
deleteAllObjectsInContainer(regionId, containerName);
- api.getContainerApiForRegion(regionId).deleteIfEmpty(containerName);
+ api.getContainerApi(regionId).deleteIfEmpty(containerName);
}
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
index 5b7a520..3136b52 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
@@ -55,7 +55,7 @@ public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(tarGz));
- ExtractArchiveResponse response = api.getBulkApiForRegion("DFW").extractArchive("myContainer", payload, "tar.gz");
+ ExtractArchiveResponse response = api.getBulkApi("DFW").extractArchive("myContainer", payload, "tar.gz");
assertEquals(response.getCreated(), 10);
assertTrue(response.getErrors().isEmpty());
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
index 04585a0..bf2ba98 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
@@ -54,16 +54,16 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
SwiftHeaders.STATIC_WEB_ERROR, "__error.html");
CreateContainerOptions opts = new CreateContainerOptions().headers(headers);
- assertNotNull(api.getContainerApiForRegion(regionId).create(name, opts));
+ assertNotNull(api.getContainerApi(regionId).create(name, opts));
- Container container = api.getContainerApiForRegion(regionId).get(name);
+ Container container = api.getContainerApi(regionId).get(name);
assertNotNull(container);
assertEquals(container.getName(), name);
assertEquals(container.getMetadata().size(), 2);
assertEquals(container.getMetadata().get("web-index"), "__index.html");
assertEquals(container.getMetadata().get("web-error"), "__error.html");
- assertTrue(api.getContainerApiForRegion(regionId).deleteIfEmpty(name));
+ assertTrue(api.getContainerApi(regionId).deleteIfEmpty(name));
}
}
@@ -71,18 +71,18 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
final String nameWithSpaces = "container # ! special";
for (String regionId : regions) {
- assertTrue(api.getContainerApiForRegion(regionId).create(nameWithSpaces));
- Container container = api.getContainerApiForRegion(regionId).get(nameWithSpaces);
+ assertTrue(api.getContainerApi(regionId).create(nameWithSpaces));
+ Container container = api.getContainerApi(regionId).get(nameWithSpaces);
assertNotNull(container);
assertEquals(container.getName(), nameWithSpaces);
- assertTrue(api.getContainerApiForRegion(regionId).deleteIfEmpty(nameWithSpaces));
+ assertTrue(api.getContainerApi(regionId).deleteIfEmpty(nameWithSpaces));
}
}
public void testList() throws Exception {
for (String regionId : regions) {
- ContainerApi containerApi = api.getContainerApiForRegion(regionId);
+ ContainerApi containerApi = api.getContainerApi(regionId);
FluentIterable<Container> response = containerApi.list();
assertNotNull(response);
for (Container container : response) {
@@ -97,7 +97,7 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
String lexicographicallyBeforeName = name.substring(0, name.length() - 1);
for (String regionId : regions) {
ListContainerOptions options = ListContainerOptions.Builder.marker(lexicographicallyBeforeName);
- Container container = api.getContainerApiForRegion(regionId).list(options).get(0);
+ Container container = api.getContainerApi(regionId).list(options).get(0);
assertEquals(container.getName(), name);
assertTrue(container.getObjectCount() == 0);
assertTrue(container.getBytesUsed() == 0);
@@ -111,29 +111,29 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
SwiftHeaders.STATIC_WEB_ERROR, "__error.html");
UpdateContainerOptions opts = new UpdateContainerOptions().headers(headers);
- assertNotNull(api.getContainerApiForRegion(regionId).create(name));
+ assertNotNull(api.getContainerApi(regionId).create(name));
- Container container = api.getContainerApiForRegion(regionId).get(name);
+ Container container = api.getContainerApi(regionId).get(name);
assertNotNull(container);
assertEquals(container.getName(), name);
assertTrue(container.getMetadata().isEmpty());
- assertNotNull(api.getContainerApiForRegion(regionId).update(name, opts));
+ assertNotNull(api.getContainerApi(regionId).update(name, opts));
- Container updatedContainer = api.getContainerApiForRegion(regionId).get(name);
+ Container updatedContainer = api.getContainerApi(regionId).get(name);
assertNotNull(updatedContainer);
assertEquals(updatedContainer.getName(), name);
assertEquals(updatedContainer.getMetadata().size(), 2);
assertEquals(updatedContainer.getMetadata().get("web-index"), "__index.html");
assertEquals(updatedContainer.getMetadata().get("web-error"), "__error.html");
- assertTrue(api.getContainerApiForRegion(regionId).deleteIfEmpty(name));
+ assertTrue(api.getContainerApi(regionId).deleteIfEmpty(name));
}
}
public void testGet() throws Exception {
for (String regionId : regions) {
- Container container = api.getContainerApiForRegion(regionId).get(name);
+ Container container = api.getContainerApi(regionId).get(name);
assertEquals(container.getName(), name);
assertTrue(container.getObjectCount() == 0);
assertTrue(container.getBytesUsed() == 0);
@@ -144,7 +144,7 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
Map<String, String> meta = ImmutableMap.of("MyAdd1", "foo", "MyAdd2", "bar");
for (String regionId : regions) {
- ContainerApi containerApi = api.getContainerApiForRegion(regionId);
+ ContainerApi containerApi = api.getContainerApi(regionId);
assertTrue(containerApi.updateMetadata(name, meta));
containerHasMetadata(containerApi, name, meta);
}
@@ -154,7 +154,7 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
Map<String, String> meta = ImmutableMap.of("MyDelete1", "foo", "MyDelete2", "bar");
for (String regionId : regions) {
- ContainerApi containerApi = api.getContainerApiForRegion(regionId);
+ ContainerApi containerApi = api.getContainerApi(regionId);
// update
assertTrue(containerApi.updateMetadata(name, meta));
containerHasMetadata(containerApi, name, meta);
@@ -182,7 +182,7 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void setup() {
super.setup();
for (String regionId : regions) {
- api.getContainerApiForRegion(regionId).create(name);
+ api.getContainerApi(regionId).create(name);
}
}
@@ -190,7 +190,7 @@ public class ContainerApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
@AfterClass(groups = "live")
public void tearDown() {
for (String regionId : regions) {
- api.getContainerApiForRegion(regionId).deleteIfEmpty(name);
+ api.getContainerApi(regionId).deleteIfEmpty(name);
}
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
index 73cf6b3..64c5993 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java
@@ -46,7 +46,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
@Test(groups = "unit", testName = "ContainerApiMockTest")
public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
-
+
public void testList() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -54,7 +54,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- ImmutableList<Container> containers = api.getContainerApiForRegion("DFW").list().toList();
+ ImmutableList<Container> containers = api.getContainerApi("DFW").list().toList();
assertEquals(containers, ImmutableList.of(
Container.builder()
.name("test_container_1")
@@ -67,7 +67,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/?format=json");
+ assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9");
} finally {
server.shutdown();
}
@@ -80,10 +80,10 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
ListContainerOptions options = ListContainerOptions.Builder.marker("test");
assertNotNull(options);
-
+
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- ImmutableList<Container> containers = api.getContainerApiForRegion("DFW").list(options).toList();
+ ImmutableList<Container> containers = api.getContainerApi("DFW").list(options).toList();
assertEquals(containers, ImmutableList.of(
Container.builder()
.name("test_container_1")
@@ -96,7 +96,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
- assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/?format=json&marker=test");
+ assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9?marker=test");
} finally {
server.shutdown();
}
@@ -112,9 +112,9 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").create("myContainer", anybodyRead().metadata(metadata)));
-
- Container container = api.getContainerApiForRegion("DFW").get("myContainer");
+ assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata)));
+
+ Container container = api.getContainerApi("DFW").get("myContainer");
assertEquals(container.getName(), "myContainer");
assertEquals(container.getObjectCount(), 42l);
assertEquals(container.getBytesUsed(), 323479l);
@@ -138,10 +138,10 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").create("myContainer", anybodyRead().metadata(metadata)));
+ assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata)));
// the head call will throw the ContainerNotFoundException
- api.getContainerApiForRegion("DFW").get("myContainer");
+ api.getContainerApi("DFW").get("myContainer");
} finally {
server.shutdown();
}
@@ -154,7 +154,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").create("myContainer"));
+ assertTrue(api.getContainerApi("DFW").create("myContainer"));
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
@@ -171,16 +171,16 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").create("myContainer", anybodyRead().metadata(metadata)));
+ assertTrue(api.getContainerApi("DFW").create("myContainer", anybodyRead().metadata(metadata)));
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
RecordedRequest createRequest = server.takeRequest();
assertRequest(createRequest, "PUT", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer");
-
+
assertEquals(createRequest.getHeader(CONTAINER_READ), CONTAINER_ACL_ANYBODY_READ);
-
+
for (Entry<String, String> entry : metadata.entrySet()) {
assertEquals(createRequest.getHeader(CONTAINER_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue());
}
@@ -196,7 +196,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").create("container # ! special"));
+ assertTrue(api.getContainerApi("DFW").create("container # ! special"));
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
@@ -213,7 +213,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertFalse(api.getContainerApiForRegion("DFW").create("myContainer"));
+ assertFalse(api.getContainerApi("DFW").create("myContainer"));
assertEquals(server.getRequestCount(), 2);
assertAuthentication(server);
@@ -234,7 +234,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- Container container = api.getContainerApiForRegion("DFW").get("myContainer");
+ Container container = api.getContainerApi("DFW").get("myContainer");
assertEquals(container.getName(), "myContainer");
assertEquals(container.getObjectCount(), 42l);
assertEquals(container.getBytesUsed(), 323479l);
@@ -259,7 +259,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").updateMetadata("myContainer", metadata));
+ assertTrue(api.getContainerApi("DFW").updateMetadata("myContainer", metadata));
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
@@ -281,7 +281,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").deleteMetadata("myContainer", metadata));
+ assertTrue(api.getContainerApi("DFW").deleteMetadata("myContainer", metadata));
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
@@ -303,7 +303,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").deleteIfEmpty("myContainer"));
+ assertTrue(api.getContainerApi("DFW").deleteIfEmpty("myContainer"));
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
@@ -322,7 +322,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- assertTrue(api.getContainerApiForRegion("DFW").deleteIfEmpty("myContainer"));
+ assertTrue(api.getContainerApi("DFW").deleteIfEmpty("myContainer"));
assertEquals(server.getRequestCount(), 2);
assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1");
@@ -342,7 +342,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- api.getContainerApiForRegion("DFW").deleteIfEmpty("myContainer");
+ api.getContainerApi("DFW").deleteIfEmpty("myContainer");
} finally {
assertEquals(server.getRequestCount(), 2);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/CreatePublicContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/CreatePublicContainerLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/CreatePublicContainerLiveTest.java
index 41df875..09e34b5 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/CreatePublicContainerLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/CreatePublicContainerLiveTest.java
@@ -31,8 +31,8 @@ public class CreatePublicContainerLiveTest extends BaseSwiftApiLiveTest<SwiftApi
public void testAnybodyReadUpdatesMetadata() throws Exception {
for (String regionId : api.getConfiguredRegions()) {
- api.getContainerApiForRegion(regionId).create(name, anybodyRead());
- assertTrue(api.getContainerApiForRegion(regionId).get(name).getAnybodyRead().get());
+ api.getContainerApi(regionId).create(name, anybodyRead());
+ assertTrue(api.getContainerApi(regionId).get(name).getAnybodyRead().get());
}
}
@@ -40,7 +40,7 @@ public class CreatePublicContainerLiveTest extends BaseSwiftApiLiveTest<SwiftApi
@AfterClass(groups = "live")
public void tearDown() {
for (String regionId : api.getConfiguredRegions()) {
- api.getContainerApiForRegion(regionId).deleteIfEmpty(name);
+ api.getContainerApi(regionId).deleteIfEmpty(name);
}
super.tearDown();
}