Repository: jclouds-labs Updated Branches: refs/heads/1.8.x 33aeae911 -> 3cbc1a465
Fix drift due to async removal in http. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/3cbc1a46 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/3cbc1a46 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/3cbc1a46 Branch: refs/heads/1.8.x Commit: 3cbc1a465c0866b1cd4f136814a4b2c328b4826f Parents: 33aeae9 Author: Adrian Cole <[email protected]> Authored: Mon Oct 6 10:42:11 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Mon Oct 6 11:45:40 2014 -0700 ---------------------------------------------------------------------- ...usFromPayloadHttpCommandExecutorService.java | 5 +---- ...fErrorJavaUrlHttpCommandExecutorService.java | 22 ++++++-------------- 2 files changed, 7 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3cbc1a46/digitalocean/src/main/java/org/jclouds/digitalocean/http/ResponseStatusFromPayloadHttpCommandExecutorService.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/http/ResponseStatusFromPayloadHttpCommandExecutorService.java b/digitalocean/src/main/java/org/jclouds/digitalocean/http/ResponseStatusFromPayloadHttpCommandExecutorService.java index 2fff178..e8b111a 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/http/ResponseStatusFromPayloadHttpCommandExecutorService.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/http/ResponseStatusFromPayloadHttpCommandExecutorService.java @@ -33,7 +33,6 @@ import javax.inject.Singleton; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; -import org.jclouds.Constants; import org.jclouds.digitalocean.domain.BaseResponse; import org.jclouds.digitalocean.domain.BaseResponse.Status; import org.jclouds.http.HttpResponse; @@ -50,7 +49,6 @@ import org.jclouds.io.Payload; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.io.ByteStreams; -import com.google.common.util.concurrent.ListeningExecutorService; /** * Custom implementation of the HTTP driver to read the response body in order to get the real response status. @@ -70,12 +68,11 @@ public class ResponseStatusFromPayloadHttpCommandExecutorService extends JavaUrl @Inject ResponseStatusFromPayloadHttpCommandExecutorService(HttpUtils utils, ContentMetadataCodec contentMetadataCodec, - @Named(Constants.PROPERTY_IO_WORKER_THREADS) ListeningExecutorService ioExecutor, DelegatingRetryHandler retryHandler, IOExceptionRetryHandler ioRetryHandler, DelegatingErrorHandler errorHandler, HttpWire wire, @Named("untrusted") HostnameVerifier verifier, @Named("untrusted") Supplier<SSLContext> untrustedSSLContextProvider, Function<URI, Proxy> proxyForURI, ParseJson<BaseResponse> errorParser) throws SecurityException, NoSuchFieldException { - super(utils, contentMetadataCodec, ioExecutor, retryHandler, ioRetryHandler, errorHandler, wire, verifier, + super(utils, contentMetadataCodec, retryHandler, ioRetryHandler, errorHandler, wire, verifier, untrustedSSLContextProvider, proxyForURI); this.errorParser = checkNotNull(errorParser, "errorParser cannot be null"); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/3cbc1a46/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java index afe3e46..d120c42 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/http/ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService.java @@ -24,12 +24,10 @@ import java.net.Proxy; import java.net.URI; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Singleton; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; -import org.jclouds.Constants; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpUtils; import org.jclouds.http.IOExceptionRetryHandler; @@ -41,7 +39,6 @@ import org.jclouds.io.ContentMetadataCodec; import com.google.common.base.Function; import com.google.common.base.Supplier; -import com.google.common.util.concurrent.ListeningExecutorService; /** * Changes super class' behaviour to return an HTTP response with status code 500 instead of the 200 returned by @@ -52,19 +49,12 @@ public class ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService exten JavaUrlHttpCommandExecutorService { @Inject - public ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService( - HttpUtils utils, - ContentMetadataCodec contentMetadataCodec, - @Named(Constants.PROPERTY_IO_WORKER_THREADS) ListeningExecutorService ioExecutor, - DelegatingRetryHandler retryHandler, - IOExceptionRetryHandler ioRetryHandler, - DelegatingErrorHandler errorHandler, HttpWire wire, - HostnameVerifier verifier, - Supplier<SSLContext> untrustedSSLContextProvider, - Function<URI, Proxy> proxyForURI) throws SecurityException, - NoSuchFieldException { - super(utils, contentMetadataCodec, ioExecutor, retryHandler, - ioRetryHandler, errorHandler, wire, verifier, + public ChangeReturnCodeTo500IfErrorJavaUrlHttpCommandExecutorService(HttpUtils utils, + ContentMetadataCodec contentMetadataCodec, DelegatingRetryHandler retryHandler, + IOExceptionRetryHandler ioRetryHandler, DelegatingErrorHandler errorHandler, HttpWire wire, + HostnameVerifier verifier, Supplier<SSLContext> untrustedSSLContextProvider, Function<URI, Proxy> proxyForURI) + throws SecurityException, NoSuchFieldException { + super(utils, contentMetadataCodec, retryHandler, ioRetryHandler, errorHandler, wire, verifier, untrustedSSLContextProvider, proxyForURI); }
