From a35a0f84abd40f60671e17423a353aa0ee3ebb5b Mon Sep 17 00:00:00 2001 From: "adrian.f.cole" Date: Tue, 17 Nov 2009 21:20:38 +0000 Subject: [PATCH] updated to latest guice git-svn-id: http://jclouds.googlecode.com/svn/trunk@2300 3d8758e0-26b5-11de-8745-db77d3ebf521 --- .../internal/BaseAtmosBlobStore.java | 2 +- .../blobstore/strategy/RecursiveRemove.java | 2 +- .../AtmosStorageClientErrorRetryHandler.java | 3 +- .../handlers/AWSClientErrorRetryHandler.java | 3 +- aws/demos/googleappengine/pom.xml | 2 +- .../AzureBlobClientErrorRetryHandler.java | 3 +- core/pom.xml | 4 +- .../functions/ClearAndDeleteIfNotEmpty.java | 2 +- .../blobstore/internal/BaseBlobMap.java | 2 +- .../internal/DeleteAllKeysInList.java | 2 +- .../GetAllBlobsInListAndRetryOnFailure.java | 2 +- .../internal/ListBlobMetadataInContainer.java | 6 +- .../handlers/BackoffLimitedRetryHandler.java | 3 +- .../http/handlers/DelegatingErrorHandler.java | 2 +- .../http/handlers/DelegatingRetryHandler.java | 3 +- .../handlers/RedirectionRetryHandler.java | 2 +- .../JavaUrlHttpCommandExecutorService.java | 2 +- ...ransformingHttpCommandExecutorService.java | 1 + .../http/pool/HttpCommandConnectionPool.java | 3 +- ...ctionPoolCommandExecutorServiceModule.java | 6 +- .../jclouds/predicates/AddressReachable.java | 64 +++++++++++++++++++ .../org/jclouds/predicates/SocketOpen.java | 2 +- .../rest/internal/AsyncRestClientProxy.java | 5 +- demos/gae-tweetstore/pom.xml | 2 +- 24 files changed, 99 insertions(+), 29 deletions(-) create mode 100644 core/src/main/java/org/jclouds/predicates/AddressReachable.java diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/internal/BaseAtmosBlobStore.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/internal/BaseAtmosBlobStore.java index 16535f02bf..3be3eac255 100644 --- a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/internal/BaseAtmosBlobStore.java +++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/internal/BaseAtmosBlobStore.java @@ -28,7 +28,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.atmosonline.saas.AtmosStorageAsyncClient; @@ -46,6 +45,7 @@ import org.jclouds.concurrent.FutureFunctionWrapper; import org.jclouds.logging.Logger.LoggerFactory; import com.google.common.base.Function; +import com.google.inject.Inject; public class BaseAtmosBlobStore { protected final AtmosStorageAsyncClient async; diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/RecursiveRemove.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/RecursiveRemove.java index 59c1de894c..3dfde346e8 100644 --- a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/RecursiveRemove.java +++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/RecursiveRemove.java @@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -50,6 +49,7 @@ import org.jclouds.util.Utils; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * Recursively remove a path. diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/AtmosStorageClientErrorRetryHandler.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/AtmosStorageClientErrorRetryHandler.java index e99e3ec8bd..b494062c41 100644 --- a/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/AtmosStorageClientErrorRetryHandler.java +++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/handlers/AtmosStorageClientErrorRetryHandler.java @@ -24,7 +24,6 @@ package org.jclouds.atmosonline.saas.handlers; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.http.HttpCommand; @@ -34,6 +33,8 @@ import org.jclouds.http.HttpRetryHandler; import org.jclouds.logging.Logger; import org.jclouds.util.Utils; +import com.google.inject.Inject; + /** * Handles Retryable responses with error codes in the 4xx range * diff --git a/aws/core/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java b/aws/core/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java index 576d32f9e1..cd7fac7424 100755 --- a/aws/core/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java +++ b/aws/core/src/main/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandler.java @@ -24,7 +24,6 @@ package org.jclouds.aws.handlers; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.aws.domain.AWSError; @@ -37,6 +36,8 @@ import org.jclouds.http.HttpRetryHandler; import org.jclouds.logging.Logger; import org.jclouds.util.Utils; +import com.google.inject.Inject; + /** * Handles Retryable responses with error codes in the 3xx range * diff --git a/aws/demos/googleappengine/pom.xml b/aws/demos/googleappengine/pom.xml index fab1aa7b61..92c171169f 100644 --- a/aws/demos/googleappengine/pom.xml +++ b/aws/demos/googleappengine/pom.xml @@ -65,7 +65,7 @@ com.google.code.guice guice-servlet - 2.1-r1089 + 2.1-r1128 displaytag diff --git a/azure/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java b/azure/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java index edcbd05747..84de7c9877 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java +++ b/azure/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java @@ -24,7 +24,6 @@ package org.jclouds.azure.storage.blob.handlers; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.azure.storage.domain.AzureStorageError; @@ -38,6 +37,8 @@ import org.jclouds.http.handlers.BackoffLimitedRetryHandler; import org.jclouds.logging.Logger; import org.jclouds.util.Utils; +import com.google.inject.Inject; + /** * Handles Retryable responses with error codes in the 4xx range * diff --git a/core/pom.xml b/core/pom.xml index 680534c0b7..94c5ea0394 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -71,11 +71,11 @@ com.google.code.guice guice - 2.1-r1089 + 2.1-r1128 javax.inject - atinject + inject 1.0 diff --git a/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java b/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java index 3d2271ba03..64262c0009 100644 --- a/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java +++ b/core/src/main/java/org/jclouds/blobstore/functions/ClearAndDeleteIfNotEmpty.java @@ -26,7 +26,6 @@ package org.jclouds.blobstore.functions; import java.lang.reflect.Constructor; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.blobstore.AsyncBlobStore; @@ -39,6 +38,7 @@ import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.util.Utils; import com.google.common.base.Function; +import com.google.inject.Inject; public class ClearAndDeleteIfNotEmpty implements Function, InvocationContext { static final Void v; diff --git a/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java b/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java index a1f2d0fdda..0988c23c9c 100755 --- a/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java +++ b/core/src/main/java/org/jclouds/blobstore/internal/BaseBlobMap.java @@ -30,7 +30,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.blobstore.AsyncBlobStore; @@ -54,6 +53,7 @@ import org.jclouds.util.Utils; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * Implements core Map functionality with an {@link AsyncBlobStore} diff --git a/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java index 054e2e4d5a..7de85d8857 100644 --- a/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java +++ b/core/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java @@ -27,7 +27,6 @@ import java.util.Set; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -43,6 +42,7 @@ import org.jclouds.blobstore.strategy.ListBlobMetadataStrategy; import org.jclouds.util.Utils; import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * Deletes all keys in the container diff --git a/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java index ace6c4e899..ee128dc0da 100644 --- a/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java +++ b/core/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java @@ -32,7 +32,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -50,6 +49,7 @@ import org.jclouds.util.Utils; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * Retrieves all blobs in the blobstore under the current path, by the most efficient means diff --git a/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java b/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java index 436df0a76e..f4c7d6f3eb 100644 --- a/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java +++ b/core/src/main/java/org/jclouds/blobstore/strategy/internal/ListBlobMetadataInContainer.java @@ -26,7 +26,6 @@ package org.jclouds.blobstore.strategy.internal; import java.util.SortedSet; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -42,6 +41,7 @@ import org.jclouds.blobstore.strategy.ListBlobMetadataStrategy; import org.jclouds.util.Utils; import com.google.common.collect.Sets; +import com.google.inject.Inject; /** * Retrieves all blobs in the blobstore by the most efficient means possible. @@ -65,8 +65,8 @@ public class ListBlobMetadataInContainer implements ListBlobMetadataStrategy { public SortedSet execute(String container, ListContainerOptions options) { try { - ListResponse resources = connection.list(container, - options).get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); + ListResponse resources = connection.list(container, options) + .get(requestTimeoutMilliseconds, TimeUnit.MILLISECONDS); SortedSet blobM = Sets.newTreeSet(); for (ResourceMetadata from : resources) { if (from.getType() == ResourceType.BLOB) diff --git a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java index 54422e4430..083d092623 100644 --- a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java @@ -24,7 +24,6 @@ package org.jclouds.http.handlers; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import org.apache.commons.io.IOUtils; @@ -35,6 +34,8 @@ import org.jclouds.http.HttpRetryHandler; import org.jclouds.http.TransformingHttpCommand; import org.jclouds.logging.Logger; +import com.google.inject.Inject; + /** * Allow replayable request to be retried a limited number of times, and impose an exponential * back-off delay before returning. diff --git a/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java b/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java index 4acefd50c3..ef2d33d9b7 100644 --- a/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/DelegatingErrorHandler.java @@ -31,7 +31,7 @@ import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; import com.google.common.annotations.VisibleForTesting; -import javax.inject.Inject; +import com.google.inject.Inject; /** * Delegates to {@link HttpErrorHandler HttpErrorHandlers} who are annotated according to the diff --git a/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java index 80dcc8c463..3bf19099e4 100644 --- a/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/DelegatingRetryHandler.java @@ -23,8 +23,6 @@ */ package org.jclouds.http.handlers; -import javax.inject.Inject; - import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpRetryHandler; @@ -33,6 +31,7 @@ import org.jclouds.http.annotation.Redirection; import org.jclouds.http.annotation.ServerError; import com.google.common.annotations.VisibleForTesting; +import com.google.inject.Inject; /** * Delegates to {@link HttpRetryHandler HttpRetryHandlers} who are annotated according to the diff --git a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java index c55ee55f18..fe6d1558d6 100644 --- a/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java +++ b/core/src/main/java/org/jclouds/http/handlers/RedirectionRetryHandler.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.net.URI; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriBuilder; @@ -41,6 +40,7 @@ import org.jclouds.http.HttpRetryHandler; import org.jclouds.logging.Logger; import com.google.common.annotations.VisibleForTesting; +import com.google.inject.Inject; /** * Handles Retryable responses with error codes in the 3xx range diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java index 4c6252a5e6..be0b1df73f 100644 --- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java @@ -34,7 +34,6 @@ import java.net.URL; import java.util.Map; import java.util.concurrent.ExecutorService; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; import javax.net.ssl.HostnameVerifier; @@ -51,6 +50,7 @@ import org.jclouds.http.handlers.DelegatingErrorHandler; import org.jclouds.http.handlers.DelegatingRetryHandler; import com.google.common.collect.Maps; +import com.google.inject.Inject; /** * Basic implementation of a {@link HttpCommandExecutorService}. diff --git a/core/src/main/java/org/jclouds/http/pool/ConnectionPoolTransformingHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/pool/ConnectionPoolTransformingHttpCommandExecutorService.java index 24cf7498cb..23f813753f 100644 --- a/core/src/main/java/org/jclouds/http/pool/ConnectionPoolTransformingHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/pool/ConnectionPoolTransformingHttpCommandExecutorService.java @@ -143,6 +143,7 @@ public class ConnectionPoolTransformingHttpCommandExecutorService extends Bas // should block and immediately parse the response on exit. Future future = executorService.submit(new Callable() { Logger transformerLogger = logFactory.getLogger(responseTransformer.getClass().getName()); + public T call() throws Exception { Object o = channel.take(); if (o instanceof Exception) { diff --git a/core/src/main/java/org/jclouds/http/pool/HttpCommandConnectionPool.java b/core/src/main/java/org/jclouds/http/pool/HttpCommandConnectionPool.java index c381fcdd65..a590379190 100644 --- a/core/src/main/java/org/jclouds/http/pool/HttpCommandConnectionPool.java +++ b/core/src/main/java/org/jclouds/http/pool/HttpCommandConnectionPool.java @@ -31,12 +31,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.http.HttpCommandRendezvous; import org.jclouds.lifecycle.BaseLifeCycle; +import com.google.inject.Inject; + /** * // TODO: Adrian: Document this! * diff --git a/core/src/main/java/org/jclouds/http/pool/config/ConnectionPoolCommandExecutorServiceModule.java b/core/src/main/java/org/jclouds/http/pool/config/ConnectionPoolCommandExecutorServiceModule.java index cd1859c309..7aeb9cc356 100644 --- a/core/src/main/java/org/jclouds/http/pool/config/ConnectionPoolCommandExecutorServiceModule.java +++ b/core/src/main/java/org/jclouds/http/pool/config/ConnectionPoolCommandExecutorServiceModule.java @@ -27,13 +27,13 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; import javax.inject.Named; import org.jclouds.http.pool.PoolConstants; import org.jclouds.lifecycle.config.LifeCycleModule; import com.google.inject.AbstractModule; +import com.google.inject.Inject; import com.google.inject.Provides; /** @@ -45,11 +45,11 @@ public abstract class ConnectionPoolCommandExecutorServiceModule extends Abst @Inject(optional = true) @Named(PoolConstants.PROPERTY_POOL_MAX_CONNECTIONS) protected int maxConnections = 12; - + @Inject(optional = true) @Named(PoolConstants.PROPERTY_POOL_IO_WORKER_THREADS) protected int maxWorkerThreads = 12; - + protected void configure() { install(new LifeCycleModule()); bind(AtomicInteger.class).toInstance(new AtomicInteger());// max errors diff --git a/core/src/main/java/org/jclouds/predicates/AddressReachable.java b/core/src/main/java/org/jclouds/predicates/AddressReachable.java new file mode 100644 index 0000000000..81c08ad5ca --- /dev/null +++ b/core/src/main/java/org/jclouds/predicates/AddressReachable.java @@ -0,0 +1,64 @@ +/** + * + * Copyright (C) 2009 Cloud Conscious, LLC. + * + * ==================================================================== + * 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.predicates; + +import java.io.IOException; +import java.net.InetAddress; + +import javax.annotation.Resource; +import javax.inject.Named; +import javax.inject.Singleton; + +import org.jclouds.logging.Logger; + +import com.google.common.base.Predicate; +import com.google.inject.Inject; + +/** + * + * Tests to see if an address is reachable. + * + * @author Adrian Cole + */ +@Singleton +public class AddressReachable implements Predicate { + + @Resource + protected Logger logger = Logger.NULL; + + @Inject(optional = true) + @Named("org.jclouds.address_timeout") + private int timeout = 2000; + + @Override + public boolean apply(InetAddress address) { + try { + logger.trace("testing address %s", address); + return address.isReachable(timeout); + } catch (IOException e) { + return false; + } + } + +} diff --git a/core/src/main/java/org/jclouds/predicates/SocketOpen.java b/core/src/main/java/org/jclouds/predicates/SocketOpen.java index cff9945916..8940aca260 100644 --- a/core/src/main/java/org/jclouds/predicates/SocketOpen.java +++ b/core/src/main/java/org/jclouds/predicates/SocketOpen.java @@ -28,13 +28,13 @@ import java.net.InetSocketAddress; import java.net.Socket; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; import org.jclouds.logging.Logger; import com.google.common.base.Predicate; +import com.google.inject.Inject; /** * diff --git a/core/src/main/java/org/jclouds/rest/internal/AsyncRestClientProxy.java b/core/src/main/java/org/jclouds/rest/internal/AsyncRestClientProxy.java index e1c48f05c6..1080b6975f 100755 --- a/core/src/main/java/org/jclouds/rest/internal/AsyncRestClientProxy.java +++ b/core/src/main/java/org/jclouds/rest/internal/AsyncRestClientProxy.java @@ -36,7 +36,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.annotation.Resource; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -49,6 +48,7 @@ import org.jclouds.logging.Logger; import org.jclouds.rest.InvocationContext; import com.google.common.base.Function; +import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.TypeLiteral; import com.google.inject.internal.Nullable; @@ -88,7 +88,8 @@ public class AsyncRestClientProxy implements InvocationHandler { return this.hashCode(); } else if (method.getName().startsWith("new")) { return injector.getInstance(method.getReturnType()); - } else if (util.getDelegateOrNull(method) != null &&Future.class.isAssignableFrom(method.getReturnType())) { + } else if (util.getDelegateOrNull(method) != null + && Future.class.isAssignableFrom(method.getReturnType())) { method = util.getDelegateOrNull(method); logger.trace("Converting %s.%s", declaring.getSimpleName(), method.getName()); Function exceptionParser = util diff --git a/demos/gae-tweetstore/pom.xml b/demos/gae-tweetstore/pom.xml index b761e9a81a..bde7e4ec07 100755 --- a/demos/gae-tweetstore/pom.xml +++ b/demos/gae-tweetstore/pom.xml @@ -88,7 +88,7 @@ com.google.code.guice guice-servlet - 2.1-r1089 + 2.1-r1128 displaytag