Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1513 from jclouds/deprecate-weird-blobstore-stuff-1.6.x 

deprecated blobstore interfaces that imply complex internal code (1.6.x)
This commit is contained in:
Andrew Gaul 2013-04-09 21:33:36 -07:00
parent 9db6177d37 28448d462b
commit 9b3941536c
17 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java
View File

@ -69,7 +69,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link AtmosBlobStore}
*/
@Deprecated
@Singleton
public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
private final AtmosAsyncClient async;

3
apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/blobstore/CloudFilesAsyncBlobStore.java
View File

@ -55,7 +55,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link CloudFilesBlobStore}
*/
@Deprecated
@Singleton
public class CloudFilesAsyncBlobStore extends SwiftAsyncBlobStore {
private final EnableCDNAndCache enableCDNAndCache;

3
apis/s3/src/main/java/org/jclouds/s3/blobstore/S3AsyncBlobStore.java
View File

@ -73,7 +73,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link S3BlobStore}
*/
@Deprecated
@Singleton
public class S3AsyncBlobStore extends BaseAsyncBlobStore {

3
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/SwiftAsyncBlobStore.java
View File

@ -69,7 +69,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link SwiftBlobStore}
*/
@Deprecated
@Singleton
public class SwiftAsyncBlobStore extends BaseAsyncBlobStore {
private final CommonSwiftClient sync;

5
blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java
View File

@ -37,8 +37,11 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* Provides hooks needed to run a blob store asynchronously
*
* @see AsyncBlobStore
* @see BlobStore
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link org.jclouds.blobstore.BlobStore}
*/
@Deprecated
public interface AsyncBlobStore {
/**
* @see BlobStore#getContext

2
blobstore/src/main/java/org/jclouds/blobstore/BlobMap.java
View File

@ -31,7 +31,9 @@ import com.google.inject.ImplementedBy;
*
* @author Adrian Cole
*
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
@ImplementedBy(BlobMapImpl.class)
public interface BlobMap extends ListableMap<String, Blob> {

23
blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContext.java
View File

@ -53,7 +53,9 @@ public interface BlobStoreContext extends Closeable, View {
* @param options
* allow you to specify a directory within the container, or whether to list
* recursively.
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
InputStreamMap createInputStreamMap(String container, ListContainerOptions options);
/**
@ -64,7 +66,9 @@ public interface BlobStoreContext extends Closeable, View {
*
* @param container
* existing container you wish to read or modify
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
InputStreamMap createInputStreamMap(String container);
/**
@ -76,24 +80,33 @@ public interface BlobStoreContext extends Closeable, View {
* @param options
* allow you to specify a directory within the container, or whether to list
* recursively.
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
BlobMap createBlobMap(String container, ListContainerOptions options);
/**
* Creates a <code>Map<String,Blob></code> view of the specified container. Use this when you wan
* to control the content type, or manually specify length or size of blobs.
* Creates a <code>Map<String,Blob></code> view of the specified container.
* Use this when you wan to control the content type, or manually specify
* length or size of blobs.
*
* Only root-level blobs will be visible.
*
* @param container
* existing container you wish to read or modify
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
BlobMap createBlobMap(String container);
/**
* @return a portable asynchronous interface for the BlobStore, which returns {@code Future}s for
* each call.
* @return a portable asynchronous interface for the BlobStore, which returns
* {@code Future}s for each call.
* @deprecated will be removed in jclouds 1.7, as async interfaces are no
* longer supported. Please use
* {@link #getBlobStore()}
*/
@Deprecated
AsyncBlobStore getAsyncBlobStore();
/**
@ -104,7 +117,9 @@ public interface BlobStoreContext extends Closeable, View {
/**
*
* @return best guess at the consistency model used in this BlobStore.
* @deprecated will be removed in jclouds 1.7, as almost never correct.
*/
@Deprecated
ConsistencyModel getConsistencyModel();

2
blobstore/src/main/java/org/jclouds/blobstore/InputStreamMap.java
View File

@ -38,7 +38,9 @@ import com.google.inject.ImplementedBy;
* {@link #putFile(String, File)} or {@link S3ObjectMap} instead.
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
@ImplementedBy(InputStreamMapImpl.class)
public interface InputStreamMap extends ListableMap<String, InputStream> {
public static interface Factory {

2
blobstore/src/main/java/org/jclouds/blobstore/ListableMap.java
View File

@ -27,7 +27,9 @@ import org.jclouds.blobstore.domain.StorageMetadata;
*
* @author Adrian Cole
*
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
public interface ListableMap<K, V> extends Map<K, V> {
/**

4
blobstore/src/main/java/org/jclouds/blobstore/LocalAsyncBlobStore.java
View File

@ -42,6 +42,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.jclouds.Constants;
import org.jclouds.blobstore.config.LocalBlobStore;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.Blob.Factory;
import org.jclouds.blobstore.domain.BlobMetadata;
@ -89,7 +90,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
* @author Alfredo "Rainbowbreeze" Morresi
* @author Andrew Gaul
* @author James Murty
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please create and use {@link LocalBlobStore}
*/
@Deprecated
public class LocalAsyncBlobStore extends BaseAsyncBlobStore {
@Resource

3
blobstore/src/main/java/org/jclouds/blobstore/internal/BaseAsyncBlobStore.java
View File

@ -52,7 +52,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link org.jclouds.blobstore.BlobStore}
*/
@Deprecated
public abstract class BaseAsyncBlobStore implements AsyncBlobStore {
protected final BlobStoreContext context;

2
blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java
View File

@ -49,7 +49,9 @@ import com.google.common.collect.ImmutableSet;
*
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
public abstract class BaseBlobMap<V> implements ListableMap<String, V> {
protected final BlobStore blobstore;
protected final String containerName;

2
blobstore/src/main/java/org/jclouds/blobstore/internal/BlobMapImpl.java
View File

@ -48,7 +48,9 @@ import com.google.common.collect.ImmutableSet;
* @see BaseBlobMap
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
public class BlobMapImpl extends BaseBlobMap<Blob> implements BlobMap {
public static class CorrectBlobName implements Function<java.util.Map.Entry<? extends String, ? extends Blob>, Blob> {
private final Function<String, String> prefixer;

2
blobstore/src/main/java/org/jclouds/blobstore/internal/InputStreamMapImpl.java
View File

@ -61,7 +61,9 @@ import com.google.common.base.Throwables;
* @see BlobStore
* @see InputStreamMap
* @see BaseBlobMap
* @deprecated will be removed in jclouds 1.7. Please use {@link BlobStore}
*/
@Deprecated
public class InputStreamMapImpl extends BaseBlobMap<InputStream> implements InputStreamMap {
@Inject

3
providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3AsyncBlobStore.java
View File

@ -64,7 +64,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
*
* @author Tibor Kiss, Andrei Savu
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link AWSS3BlobStore}
*/
@Deprecated
public class AWSS3AsyncBlobStore extends S3AsyncBlobStore {
private final Provider<AsyncMultipartUploadStrategy> multipartUploadStrategy;

3
providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/AzureAsyncBlobStore.java
View File

@ -67,7 +67,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link AzureBlobStore}
*/
@Deprecated
@Singleton
public class AzureAsyncBlobStore extends BaseAsyncBlobStore {
private final AzureBlobAsyncClient async;

3
providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/HPCloudObjectStorageAsyncBlobStore.java
View File

@ -55,7 +55,10 @@ import com.google.common.util.concurrent.ListeningExecutorService;
/**
*
* @author Adrian Cole
* @deprecated will be removed in jclouds 1.7, as async interfaces are no longer
* supported. Please use {@link HPCloudObjectStorageBlobStore}
*/
@Deprecated
@Singleton
public class HPCloudObjectStorageAsyncBlobStore extends SwiftAsyncBlobStore {
private final EnableCDNAndCache enableAndCache;