Repository: jclouds-labs-openstack Updated Branches: refs/heads/1.8.x 1b10bae61 -> 47416116b
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/5887d8de Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/5887d8de Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/5887d8de Branch: refs/heads/1.8.x Commit: 5887d8decaf74cecd64186c6bf0c9c77d26a4728 Parents: 1b10bae Author: Adrian Cole <[email protected]> Authored: Sun Oct 5 12:01:43 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Sun Oct 5 14:41:57 2014 -0700 ---------------------------------------------------------------------- .../v1/blobstore/RegionScopedBlobStoreContext.java | 13 +------------ .../RegionScopedBlobStoreContextLiveTest.java | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/5887d8de/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 8f99416..de1f50d 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; @@ -125,6 +123,7 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC return blobRequestSigner.apply(regionId); } +<<<<<<< HEAD /** * @param regionId * valid region id from {@link #getConfiguredRegions()} @@ -197,16 +196,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/5887d8de/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..a762b8b 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 @@ -69,7 +69,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati public void tryList() 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(); } }
