You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/05 23:41:22 UTC
[2/2] git commit: JCLOUDS-40 Remove last reference to AsyncBlobStore
in Swift.
JCLOUDS-40 Remove last reference to AsyncBlobStore in Swift.
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/473e915d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/473e915d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/473e915d
Branch: refs/heads/master
Commit: 473e915da2dc194581e25d6dfe274979fe70aefa
Parents: 3d5a998
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Oct 5 12:01:43 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sun Oct 5 14:41:13 2014 -0700
----------------------------------------------------------------------
.../blobstore/RegionScopedBlobStoreContext.java | 27 --------------------
.../RegionScopedBlobStoreContextLiveTest.java | 2 +-
2 files changed, 1 insertion(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/473e915d/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 103e2b7..9fa3bc9 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
@@ -26,12 +26,10 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.jclouds.Context;
-import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.attr.ConsistencyModel;
-import org.jclouds.blobstore.internal.SubmissionAsyncBlobStore;
import org.jclouds.internal.BaseView;
import org.jclouds.location.Provider;
import org.jclouds.location.Region;
@@ -89,21 +87,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
return blobRequestSigner.apply(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
- * this method will be removed in jclouds 2.0.
- */
- @Deprecated
- public AsyncBlobStore getAsyncBlobStore(String regionId) {
- checkRegionId(regionId);
- return new SubmissionAsyncBlobStore(getBlobStore(regionId), executor);
- }
-
protected void checkRegionId(String regionId) {
checkArgument(getConfiguredRegions().contains(checkNotNull(regionId, "regionId was null")), "region %s not in %s",
regionId, getConfiguredRegions());
@@ -147,16 +130,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
return getSigner(implicitRegionId.get());
}
- /**
- * @deprecated {@link AsyncBlobStore} is no longer supported. Please use {@link BlobStore} as
- * this method will be removed in jclouds 2.0.
- */
- @Override
- @Deprecated
- public AsyncBlobStore getAsyncBlobStore() {
- return getAsyncBlobStore(implicitRegionId.get());
- }
-
@Override
public Utils utils() {
return utils;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/473e915d/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 080baa2..97f5448 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
@@ -84,7 +84,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati
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());
+ ctx.getBlobStore(regionId).list();
}
}