Repository: jclouds-labs-openstack Updated Branches: refs/heads/master ee86e2a42 -> 329187703
Removed *ForRegion for methods introduced in c90efaa and updated deprecation messages 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/32918770 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/32918770 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/32918770 Branch: refs/heads/master Commit: 329187703cef75c75bb811586a206c9c4e73142b Parents: ee86e2a Author: Jeremy Daggett <[email protected]> Authored: Sun Jul 27 08:51:08 2014 -0700 Committer: Jeremy Daggett <[email protected]> Committed: Mon Jul 28 09:47:42 2014 -0700 ---------------------------------------------------------------------- .../blobstore/RegionScopedBlobStoreContext.java | 69 +++++++++++--------- .../RegionScopedBlobStoreContextLiveTest.java | 8 +-- 2 files changed, 42 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/32918770/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 e00350a..e6df22f 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,6 +26,7 @@ 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; @@ -33,6 +34,7 @@ import org.jclouds.blobstore.attr.ConsistencyModel; import org.jclouds.internal.BaseView; import org.jclouds.location.Provider; import org.jclouds.location.Region; +import org.jclouds.openstack.swift.v1.blobstore.internal.SubmissionAsyncBlobStore; import org.jclouds.rest.Utils; import com.google.common.base.Function; @@ -49,11 +51,11 @@ import com.google.common.util.concurrent.ListeningExecutorService; * <pre> * ctx = contextBuilder.buildView(RegionScopedBlobStoreContext.class); * - * Set<String> regionIds = ctx.configuredRegions(); + * Set<String> regionIds = ctx.getConfiguredRegions(); * * // isolated to a specific region - * BlobStore texasBlobStore = ctx.blobStoreInRegion("US-TX"); - * BlobStore virginiaBlobStore = ctx.blobStoreInRegion("US-VA"); + * BlobStore texasBlobStore = ctx.getBlobStore("US-TX"); + * BlobStore virginiaBlobStore = ctx.getBlobStore("US-VA"); * </pre> */ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreContext { @@ -61,8 +63,7 @@ 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 Please use {{@link #getConfiguredRegions()} as this method will be removed in jclouds 2.0. */ @Deprecated public Set<String> configuredRegions() { @@ -78,16 +79,15 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC /** * @param regionId - * valid region id from {@link #configuredRegions()} + * valid region id from {@link #getConfiguredRegions()} * @throws IllegalArgumentException * if {@code regionId} was invalid. * - * @deprecated Please use {{@link #getConfiguredRegions()} as this method will be - * removed in jclouds 2.0. + * @deprecated Please use {{@link #getBlobStore(String)} as this method will be removed in jclouds 2.0. */ @Deprecated public BlobStore blobStoreInRegion(String regionId) { - return getBlobStoreForRegion(regionId); + return getBlobStore(regionId); } /** @@ -96,23 +96,22 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC * @throws IllegalArgumentException * if {@code regionId} was invalid. */ - public BlobStore getBlobStoreForRegion(String regionId) { + public BlobStore getBlobStore(String regionId) { checkRegionId(regionId); return blobStore.apply(regionId); } /** * @param regionId - * valid region id from {@link #configuredRegions()} + * valid region id from {@link #getConfiguredRegions()} * @throws IllegalArgumentException * if {@code regionId} was invalid. * - * @deprecated Please use {{@link #getSignerInRegion(String)} as this method will be - * removed in jclouds 2.0. + * @deprecated Please use {{@link #getSigner(String)} as this method will be removed in jclouds 2.0. */ @Deprecated public BlobRequestSigner signerInRegion(String regionId) { - return getSignerForRegion(regionId); + return getSigner(regionId); } /** @@ -121,34 +120,38 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC * @throws IllegalArgumentException * if {@code regionId} was invalid. */ - public BlobRequestSigner getSignerForRegion(String regionId) { + public BlobRequestSigner getSigner(String regionId) { checkRegionId(regionId); return blobRequestSigner.apply(regionId); } /** * @param regionId - * valid region id from {@link #configuredRegions()} + * valid region id from {@link #getConfiguredRegions()} * @throws IllegalArgumentException - * if {@code regionId} was invalid. longer supported. Please use - * {@link org.jclouds.blobstore.BlobStore} + * 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 org.jclouds.blobstore.AsyncBlobStore getAsyncBlobStoreForRegion(String regionId) { - checkRegionId(regionId); - return new org.jclouds.openstack.swift.v1.blobstore.internal.SubmissionAsyncBlobStore( - blobStoreInRegion(regionId), executor); + public AsyncBlobStore asyncBlobStoreInRegion(String regionId) { + return getAsyncBlobStore(regionId); } + /** * @param regionId - * valid region id from {@link #configuredRegions()} + * valid region id from {@link #getConfiguredRegions()} * @throws IllegalArgumentException - * if {@code regionId} was invalid. longer supported. Please use - * {@link org.jclouds.blobstore.BlobStore} + * 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 org.jclouds.blobstore.AsyncBlobStore asyncBlobStoreInRegion(String regionId) { - return getAsyncBlobStoreForRegion(regionId); + public AsyncBlobStore getAsyncBlobStore(String regionId) { + checkRegionId(regionId); + return new SubmissionAsyncBlobStore(blobStoreInRegion(regionId), executor); } protected void checkRegionId(String regionId) { @@ -186,18 +189,22 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC @Override public BlobStore getBlobStore() { - return getBlobStoreForRegion(implicitRegionId.get()); + return getBlobStore(implicitRegionId.get()); } @Override public BlobRequestSigner getSigner() { - return getSignerForRegion(implicitRegionId.get()); + 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 org.jclouds.blobstore.AsyncBlobStore getAsyncBlobStore() { - return getAsyncBlobStoreForRegion(implicitRegionId.get()); + public AsyncBlobStore getAsyncBlobStore() { + return getAsyncBlobStore(implicitRegionId.get()); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/32918770/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 17d309d..673ee71 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 @@ -58,7 +58,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati public void locationsMatch() { RegionScopedBlobStoreContext ctx = RegionScopedBlobStoreContext.class.cast(view); for (String regionId : ctx.getConfiguredRegions()) { - Set<? extends Location> locations = ctx.getBlobStoreForRegion(regionId).listAssignableLocations(); + Set<? extends Location> locations = ctx.getBlobStore(regionId).listAssignableLocations(); assertEquals(locations.size(), 1, "expected one region " + regionId + " " + locations); Location location = locations.iterator().next(); assertEquals(location.getId(), regionId, "region id " + regionId + " didn't match getId(): " + location); @@ -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.getAsyncBlobStoreForRegion(regionId).list().get(), ctx.getBlobStoreForRegion(regionId).list()); + assertEquals(ctx.getAsyncBlobStore(regionId).list().get(), ctx.getBlobStore(regionId).list()); } } @@ -77,7 +77,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati public void trySign() throws InterruptedException, ExecutionException { RegionScopedBlobStoreContext ctx = RegionScopedBlobStoreContext.class.cast(view); for (String regionId : ctx.getConfiguredRegions()) { - BlobStore region = ctx.getBlobStoreForRegion(regionId); + BlobStore region = ctx.getBlobStore(regionId); PageSet<? extends StorageMetadata> containers = region.list(); if (containers.isEmpty()) { continue; @@ -88,7 +88,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati continue; } String blobName = Iterables.getLast(blobs).getName(); - HttpRequest request = ctx.getSignerForRegion(regionId).signGetBlob(containerName, blobName); + HttpRequest request = ctx.getSigner(regionId).signGetBlob(containerName, blobName); assertNotNull(request, "regionId=" + regionId + ", container=" + containerName + ", blob=" + blobName); } }
