Skip to content
Permalink
Browse files
JCLOUDS-40 Remove last reference to AsyncBlobStore in Swift.
  • Loading branch information
Adrian Cole authored and Adrian Cole committed Oct 5, 2014
1 parent 3d5a998 commit 473e915da2dc194581e25d6dfe274979fe70aefa
Showing 2 changed files with 1 addition and 28 deletions.
@@ -26,12 +26,10 @@
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 BlobRequestSigner getSigner(String regionId) {
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 BlobRequestSigner getSigner() {
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;
@@ -84,7 +84,7 @@ public void testLocationsMatch() {
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();
}
}

0 comments on commit 473e915

Please sign in to comment.