You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/05 01:07:22 UTC
[1/2] git commit: Add snapshot repository so modernizer doesn't fail.
Repository: jclouds-labs-google
Updated Branches:
refs/heads/1.8.x 853e55ebd -> 3ee7c1426
Add snapshot repository so modernizer doesn't fail.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/9bbb3354
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/9bbb3354
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/9bbb3354
Branch: refs/heads/1.8.x
Commit: 9bbb3354d497c36d7f2a5eb8f2764662f82d437a
Parents: 853e55e
Author: Adrian Cole <ad...@gmail.com>
Authored: Sat Oct 4 11:13:37 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sat Oct 4 16:06:58 2014 -0700
----------------------------------------------------------------------
pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/9bbb3354/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbaa097..0116f55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,20 @@
</repository>
</repositories>
+ <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<modules>
<module>oauth</module>
<module>google-cloud-storage</module>
[2/2] git commit: JCLOUDS-40 switch to SubmissionAsyncBlobStore
Posted by ad...@apache.org.
JCLOUDS-40 switch to SubmissionAsyncBlobStore
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/3ee7c142
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/3ee7c142
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/3ee7c142
Branch: refs/heads/1.8.x
Commit: 3ee7c14265e15e8e2f2fb0166fee9610363093c5
Parents: 9bbb335
Author: Adrian Cole <ad...@gmail.com>
Authored: Sat Oct 4 11:14:30 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sat Oct 4 16:07:03 2014 -0700
----------------------------------------------------------------------
.../blobstore/GCSAsyncBlobStore.java | 289 -------------------
.../config/GCSBlobStoreContextModule.java | 8 +-
2 files changed, 4 insertions(+), 293 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/3ee7c142/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GCSAsyncBlobStore.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GCSAsyncBlobStore.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GCSAsyncBlobStore.java
deleted file mode 100644
index 955cf9b..0000000
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/GCSAsyncBlobStore.java
+++ /dev/null
@@ -1,289 +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.googlecloudstorage.blobstore;
-
-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.Singleton;
-
-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;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-
-@SuppressWarnings("deprecation")
-@Singleton
-public class GCSAsyncBlobStore extends ForwardingObject implements AsyncBlobStore {
- private final BlobStore blobstore;
- private final ListeningExecutorService executor;
-
- @Inject
- public GCSAsyncBlobStore(BlobStore blobstore, @Named(PROPERTY_USER_THREADS) ListeningExecutorService executor) {
- this.blobstore = checkNotNull(blobstore, "blobstore");
- this.executor = checkNotNull(executor, "executor");
- }
-
- @Override
- public BlobStoreContext getContext() {
- return delegate().getContext();
- }
-
- @Override
- public BlobBuilder blobBuilder(String name) {
- return delegate().blobBuilder(name);
- }
-
- @Override
- public ListenableFuture<Set<? extends Location>> listAssignableLocations() {
- return executor.submit(new Callable<Set<? extends Location>>() {
- public Set<? extends Location> call() {
- return delegate().listAssignableLocations();
- }
- });
- }
-
- @Override
- public ListenableFuture<PageSet<? extends StorageMetadata>> list() {
- return executor.submit(new Callable<PageSet<? extends StorageMetadata>>() {
- public PageSet<? extends StorageMetadata> call() {
- return delegate().list();
- }
- });
- }
-
- @Override
- public ListenableFuture<Boolean> containerExists(final String container) {
- return executor.submit(new Callable<Boolean>() {
- public Boolean call() {
- return delegate().containerExists(container);
- }
- });
- }
-
- @Override
- public ListenableFuture<Boolean> createContainerInLocation(final Location location, final String container) {
- return executor.submit(new Callable<Boolean>() {
- public Boolean call() {
- return delegate().createContainerInLocation(location, container);
- }
- });
- }
-
- @Override
- public ListenableFuture<Boolean> createContainerInLocation(final Location location, final String container,
- final CreateContainerOptions options) {
- return executor.submit(new Callable<Boolean>() {
- public Boolean call() {
- return delegate().createContainerInLocation(location, container, options);
- }
- });
- }
-
- @Override
- public ListenableFuture<PageSet<? extends StorageMetadata>> list(final String container) {
- return executor.submit(new Callable<PageSet<? extends StorageMetadata>>() {
- public PageSet<? extends StorageMetadata> call() {
- return delegate().list(container);
- }
- });
-
- }
-
- @Override
- public ListenableFuture<PageSet<? extends StorageMetadata>> list(final String container,
- final ListContainerOptions options) {
- return executor.submit(new Callable<PageSet<? extends StorageMetadata>>() {
- public PageSet<? extends StorageMetadata> call() {
- return delegate().list(container, options);
- }
- });
- }
-
- @Override
- public ListenableFuture<Void> clearContainer(final String container) {
- return executor.submit(new Callable<Void>() {
- public Void call() {
- delegate().clearContainer(container);
- return null;
- }
- });
- }
-
- @Override
- public ListenableFuture<Void> clearContainer(final String container, final ListContainerOptions options) {
- return executor.submit(new Callable<Void>() {
- public Void call() {
- delegate().clearContainer(container, options);
- return null;
- }
- });
- }
-
- @Override
- public ListenableFuture<Void> deleteContainer(final String container) {
- return executor.submit(new Callable<Void>() {
- public Void call() {
- delegate().deleteContainer(container);
- return null;
- }
- });
- }
-
- @Override
- public ListenableFuture<Boolean> deleteContainerIfEmpty(final String container) {
- return executor.submit(new Callable<Boolean>() {
- public Boolean call() {
- return delegate().deleteContainerIfEmpty(container);
- }
- });
- }
-
- @Override
- public ListenableFuture<Boolean> directoryExists(final String container, final String directory) {
- return executor.submit(new Callable<Boolean>() {
- public Boolean call() {
- return delegate().directoryExists(container, directory);
- }
- });
- }
-
- @Override
- public ListenableFuture<Void> createDirectory(final String container, final String directory) {
- return executor.submit(new Callable<Void>() {
- public Void call() {
- delegate().createDirectory(container, directory);
- return null;
- }
- });
- }
-
- @Override
- public ListenableFuture<Void> deleteDirectory(final String containerName, final String name) {
- return executor.submit(new Callable<Void>() {
- public Void call() {
- delegate().deleteDirectory(containerName, name);
- return null;
- }
- });
- }
-
- @Override
- public ListenableFuture<Boolean> blobExists(final String container, final String name) {
- return executor.submit(new Callable<Boolean>() {
- public Boolean call() {
- return delegate().blobExists(container, name);
- }
- });
- }
-
- @Override
- public ListenableFuture<String> putBlob(final String container, final Blob blob) {
- return executor.submit(new Callable<String>() {
- public String call() {
- return delegate().putBlob(container, blob);
- }
- });
- }
-
- @Override
- public ListenableFuture<String> putBlob(final String container, final Blob blob, final PutOptions options) {
- return executor.submit(new Callable<String>() {
- public String call() {
- return delegate().putBlob(container, blob, options);
- }
- });
- }
-
- @Override
- public ListenableFuture<BlobMetadata> blobMetadata(final String container, final String key) {
- return executor.submit(new Callable<BlobMetadata>() {
- public BlobMetadata call() {
- return delegate().blobMetadata(container, key);
- }
- });
- }
-
- @Override
- public ListenableFuture<Blob> getBlob(final String container, final String key) {
- return executor.submit(new Callable<Blob>() {
- public Blob call() {
- return delegate().getBlob(container, key);
- }
- });
- }
-
- @Override
- public ListenableFuture<Blob> getBlob(final String container, final String key, final GetOptions options) {
- return executor.submit(new Callable<Blob>() {
- public Blob call() {
- return delegate().getBlob(container, key, options);
- }
- });
- }
-
- @Override
- public ListenableFuture<Void> removeBlob(final String container, final String key) {
- return executor.submit(new Callable<Void>() {
- public Void call() {
- delegate().removeBlob(container, key);
- return null;
- }
- });
- }
-
- @Override
- public ListenableFuture<Long> countBlobs(final String container) {
- return executor.submit(new Callable<Long>() {
- public Long call() {
- return delegate().countBlobs(container);
- }
- });
- }
-
- @Override
- public ListenableFuture<Long> countBlobs(final String container, final ListContainerOptions options) {
- return executor.submit(new Callable<Long>() {
- public Long call() {
- return delegate().countBlobs(container, options);
- }
- });
- }
-
- @Override
- protected BlobStore delegate() {
- return blobstore;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/3ee7c142/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/config/GCSBlobStoreContextModule.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/config/GCSBlobStoreContextModule.java b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/config/GCSBlobStoreContextModule.java
index f10cadc..15a36de 100644
--- a/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/config/GCSBlobStoreContextModule.java
+++ b/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/blobstore/config/GCSBlobStoreContextModule.java
@@ -16,13 +16,13 @@
*/
package org.jclouds.googlecloudstorage.blobstore.config;
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.attr.ConsistencyModel;
-import org.jclouds.googlecloudstorage.blobstore.GCSAsyncBlobStore;
+import org.jclouds.blobstore.internal.SubmissionAsyncBlobStore;
import org.jclouds.googlecloudstorage.blobstore.GCSBlobStore;
-import com.google.inject.AbstractModule;
-import com.google.inject.Scopes;
public class GCSBlobStoreContextModule extends AbstractModule {
@@ -30,6 +30,6 @@ public class GCSBlobStoreContextModule extends AbstractModule {
protected void configure() {
bind(ConsistencyModel.class).toInstance(ConsistencyModel.EVENTUAL);
bind(BlobStore.class).to(GCSBlobStore.class).in(Scopes.SINGLETON);
- bind(AsyncBlobStore.class).to(GCSAsyncBlobStore.class).in(Scopes.SINGLETON);
+ bind(AsyncBlobStore.class).to(SubmissionAsyncBlobStore.class).in(Scopes.SINGLETON);
}
}