You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Adrian Cole <no...@github.com> on 2014/10/06 06:21:44 UTC
[jclouds] remove io executor (#554)
This removes the io executor as we no longer use async http. This also fixes a couple places (namely MPU) where it was accidentally used instead of the user executor.
Note there are a bunch of commits here, but only the last is relevant. The others will disappear once https://github.com/jclouds/jclouds/pull/553 is merged.
You can merge this Pull Request by running:
git pull https://github.com/adriancole/jclouds adrian.remove-io-executor
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/554
-- Commit Summary --
* JCLOUDS-49 clear remaining async stuff from openstack
* JCLOUDS-152 remove RestContext and its dependencies.
* JCLOUDS-150 clear remaining async stuff from aws
* JCLOUDS-40 one last Async reference in GAE driver.
* JCLOUDS-40 one last Async reference in Atmos.
* JCLOUDS-153 remove IO Executor and usage of it.
-- File Changes --
M apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java (3)
M apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersClient.java (9)
D apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionAsyncApi.java (72)
M apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java (2)
M apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java (3)
M apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java (2)
M apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java (15)
M apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerTest.java (9)
M apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java (14)
M apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java (4)
M common/openstack/src/test/java/org/jclouds/openstack/internal/OpenStackAuthClientTest.java (14)
M compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java (15)
M compute/src/main/java/org/jclouds/compute/stub/extensions/StubSecurityGroupExtension.java (9)
M compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java (4)
M core/src/main/java/org/jclouds/Constants.java (3)
M core/src/main/java/org/jclouds/ContextBuilder.java (47)
M core/src/main/java/org/jclouds/apis/ApiPredicates.java (30)
M core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java (2)
M core/src/main/java/org/jclouds/concurrent/config/ExecutorServiceModule.java (45)
D core/src/main/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawType.java (69)
M core/src/main/java/org/jclouds/http/HttpCommandExecutorService.java (15)
M core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java (38)
M core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java (6)
M core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java (6)
M core/src/main/java/org/jclouds/providers/AnonymousProviderMetadata.java (5)
D core/src/main/java/org/jclouds/rest/AnonymousRestApiMetadata.java (73)
D core/src/main/java/org/jclouds/rest/ConfiguresRestClient.java (32)
D core/src/main/java/org/jclouds/rest/HttpAsyncClient.java (88)
D core/src/main/java/org/jclouds/rest/RestApiMetadata.java (55)
D core/src/main/java/org/jclouds/rest/config/AnnotatedSyncToAsyncHttpApiProvider.java (56)
M core/src/main/java/org/jclouds/rest/config/BinderUtils.java (94)
D core/src/main/java/org/jclouds/rest/config/CallGetOnFuturesProvider.java (57)
D core/src/main/java/org/jclouds/rest/config/RestClientModule.java (119)
D core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java (57)
D core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpInvocationModule.java (145)
D core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java (120)
D core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallySyncToAsyncInvocationFunction.java (72)
D core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java (273)
M core/src/test/java/org/jclouds/ContextBuilderTest.java (16)
M core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java (9)
M core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java (9)
M core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java (9)
M core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java (33)
D core/src/test/java/org/jclouds/config/BindApiContextWithWildcardExtendsExplicitAndRawTypeTest.java (117)
D core/src/test/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawTypeTest.java (123)
M core/src/test/java/org/jclouds/events/config/EventBusModuleTest.java (1)
M core/src/test/java/org/jclouds/http/BaseJettyTest.java (6)
D core/src/test/java/org/jclouds/http/IntegrationTestAsyncClient.java (209)
M core/src/test/java/org/jclouds/http/JavaUrlHttpCommandExecutorServiceIntegrationTest.java (3)
M core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java (4)
M core/src/test/java/org/jclouds/http/handlers/RedirectionRetryHandlerTest.java (9)
M core/src/test/java/org/jclouds/http/internal/TrackingJavaUrlHttpCommandExecutorService.java (16)
M core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java (7)
M core/src/test/java/org/jclouds/providers/config/BindProviderMetadataContextAndCredentialsTest.java (15)
M core/src/test/java/org/jclouds/providers/internal/UpdateProviderMetadataFromPropertiesTest.java (9)
M core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java (9)
M core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java (10)
M core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java (47)
M core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java (24)
M core/src/test/java/org/jclouds/rest/annotationparsing/ProvidesAnnotationExpectTest.java (31)
D core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java (114)
D core/src/test/java/org/jclouds/rest/internal/BaseAsyncClientTest.java (25)
M core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java (12)
D core/src/test/java/org/jclouds/rest/internal/BaseRestApiMetadataTest.java (46)
M core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java (2)
D core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java (171)
M core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java (411)
M drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorService.java (13)
M drivers/apachehc/src/test/java/org/jclouds/http/apachehc/ApacheHCHttpCommandExecutorServiceTestDisabled.java (2)
M drivers/enterprise/src/main/java/org/jclouds/enterprise/config/EnterpriseConfigurationModule.java (10)
D drivers/gae/src/main/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorService.java (175)
M drivers/gae/src/main/java/org/jclouds/gae/GaeHttpCommandExecutorService.java (6)
D drivers/gae/src/main/java/org/jclouds/gae/config/AsyncGoogleAppEngineConfigurationModule.java (57)
M drivers/gae/src/main/java/org/jclouds/gae/config/CurrentRequestExecutorServiceModule.java (7)
M drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java (2)
D drivers/gae/src/main/java/org/jclouds/gae/config/MultithreadedAsyncGoogleAppEngineConfigurationModule.java (64)
R drivers/gae/src/test/java/org/jclouds/gae/GaeHttpCommandExecutorServiceIntegrationTest.java (4)
M drivers/gae/src/test/java/org/jclouds/gae/GaeSocketOpenTest.java (8)
M drivers/okhttp/src/main/java/org/jclouds/http/okhttp/OkHttpCommandExecutorService.java (5)
M drivers/okhttp/src/test/java/org/jclouds/http/okhttp/OkHttpCommandExecutorServiceTest.java (3)
M providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java (14)
M providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java (4)
M providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java (5)
M providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java (2)
M providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java (2)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/554.patch
https://github.com/jclouds/jclouds/pull/554.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554
Re: [jclouds] remove io executor (#554)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests-java-6 #150](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests-java-6/150/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57977164
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
(Blush)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58073535
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
> @@ -34,7 +34,10 @@
> * Integer property. default (20)
> * <p/>
> * Amount of threads servicing the I/O of http connections.
> + *
> + * @deprecated No longer used. Will be removed in jclouds v2
there's nothing for the user to do, except stop using this, in other words :)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554/files#r18462071
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
@demobox ps.. is there some flag I can use locally? checkstyle never fails for me.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58031626
Re: [jclouds] remove io executor (#554)
Posted by Andrew Phillips <no...@github.com>.
> @@ -34,7 +34,10 @@
> * Integer property. default (20)
> * <p/>
> * Amount of threads servicing the I/O of http connections.
> + *
> + * @deprecated No longer used. Will be removed in jclouds v2
Is there some instruction for users as to what they are supposed to do _instead_?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554/files#r18461197
Re: [jclouds] remove io executor (#554)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #1239](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/1239/) UNSTABLE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57980408
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
also note that once this is merged, digitalocean and fgcp in labs will need a trivial fix as they patch the java http executor service.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57973743
Re: [jclouds] remove io executor (#554)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests-java-6 #148](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests-java-6/148/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57973738
Re: [jclouds] remove io executor (#554)
Posted by BuildHive <no...@github.com>.
[jclouds ยป jclouds #1724](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1724/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57987486
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
> @@ -34,7 +34,10 @@
> * Integer property. default (20)
> * <p/>
> * Amount of threads servicing the I/O of http connections.
> + *
> + * @deprecated No longer used. Will be removed in jclouds v2
not supply this as it is no longer valid.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554/files#r18461982
Re: [jclouds] remove io executor (#554)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #1237](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/1237/) UNSTABLE
Looks like there's a problem with this pull request
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57975997
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
will address checkStyle in the fallback pull request unless someone beats me to it. merged into 1.8.x, master.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58031410
Re: [jclouds] remove io executor (#554)
Posted by Andrew Phillips <no...@github.com>.
> is there some flag I can use locally? checkstyle never fails for me.
Weird? What command(s) are you running? Does the version of `RestAnnotationProcessorTest` you're looking at still contain the offending import (`import com.google.common.util.concurrent.ListenableFuture;`)?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58069592
Re: [jclouds] remove io executor (#554)
Posted by Chris Custine <no...@github.com>.
+1
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58025904
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
raising this eagerly mainly to ensure it passes tests, as I may not have time tomorrow to sort through buildhive/checkstyle things.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-57973701
Re: [jclouds] remove io executor (#554)
Posted by Andrew Phillips <no...@github.com>.
> It would be cool if doing mvn clean install implicitly does checkstyle
See https://github.com/jclouds/jclouds/pull/551
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58072531
Re: [jclouds] remove io executor (#554)
Posted by Adrian Cole <no...@github.com>.
for some reason, I thought that checkstyle was implicitly part of install.
I ran checkstyle:check manually this time.
It would be cool if doing mvn clean install implicitly does checkstyle
since that would break things easier, but I guess adding checkstyle:check
is ok.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58071966
Re: [jclouds] remove io executor (#554)
Posted by Andrew Phillips <no...@github.com>.
> jclouds-pull-requests #1239 UNSTABLE
One new [Checkstyle violation](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/1239/org.apache.jclouds$jclouds-core/violations/), but otherwise the code change looks good to me.
Is there anything in the docs that needs to be updated to reflect this?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/554#issuecomment-58030141