From 9f6b9d4d8a16dc139852c46efed2cb24b70bb047 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 7 Oct 2012 22:49:59 -0700 Subject: [PATCH] Rename to LocalBlobRequestSigner Missing commit from the Filesystem and Transient unification. --- .../config/FilesystemBlobStoreContextModule.java | 4 ++-- ...lobRequestSigner.java => LocalBlobRequestSigner.java} | 9 ++++----- .../config/TransientBlobStoreContextModule.java | 4 ++-- .../blobstore/TransientBlobRequestSignerTest.java | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) rename blobstore/src/main/java/org/jclouds/blobstore/{TransientBlobRequestSigner.java => LocalBlobRequestSigner.java} (94%) diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java index 1eb4079fcb..e72f769268 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java @@ -22,8 +22,8 @@ import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.LocalAsyncBlobStore; +import org.jclouds.blobstore.LocalBlobRequestSigner; import org.jclouds.blobstore.LocalStorageStrategy; -import org.jclouds.blobstore.TransientBlobRequestSigner; import org.jclouds.blobstore.attr.ConsistencyModel; import org.jclouds.blobstore.config.BlobStoreMapModule; import org.jclouds.blobstore.config.BlobStoreObjectModule; @@ -60,7 +60,7 @@ public class FilesystemBlobStoreContextModule extends AbstractModule { bind(BlobUtils.class).to(FileSystemBlobUtilsImpl.class); bind(FilesystemBlobKeyValidator.class).to(FilesystemBlobKeyValidatorImpl.class); bind(FilesystemContainerNameValidator.class).to(FilesystemContainerNameValidatorImpl.class); - bind(BlobRequestSigner.class).to(TransientBlobRequestSigner.class); + bind(BlobRequestSigner.class).to(LocalBlobRequestSigner.class); } } diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientBlobRequestSigner.java b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java similarity index 94% rename from blobstore/src/main/java/org/jclouds/blobstore/TransientBlobRequestSigner.java rename to blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java index 9cd59a79be..87f03ab457 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientBlobRequestSigner.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/LocalBlobRequestSigner.java @@ -36,19 +36,18 @@ import org.jclouds.location.Provider; import com.google.common.base.Supplier; /** - * * @author Adrian Cole */ @Singleton -public class TransientBlobRequestSigner implements BlobRequestSigner { +public class LocalBlobRequestSigner implements BlobRequestSigner { private final BasicAuthentication basicAuth; private final BlobToHttpGetOptions blob2HttpGetOptions; private final Supplier endpoint; private final ContentMetadataCodec contentMetadataCodec; - + @Inject - public TransientBlobRequestSigner(BasicAuthentication basicAuth, BlobToHttpGetOptions blob2HttpGetOptions, @Provider Supplier endpoint, + public LocalBlobRequestSigner(BasicAuthentication basicAuth, BlobToHttpGetOptions blob2HttpGetOptions, @Provider Supplier endpoint, ContentMetadataCodec contentMetadataCodec) { this.basicAuth = checkNotNull(basicAuth, "basicAuth"); this.blob2HttpGetOptions = checkNotNull(blob2HttpGetOptions, "blob2HttpGetOptions"); @@ -96,4 +95,4 @@ public class TransientBlobRequestSigner implements BlobRequestSigner { return basicAuth.filter(request); } -} \ No newline at end of file +} diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/TransientBlobStoreContextModule.java b/blobstore/src/main/java/org/jclouds/blobstore/config/TransientBlobStoreContextModule.java index e5bdb32cd6..975c3266eb 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/config/TransientBlobStoreContextModule.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/config/TransientBlobStoreContextModule.java @@ -22,8 +22,8 @@ import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.LocalAsyncBlobStore; +import org.jclouds.blobstore.LocalBlobRequestSigner; import org.jclouds.blobstore.LocalStorageStrategy; -import org.jclouds.blobstore.TransientBlobRequestSigner; import org.jclouds.blobstore.TransientStorageStrategy; import org.jclouds.blobstore.attr.ConsistencyModel; import org.jclouds.rest.config.BinderUtils; @@ -47,7 +47,7 @@ public class TransientBlobStoreContextModule extends AbstractModule { bind(BlobStore.class).to(LocalBlobStore.class); bind(ConsistencyModel.class).toInstance(ConsistencyModel.STRICT); bind(LocalStorageStrategy.class).to(TransientStorageStrategy.class); - bind(BlobRequestSigner.class).to(TransientBlobRequestSigner.class); + bind(BlobRequestSigner.class).to(LocalBlobRequestSigner.class); } } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index 445accb319..4089855abc 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java @@ -36,7 +36,7 @@ import org.testng.annotations.Test; import com.google.inject.TypeLiteral; /** - * Tests behavior of {@code TransientBlobRequestSigner} + * Tests behavior of {@code LocalBlobRequestSigner} * * @author Adrian Cole */