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 4dc91b23e2..103e2b7658 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 @@ -31,10 +31,10 @@ 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; -import org.jclouds.openstack.swift.v1.blobstore.internal.SubmissionAsyncBlobStore; import org.jclouds.rest.Utils; import com.google.common.base.Function; diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/internal/SubmissionAsyncBlobStore.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/internal/SubmissionAsyncBlobStore.java deleted file mode 100644 index 41580f75f8..0000000000 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/internal/SubmissionAsyncBlobStore.java +++ /dev/null @@ -1,293 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.openstack.swift.v1.blobstore.internal; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.Constants.PROPERTY_USER_THREADS; - -import java.util.Set; -import java.util.concurrent.Callable; - -import javax.inject.Inject; -import javax.inject.Named; - -import org.jclouds.blobstore.AsyncBlobStore; -import org.jclouds.blobstore.BlobStore; -import org.jclouds.blobstore.BlobStoreContext; -import org.jclouds.blobstore.domain.Blob; -import org.jclouds.blobstore.domain.BlobBuilder; -import org.jclouds.blobstore.domain.BlobMetadata; -import org.jclouds.blobstore.domain.PageSet; -import org.jclouds.blobstore.domain.StorageMetadata; -import org.jclouds.blobstore.options.CreateContainerOptions; -import org.jclouds.blobstore.options.GetOptions; -import org.jclouds.blobstore.options.ListContainerOptions; -import org.jclouds.blobstore.options.PutOptions; -import org.jclouds.domain.Location; - -import com.google.common.collect.ForwardingObject; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; - -/** - * Adapter that allows you to reuse an existing {@link BlobStore} to implement - * the deprecated {@link AsyncBlobStore} interface. - * - * @deprecated will be removed in jclouds 1.7, as async interfaces are no longer - * supported. Please use {@link BlobStore} - */ -@Deprecated -public class SubmissionAsyncBlobStore extends ForwardingObject implements AsyncBlobStore { - private final BlobStore blobstore; - private final ListeningExecutorService executor; - - @Inject - public SubmissionAsyncBlobStore(BlobStore blobstore, @Named(PROPERTY_USER_THREADS) ListeningExecutorService executor) { - this.blobstore = checkNotNull(blobstore, "blobstore"); - this.executor = checkNotNull(executor, "executor"); - } - - @Override - protected BlobStore delegate() { - return blobstore; - } - - @Override - public BlobStoreContext getContext() { - return delegate().getContext(); - } - - @Override - public BlobBuilder blobBuilder(String name) { - return delegate().blobBuilder(name); - } - - @Override - public ListenableFuture> listAssignableLocations() { - return executor.submit(new Callable>() { - public Set call() { - return delegate().listAssignableLocations(); - } - }); - } - - @Override - public ListenableFuture> list() { - return executor.submit(new Callable>() { - public PageSet call() { - return delegate().list(); - } - }); - } - - @Override - public ListenableFuture containerExists(final String container) { - return executor.submit(new Callable() { - public Boolean call() { - return delegate().containerExists(container); - } - }); - } - - @Override - public ListenableFuture createContainerInLocation(final Location location, final String container) { - return executor.submit(new Callable() { - public Boolean call() { - return delegate().createContainerInLocation(location, container); - } - }); - } - - @Override - public ListenableFuture createContainerInLocation(final Location location, final String container, - final CreateContainerOptions options) { - return executor.submit(new Callable() { - public Boolean call() { - return delegate().createContainerInLocation(location, container, options); - } - }); - } - - @Override - public ListenableFuture> list(final String container) { - return executor.submit(new Callable>() { - public PageSet call() { - return delegate().list(container); - } - }); - } - - @Override - public ListenableFuture> list(final String container, - final ListContainerOptions options) { - return executor.submit(new Callable>() { - public PageSet call() { - return delegate().list(container, options); - } - }); - } - - @Override - public ListenableFuture clearContainer(final String container) { - return executor.submit(new Callable() { - public Void call() { - delegate().clearContainer(container); - return null; - } - }); - } - - @Override - public ListenableFuture clearContainer(final String container, final ListContainerOptions options) { - return executor.submit(new Callable() { - public Void call() { - delegate().clearContainer(container, options); - return null; - } - }); - } - - @Override - public ListenableFuture deleteContainer(final String container) { - return executor.submit(new Callable() { - public Void call() { - delegate().deleteContainer(container); - return null; - } - }); - } - - @Override - public ListenableFuture deleteContainerIfEmpty(final String container) { - return executor.submit(new Callable() { - public Boolean call() { - return delegate().deleteContainerIfEmpty(container); - } - }); - } - - @Override - public ListenableFuture directoryExists(final String container, final String directory) { - return executor.submit(new Callable() { - public Boolean call() { - return delegate().directoryExists(container, directory); - } - }); - } - - @Override - public ListenableFuture createDirectory(final String container, final String directory) { - return executor.submit(new Callable() { - public Void call() { - delegate().createDirectory(container, directory); - return null; - } - }); - } - - @Override - public ListenableFuture deleteDirectory(final String containerName, final String name) { - return executor.submit(new Callable() { - public Void call() { - delegate().deleteDirectory(containerName, name); - return null; - } - }); - } - - @Override - public ListenableFuture blobExists(final String container, final String name) { - return executor.submit(new Callable() { - public Boolean call() { - return delegate().blobExists(container, name); - } - }); - } - - @Override - public ListenableFuture putBlob(final String container, final Blob blob) { - return executor.submit(new Callable() { - public String call() { - return delegate().putBlob(container, blob); - } - }); - } - - @Override - public ListenableFuture putBlob(final String container, final Blob blob, final PutOptions options) { - return executor.submit(new Callable() { - public String call() { - return delegate().putBlob(container, blob, options); - } - }); - } - - @Override - public ListenableFuture blobMetadata(final String container, final String key) { - return executor.submit(new Callable() { - public BlobMetadata call() { - return delegate().blobMetadata(container, key); - } - }); - } - - @Override - public ListenableFuture getBlob(final String container, final String key) { - return executor.submit(new Callable() { - public Blob call() { - return delegate().getBlob(container, key); - } - }); - } - - @Override - public ListenableFuture getBlob(final String container, final String key, final GetOptions options) { - return executor.submit(new Callable() { - public Blob call() { - return delegate().getBlob(container, key, options); - } - }); - } - - @Override - public ListenableFuture removeBlob(final String container, final String key) { - return executor.submit(new Callable() { - public Void call() { - delegate().removeBlob(container, key); - return null; - } - }); - } - - @Override - public ListenableFuture countBlobs(final String container) { - return executor.submit(new Callable() { - public Long call() { - return delegate().countBlobs(container); - } - }); - } - - @Override - public ListenableFuture countBlobs(final String container, final ListContainerOptions options) { - return executor.submit(new Callable() { - public Long call() { - return delegate().countBlobs(container, options); - } - }); - } -}