From 1894b093a385ec7d8cb1368a8899ff0391624883 Mon Sep 17 00:00:00 2001 From: adriancole Date: Wed, 10 Apr 2013 08:13:13 -0700 Subject: [PATCH] naming convention and warning feedback from issue #1511 --- .../config/CloudStackRestClientModule.java | 8 +++--- .../config/MappedAuthenticationApiModule.java | 4 +-- .../v2_0/CloudIdentityApiMetadata.java | 4 +-- ...CloudIdentityAuthenticationApiModule.java} | 6 ++--- .../config/TemporaryUrlExtensionModule.java | 6 ++--- .../vcloud/config/VCloudRestClientModule.java | 6 ++--- .../config/OpenStackAuthenticationModule.java | 4 +-- .../config/AuthenticationServiceModule.java | 4 +-- .../TerremarkVCloudRestClientModule.java | 6 ++--- .../main/java/org/jclouds/ContextBuilder.java | 4 +-- .../org/jclouds/rest/HttpApiMetadata.java | 4 +-- ... AnnotatedSyncToAsyncHttpApiProvider.java} | 10 ++++---- .../org/jclouds/rest/config/BinderUtils.java | 25 ++++++++----------- .../rest/config/CallGetOnFuturesProvider.java | 8 +++--- .../jclouds/rest/config/RestClientModule.java | 10 ++++---- ...r.java => SyncToAsyncHttpApiProvider.java} | 12 ++++----- ...a => SyncToAsyncHttpInvocationModule.java} | 16 ++++++------ .../rest/internal/BaseHttpApiMetadata.java | 6 ++--- ...ntiallySyncToAsyncInvocationFunction.java} | 4 +-- ....java => InvokeSyncToAsyncHttpMethod.java} | 6 ++--- .../MappedHttpInvocationModuleTest.java | 10 ++++---- .../internal/InvokeMappedHttpMethodTest.java | 6 ++--- .../HPCloudObjectStorageApiMetadata.java | 4 +-- .../CloudBlockStorageUKProviderMetadata.java | 4 +-- .../CloudBlockStorageUSProviderMetadata.java | 4 +-- .../uk/CloudServersUKProviderMetadata.java | 4 +-- .../us/CloudServersUSProviderMetadata.java | 4 +-- 27 files changed, 92 insertions(+), 97 deletions(-) rename apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/{MappedCloudIdentityAuthenticationApiModule.java => SyncToAsyncCloudIdentityAuthenticationApiModule.java} (87%) rename core/src/main/java/org/jclouds/rest/config/{AnnotatedMappedHttpApiProvider.java => AnnotatedSyncToAsyncHttpApiProvider.java} (80%) rename core/src/main/java/org/jclouds/rest/config/{MappedHttpApiProvider.java => SyncToAsyncHttpApiProvider.java} (72%) rename core/src/main/java/org/jclouds/rest/config/{MappedHttpInvocationModule.java => SyncToAsyncHttpInvocationModule.java} (90%) rename core/src/main/java/org/jclouds/rest/internal/{DelegatesToPotentiallyMappedInvocationFunction.java => DelegatesToPotentiallySyncToAsyncInvocationFunction.java} (91%) rename core/src/main/java/org/jclouds/rest/internal/{InvokeMappedHttpMethod.java => InvokeSyncToAsyncHttpMethod.java} (97%) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java index fcc9422754..ee7cc7e5da 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java @@ -18,7 +18,7 @@ */ package org.jclouds.cloudstack.config; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -207,9 +207,9 @@ public class CloudStackRestClientModule extends RestClientModule>builder() - .add(MappedCloudIdentityAuthenticationApiModule.class) + .add(SyncToAsyncCloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) .add(KeystoneAdminURLModule.class) .add(KeystoneParserModule.class) diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/MappedCloudIdentityAuthenticationApiModule.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/SyncToAsyncCloudIdentityAuthenticationApiModule.java similarity index 87% rename from apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/MappedCloudIdentityAuthenticationApiModule.java rename to apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/SyncToAsyncCloudIdentityAuthenticationApiModule.java index 1b14939c64..07782db83e 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/MappedCloudIdentityAuthenticationApiModule.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/SyncToAsyncCloudIdentityAuthenticationApiModule.java @@ -18,7 +18,7 @@ */ package org.jclouds.rackspace.cloudidentity.v2_0.config; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import org.jclouds.openstack.keystone.v2_0.AuthenticationApi; import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncApi; @@ -36,13 +36,13 @@ import com.google.inject.Provides; * {@link CloudIdentityAuthenticationApiModule} */ @Deprecated -public class MappedCloudIdentityAuthenticationApiModule extends AbstractModule { +public class SyncToAsyncCloudIdentityAuthenticationApiModule extends AbstractModule { @Override protected void configure() { // AuthenticationApi is used directly for filters and retry handlers, so // let's bind it explicitly - bindMappedHttpApi(binder(), CloudIdentityAuthenticationApi.class, CloudIdentityAuthenticationAsyncApi.class); + bindSyncToAsyncHttpApi(binder(), CloudIdentityAuthenticationApi.class, CloudIdentityAuthenticationAsyncApi.class); } @Provides diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/config/TemporaryUrlExtensionModule.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/config/TemporaryUrlExtensionModule.java index d322c7d943..1da670c9cc 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/config/TemporaryUrlExtensionModule.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/config/TemporaryUrlExtensionModule.java @@ -18,7 +18,7 @@ */ package org.jclouds.openstack.swift.blobstore.config; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import java.util.concurrent.TimeUnit; @@ -70,7 +70,7 @@ public abstract class TemporaryUrlExtensionModule { protected void bindTemporaryUrlKeyApi() { - bindMappedHttpApi(binder(), TemporaryUrlKeyApi.class, KeystoneTemporaryUrlKeyAsyncApi.class); + bindSyncToAsyncHttpApi(binder(), TemporaryUrlKeyApi.class, KeystoneTemporaryUrlKeyAsyncApi.class); } @Override @@ -115,7 +115,7 @@ public abstract class TemporaryUrlExtensionModule>() { }).to(new TypeLiteral() { }); - bindMappedHttpApi(binder(), VCloudVersionsClient.class, VCloudVersionsAsyncClient.class); - bindMappedHttpApi(binder(), VCloudLoginClient.class, VCloudLoginAsyncClient.class); + bindSyncToAsyncHttpApi(binder(), VCloudVersionsClient.class, VCloudVersionsAsyncClient.class); + bindSyncToAsyncHttpApi(binder(), VCloudLoginClient.class, VCloudLoginAsyncClient.class); } protected void bindCacheLoaders() { diff --git a/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java b/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java index 328d5876d6..c71469529b 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/config/OpenStackAuthenticationModule.java @@ -19,7 +19,7 @@ package org.jclouds.openstack.config; import static com.google.common.base.Suppliers.memoizeWithExpiration; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import java.util.Date; import java.util.concurrent.ExecutionException; @@ -59,7 +59,7 @@ public class OpenStackAuthenticationModule extends AbstractModule { @Override protected void configure() { // OpenStackAuthClient is used directly for filters and retry handlers, so let's bind it explicitly - bindMappedHttpApi(binder(), OpenStackAuthClient.class, OpenStackAuthAsyncClient.class); + bindSyncToAsyncHttpApi(binder(), OpenStackAuthClient.class, OpenStackAuthAsyncClient.class); install(new FactoryModuleBuilder().build(URIFromAuthenticationResponseForService.Factory.class)); bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(RetryOnRenew.class); } diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java index 167ab3ce5e..285513d48e 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java @@ -18,7 +18,7 @@ */ package org.jclouds.openstack.keystone.v1_1.config; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import java.util.concurrent.ExecutionException; @@ -60,7 +60,7 @@ public class AuthenticationServiceModule extends AbstractModule { @Override protected void configure() { // ServiceClient is used directly for filters and retry handlers, so let's bind it explicitly - bindMappedHttpApi(binder(), AuthenticationClient.class, AuthenticationAsyncClient.class); + bindSyncToAsyncHttpApi(binder(), AuthenticationClient.class, AuthenticationAsyncClient.class); install(new FactoryModuleBuilder().implement(RegionIdToURISupplier.class, RegionIdToURIFromAuthForServiceSupplier.class).build(RegionIdToURISupplier.Factory.class)); install(new FactoryModuleBuilder().implement(ImplicitRegionIdSupplier.class, V1DefaultRegionIdSupplier.class) diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java index 463767aef4..8227459094 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java @@ -26,7 +26,7 @@ import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Maps.transformValues; import static com.google.common.collect.Maps.uniqueIndex; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import static org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants.PROPERTY_VCLOUD_TIMEOUT_TASK_COMPLETED; import static org.jclouds.util.Predicates2.retry; @@ -134,8 +134,8 @@ public class TerremarkVCloudRestClientModule extends RestClientModule>>() { }).to(new TypeLiteral() { }); - bindMappedHttpApi(binder(), TerremarkVCloudVersionsClient.class, TerremarkVCloudVersionsAsyncClient.class); - bindMappedHttpApi(binder(), TerremarkVCloudLoginClient.class, TerremarkVCloudLoginAsyncClient.class); + bindSyncToAsyncHttpApi(binder(), TerremarkVCloudVersionsClient.class, TerremarkVCloudVersionsAsyncClient.class); + bindSyncToAsyncHttpApi(binder(), TerremarkVCloudLoginClient.class, TerremarkVCloudLoginAsyncClient.class); } @Provides diff --git a/core/src/main/java/org/jclouds/ContextBuilder.java b/core/src/main/java/org/jclouds/ContextBuilder.java index 2a1b6cc8ca..9ee9370ca5 100644 --- a/core/src/main/java/org/jclouds/ContextBuilder.java +++ b/core/src/main/java/org/jclouds/ContextBuilder.java @@ -85,7 +85,7 @@ import org.jclouds.rest.RestApiMetadata; import org.jclouds.rest.RestContext; import org.jclouds.rest.config.CredentialStoreModule; import org.jclouds.rest.config.HttpApiModule; -import org.jclouds.rest.config.MappedHttpInvocationModule; +import org.jclouds.rest.config.SyncToAsyncHttpInvocationModule; import org.jclouds.rest.config.RestClientModule; import org.jclouds.rest.config.RestModule; @@ -524,7 +524,7 @@ public class ContextBuilder { modules.add(new RestClientModule(typeToken(rest.getApi()), typeToken(rest.getAsyncApi()))); } else { modules.add(new RestModule()); - modules.add(new MappedHttpInvocationModule()); + modules.add(new SyncToAsyncHttpInvocationModule()); } } diff --git a/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java b/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java index 759888128b..69e31fa991 100644 --- a/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java +++ b/core/src/main/java/org/jclouds/rest/HttpApiMetadata.java @@ -36,12 +36,12 @@ public interface HttpApiMetadata extends ApiMetadata { /** * @see ApiMetadata#getApi() */ - T javaApi(Class api); + T api(Class api); } /** * - * @return the type of the api which has http annotations on its methods. + * @return the type of the java api which has http annotations on its methods. */ Class getApi(); } diff --git a/core/src/main/java/org/jclouds/rest/config/AnnotatedMappedHttpApiProvider.java b/core/src/main/java/org/jclouds/rest/config/AnnotatedSyncToAsyncHttpApiProvider.java similarity index 80% rename from core/src/main/java/org/jclouds/rest/config/AnnotatedMappedHttpApiProvider.java rename to core/src/main/java/org/jclouds/rest/config/AnnotatedSyncToAsyncHttpApiProvider.java index d51395d82c..0dfb6f6f3a 100644 --- a/core/src/main/java/org/jclouds/rest/config/AnnotatedMappedHttpApiProvider.java +++ b/core/src/main/java/org/jclouds/rest/config/AnnotatedSyncToAsyncHttpApiProvider.java @@ -25,7 +25,7 @@ import javax.inject.Singleton; import org.jclouds.reflect.Invocation; import org.jclouds.rest.internal.DelegatesToInvocationFunction; -import org.jclouds.rest.internal.DelegatesToPotentiallyMappedInvocationFunction; +import org.jclouds.rest.internal.DelegatesToPotentiallySyncToAsyncInvocationFunction; import com.google.common.base.Function; import com.google.inject.Provider; @@ -39,13 +39,13 @@ import com.google.inject.TypeLiteral; */ @Deprecated @Singleton -public class AnnotatedMappedHttpApiProvider implements Provider { +public class AnnotatedSyncToAsyncHttpApiProvider implements Provider { private final Class annotatedApiType; - private final DelegatesToPotentiallyMappedInvocationFunction> httpInvoker; + private final DelegatesToPotentiallySyncToAsyncInvocationFunction> httpInvoker; @Inject - private AnnotatedMappedHttpApiProvider( - DelegatesToPotentiallyMappedInvocationFunction> httpInvoker, + private AnnotatedSyncToAsyncHttpApiProvider( + DelegatesToPotentiallySyncToAsyncInvocationFunction> httpInvoker, TypeLiteral annotatedApiType) { this.httpInvoker = httpInvoker; this.annotatedApiType = annotatedApiType.getRawType(); diff --git a/core/src/main/java/org/jclouds/rest/config/BinderUtils.java b/core/src/main/java/org/jclouds/rest/config/BinderUtils.java index 85c1d181d9..0c4bafb29c 100644 --- a/core/src/main/java/org/jclouds/rest/config/BinderUtils.java +++ b/core/src/main/java/org/jclouds/rest/config/BinderUtils.java @@ -47,10 +47,9 @@ public class BinderUtils { bindAnnotatedHttpApiProvider(binder, api); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "serial" }) private static void bindAnnotatedHttpApiProvider(Binder binder, Class annotated) { TypeToken> token = new TypeToken>() { - private static final long serialVersionUID = 1L; }.where(new TypeParameter() { }, annotated); binder.bind(annotated).toProvider(TypeLiteral.class.cast(TypeLiteral.get(token.getType()))); @@ -75,10 +74,10 @@ public class BinderUtils { * longer supported. */ @Deprecated - public static void bindMappedHttpApi(Binder binder, Class sync, Class async) { + public static void bindSyncToAsyncHttpApi(Binder binder, Class sync, Class async) { bindClass(binder, sync); bindClass(binder, async); - bindAnnotatedMappedHttpApiProvider(binder, async); + bindAnnotatedSyncToAsyncHttpApiProvider(binder, async); bindHttpApiProvider(binder, sync, async); } @@ -87,10 +86,9 @@ public class BinderUtils { * longer supported. */ @Deprecated - @SuppressWarnings("unchecked") - private static void bindAnnotatedMappedHttpApiProvider(Binder binder, Class annotated) { - TypeToken> token = new TypeToken>() { - private static final long serialVersionUID = 1L; + @SuppressWarnings({ "unchecked", "serial" }) + private static void bindAnnotatedSyncToAsyncHttpApiProvider(Binder binder, Class annotated) { + TypeToken> token = new TypeToken>() { }.where(new TypeParameter() { }, annotated); binder.bind(annotated).toProvider(TypeLiteral.class.cast(TypeLiteral.get(token.getType()))); @@ -102,10 +100,9 @@ public class BinderUtils { * longer supported. */ @Deprecated - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "serial" }) private static void bindHttpApiProvider(Binder binder, Class sync, Class async) { - TypeToken> token = new TypeToken>() { - private static final long serialVersionUID = 1L; + TypeToken> token = new TypeToken>() { }.where(new TypeParameter() { }, sync).where(new TypeParameter() { }, async); @@ -143,20 +140,18 @@ public class BinderUtils { * longer supported. */ @Deprecated - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "serial" }) private static void bindCallGetOnFutures(Binder binder, Class sync, Class async) { TypeToken> token = new TypeToken>() { - private static final long serialVersionUID = 1L; }.where(new TypeParameter() { }, sync).where(new TypeParameter() { }, async); binder.bind(sync).toProvider(TypeLiteral.class.cast(TypeLiteral.get(token.getType()))); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "serial" }) private static void bindClass(Binder binder, Class sync) { binder.bind(TypeLiteral.class.cast(TypeLiteral.get(new TypeToken>() { - private static final long serialVersionUID = 1L; }.where(new TypeParameter() { }, sync).getType()))).toInstance(sync); } diff --git a/core/src/main/java/org/jclouds/rest/config/CallGetOnFuturesProvider.java b/core/src/main/java/org/jclouds/rest/config/CallGetOnFuturesProvider.java index 30bb4f23b7..5a297e3e3b 100644 --- a/core/src/main/java/org/jclouds/rest/config/CallGetOnFuturesProvider.java +++ b/core/src/main/java/org/jclouds/rest/config/CallGetOnFuturesProvider.java @@ -24,7 +24,7 @@ import java.lang.reflect.Proxy; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.rest.internal.DelegatesToPotentiallyMappedInvocationFunction; +import org.jclouds.rest.internal.DelegatesToPotentiallySyncToAsyncInvocationFunction; import org.jclouds.rest.internal.InvokeAndCallGetOnFutures; import com.google.common.cache.Cache; @@ -40,15 +40,15 @@ import com.google.inject.Provider; public class CallGetOnFuturesProvider implements Provider { private final Class apiType; - private final DelegatesToPotentiallyMappedInvocationFunction> syncInvoker; + private final DelegatesToPotentiallySyncToAsyncInvocationFunction> syncInvoker; @Inject private CallGetOnFuturesProvider(Cache, Invokable> invokables, - DelegatesToPotentiallyMappedInvocationFunction> syncInvoker, Class apiType, + DelegatesToPotentiallySyncToAsyncInvocationFunction> syncInvoker, Class apiType, Class asyncApiType) { this.syncInvoker = syncInvoker; this.apiType = apiType; - MappedHttpInvocationModule.putInvokables(apiType, asyncApiType, invokables); + SyncToAsyncHttpInvocationModule.putInvokables(apiType, asyncApiType, invokables); } @SuppressWarnings("unchecked") diff --git a/core/src/main/java/org/jclouds/rest/config/RestClientModule.java b/core/src/main/java/org/jclouds/rest/config/RestClientModule.java index a206ce0e87..271547d056 100644 --- a/core/src/main/java/org/jclouds/rest/config/RestClientModule.java +++ b/core/src/main/java/org/jclouds/rest/config/RestClientModule.java @@ -19,7 +19,7 @@ package org.jclouds.rest.config; import static org.jclouds.reflect.Types2.checkBound; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import java.util.Map; @@ -40,14 +40,14 @@ public class RestClientModule extends RestModule { protected final TypeToken syncClientType; protected final TypeToken asyncClientType; - private final MappedHttpInvocationModule invocationModule; + private final SyncToAsyncHttpInvocationModule invocationModule; /** * Note that this ctor requires that you instantiate w/resolved generic params. For example, via * a subclass of a bound type, or natural instantiation w/resolved type params. */ protected RestClientModule(Map, Class> sync2Async) { - this.invocationModule = new MappedHttpInvocationModule(sync2Async); + this.invocationModule = new SyncToAsyncHttpInvocationModule(sync2Async); this.syncClientType = checkBound(new TypeToken(getClass()) { private static final long serialVersionUID = 1L; }); @@ -74,7 +74,7 @@ public class RestClientModule extends RestModule { * only necessary when type params are not resolvable at runtime. */ public RestClientModule(TypeToken syncClientType, TypeToken asyncClientType, Map, Class> sync2Async) { - this.invocationModule = new MappedHttpInvocationModule(sync2Async); + this.invocationModule = new SyncToAsyncHttpInvocationModule(sync2Async); this.syncClientType = checkBound(syncClientType); this.asyncClientType = checkBound(asyncClientType); } @@ -83,7 +83,7 @@ public class RestClientModule extends RestModule { protected void configure() { super.configure(); install(invocationModule); - bindMappedHttpApi(binder(), syncClientType.getRawType(), asyncClientType.getRawType()); + bindSyncToAsyncHttpApi(binder(), syncClientType.getRawType(), asyncClientType.getRawType()); bindErrorHandlers(); bindRetryHandlers(); } diff --git a/core/src/main/java/org/jclouds/rest/config/MappedHttpApiProvider.java b/core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java similarity index 72% rename from core/src/main/java/org/jclouds/rest/config/MappedHttpApiProvider.java rename to core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java index 1885141d70..57b80aadae 100644 --- a/core/src/main/java/org/jclouds/rest/config/MappedHttpApiProvider.java +++ b/core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java @@ -25,7 +25,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import org.jclouds.reflect.Invocation; -import org.jclouds.rest.internal.DelegatesToPotentiallyMappedInvocationFunction; +import org.jclouds.rest.internal.DelegatesToPotentiallySyncToAsyncInvocationFunction; import com.google.common.base.Function; import com.google.common.cache.Cache; @@ -39,16 +39,16 @@ import com.google.inject.Provider; */ @Deprecated @Singleton -public class MappedHttpApiProvider implements Provider { +public class SyncToAsyncHttpApiProvider implements Provider { private final Class apiType; - private final DelegatesToPotentiallyMappedInvocationFunction> httpInvoker; + private final DelegatesToPotentiallySyncToAsyncInvocationFunction> httpInvoker; @Inject - private MappedHttpApiProvider(Cache, Invokable> invokables, - DelegatesToPotentiallyMappedInvocationFunction> httpInvoker, Class apiType, Class asyncApiType) { + private SyncToAsyncHttpApiProvider(Cache, Invokable> invokables, + DelegatesToPotentiallySyncToAsyncInvocationFunction> httpInvoker, Class apiType, Class asyncApiType) { this.httpInvoker = httpInvoker; this.apiType = apiType; - MappedHttpInvocationModule.putInvokables(apiType, asyncApiType, invokables); + SyncToAsyncHttpInvocationModule.putInvokables(apiType, asyncApiType, invokables); } @SuppressWarnings("unchecked") diff --git a/core/src/main/java/org/jclouds/rest/config/MappedHttpInvocationModule.java b/core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpInvocationModule.java similarity index 90% rename from core/src/main/java/org/jclouds/rest/config/MappedHttpInvocationModule.java rename to core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpInvocationModule.java index ffac5fa800..81f85191a3 100644 --- a/core/src/main/java/org/jclouds/rest/config/MappedHttpInvocationModule.java +++ b/core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpInvocationModule.java @@ -34,9 +34,9 @@ import org.jclouds.reflect.Invocation; import org.jclouds.rest.HttpAsyncClient; import org.jclouds.rest.HttpClient; import org.jclouds.rest.internal.DelegatesToInvocationFunction; -import org.jclouds.rest.internal.DelegatesToPotentiallyMappedInvocationFunction; +import org.jclouds.rest.internal.DelegatesToPotentiallySyncToAsyncInvocationFunction; import org.jclouds.rest.internal.InvokeAndCallGetOnFutures; -import org.jclouds.rest.internal.InvokeMappedHttpMethod; +import org.jclouds.rest.internal.InvokeSyncToAsyncHttpMethod; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -55,14 +55,14 @@ import com.google.inject.TypeLiteral; * @deprecated will be removed in jclouds 1.7; use {@link HttpApiModule} */ @Deprecated -public class MappedHttpInvocationModule extends AbstractModule { +public class SyncToAsyncHttpInvocationModule extends AbstractModule { protected final Map, Class> sync2Async; - public MappedHttpInvocationModule() { + public SyncToAsyncHttpInvocationModule() { this(ImmutableMap., Class> of()); } - public MappedHttpInvocationModule(Map, Class> sync2Async) { + public SyncToAsyncHttpInvocationModule(Map, Class> sync2Async) { this.sync2Async = sync2Async; } @@ -71,8 +71,8 @@ public class MappedHttpInvocationModule extends AbstractModule { bind(new TypeLiteral, Class>>() { }).toInstance(sync2Async); bind(new TypeLiteral>() { - }).to(InvokeMappedHttpMethod.class); - org.jclouds.rest.config.BinderUtils.bindMappedHttpApi(binder(), HttpClient.class, HttpAsyncClient.class); + }).to(InvokeSyncToAsyncHttpMethod.class); + BinderUtils.bindSyncToAsyncHttpApi(binder(), HttpClient.class, HttpAsyncClient.class); } /** @@ -88,7 +88,7 @@ public class MappedHttpInvocationModule extends AbstractModule { * function view of above * * @see InvokeAndCallGetOnFutures - * @see InvokeMappedHttpMethod + * @see InvokeSyncToAsyncHttpMethod */ @Provides @Singleton diff --git a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java index 19794a476b..cbc0ef3021 100644 --- a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java +++ b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java @@ -84,14 +84,14 @@ public abstract class BaseHttpApiMetadata extends BaseApiMetadata implements } private void init() { - javaApi(api) + api(api) .name(api.getSimpleName()) .context(contextToken(typeToken(api))) .defaultProperties(BaseHttpApiMetadata.defaultProperties()); } @Override - public T javaApi(Class api) { + public T api(Class api) { this.api = checkNotNull(api, "api"); return self(); } @@ -101,7 +101,7 @@ public abstract class BaseHttpApiMetadata extends BaseApiMetadata implements public T fromApiMetadata(ApiMetadata in) { if (in instanceof HttpApiMetadata) { HttpApiMetadata http = HttpApiMetadata.class.cast(in); - javaApi(Class.class.cast(http.getApi())); + api(Class.class.cast(http.getApi())); } super.fromApiMetadata(in); return self(); diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallyMappedInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallySyncToAsyncInvocationFunction.java similarity index 91% rename from core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallyMappedInvocationFunction.java rename to core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallySyncToAsyncInvocationFunction.java index 750e652a8b..f6843fb7c8 100644 --- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallyMappedInvocationFunction.java +++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallySyncToAsyncInvocationFunction.java @@ -47,12 +47,12 @@ import com.google.inject.util.Types; */ @Deprecated @Beta -public final class DelegatesToPotentiallyMappedInvocationFunction> extends +public final class DelegatesToPotentiallySyncToAsyncInvocationFunction> extends DelegatesToInvocationFunction { private final Map, Class> syncToAsync; @Inject - DelegatesToPotentiallyMappedInvocationFunction(Injector injector, SetCaller setCaller, Class ownerType, + DelegatesToPotentiallySyncToAsyncInvocationFunction(Injector injector, SetCaller setCaller, Class ownerType, Function> optionalConverter, F methodInvoker, Map, Class> syncToAsync) { super(injector, setCaller, ownerType, optionalConverter, methodInvoker); diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeMappedHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java similarity index 97% rename from core/src/main/java/org/jclouds/rest/internal/InvokeMappedHttpMethod.java rename to core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java index 09a0bca57b..c63f90a6dc 100644 --- a/core/src/main/java/org/jclouds/rest/internal/InvokeMappedHttpMethod.java +++ b/core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java @@ -58,7 +58,7 @@ import com.google.common.util.concurrent.UncheckedTimeoutException; * @deprecated will be replaced in jclouds 1.7 with {@link InvokeHttpMethod}, as async interfaces are no longer supported. */ @Deprecated -public class InvokeMappedHttpMethod implements Function { +public class InvokeSyncToAsyncHttpMethod implements Function { @Resource private Logger logger = Logger.NULL; @@ -73,7 +73,7 @@ public class InvokeMappedHttpMethod implements Function { @Inject @VisibleForTesting - InvokeMappedHttpMethod(Function sync2async, Function annotationProcessor, + InvokeSyncToAsyncHttpMethod(Function sync2async, Function annotationProcessor, HttpCommandExecutorService http, Function> transformerForRequest, TimeLimiter timeLimiter, InvocationConfig config, @Named(PROPERTY_USER_THREADS) ListeningExecutorService userExecutor) { @@ -261,7 +261,7 @@ public class InvokeMappedHttpMethod implements Function { return true; if (o == null || getClass() != o.getClass()) return false; - InvokeMappedHttpMethod that = InvokeMappedHttpMethod.class.cast(o); + InvokeSyncToAsyncHttpMethod that = InvokeSyncToAsyncHttpMethod.class.cast(o); return equal(this.annotationProcessor, that.annotationProcessor); } diff --git a/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java b/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java index 1d36ab2ed5..1460ec56db 100644 --- a/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java +++ b/core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java @@ -54,7 +54,7 @@ public class MappedHttpInvocationModuleTest { public void testPutInvokablesWhenInterfacesMatch() { Cache, Invokable> cache = CacheBuilder.newBuilder().build(); - MappedHttpInvocationModule.putInvokables(Sync.class, Async.class, cache); + SyncToAsyncHttpInvocationModule.putInvokables(Sync.class, Async.class, cache); assertEquals(cache.size(), 1); @@ -78,7 +78,7 @@ public class MappedHttpInvocationModuleTest { @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = ".* has different typed exceptions than target .*") public void testPutInvokablesWhenInterfacesMatchExceptExceptions() { Cache, Invokable> cache = CacheBuilder.newBuilder().build(); - MappedHttpInvocationModule.putInvokables(Sync.class, AsyncWithException.class, cache); + SyncToAsyncHttpInvocationModule.putInvokables(Sync.class, AsyncWithException.class, cache); } private static interface AsyncWithMisnamedMethod { @@ -88,7 +88,7 @@ public class MappedHttpInvocationModuleTest { @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "no such method .*") public void testPutInvokablesWhenTargetMethodNotFound() { Cache, Invokable> cache = CacheBuilder.newBuilder().build(); - MappedHttpInvocationModule.putInvokables(Sync.class, AsyncWithMisnamedMethod.class, cache); + SyncToAsyncHttpInvocationModule.putInvokables(Sync.class, AsyncWithMisnamedMethod.class, cache); } static final Predicate, Invokable>> isHttpInvokable = new Predicate, Invokable>>() { @@ -99,7 +99,7 @@ public class MappedHttpInvocationModuleTest { }; public void testSeedKnownSync2AsyncIncludesHttpClientByDefault() { - Map, Invokable> cache = MappedHttpInvocationModule.seedKnownSync2AsyncInvokables( + Map, Invokable> cache = SyncToAsyncHttpInvocationModule.seedKnownSync2AsyncInvokables( ImmutableMap., Class> of()).asMap(); assertEquals(cache.size(), 6); @@ -107,7 +107,7 @@ public class MappedHttpInvocationModuleTest { } public void testSeedKnownSync2AsyncInvokablesInterfacesMatch() { - Map, Invokable> cache = MappedHttpInvocationModule.seedKnownSync2AsyncInvokables( + Map, Invokable> cache = SyncToAsyncHttpInvocationModule.seedKnownSync2AsyncInvokables( ImmutableMap., Class> of(Sync.class, Async.class)).asMap(); assertEquals(cache.size(), 7); diff --git a/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java b/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java index a4023dd5d3..811a9bae5c 100644 --- a/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java @@ -37,7 +37,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.reflect.Invocation; import org.jclouds.rest.config.InvocationConfig; -import org.jclouds.rest.internal.InvokeMappedHttpMethod.InvokeAndTransform; +import org.jclouds.rest.internal.InvokeSyncToAsyncHttpMethod.InvokeAndTransform; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -96,7 +96,7 @@ public class InvokeMappedHttpMethodTest { @SuppressWarnings("rawtypes") private org.jclouds.Fallback fallback; private InvocationConfig config; - private InvokeMappedHttpMethod invokeHttpMethod; + private InvokeSyncToAsyncHttpMethod invokeHttpMethod; private ListenableFuture future; @@ -108,7 +108,7 @@ public class InvokeMappedHttpMethodTest { fallback = createMock(org.jclouds.Fallback.class); config = createMock(InvocationConfig.class); future = createMock(ListenableFuture.class); - invokeHttpMethod = new InvokeMappedHttpMethod(sync2async, toRequest, http, transformerForRequest, timeLimiter, config, + invokeHttpMethod = new InvokeSyncToAsyncHttpMethod(sync2async, toRequest, http, transformerForRequest, timeLimiter, config, userThreads); expect(config.getCommandName(asyncGet)).andReturn("ns:get"); expect(config.getFallback(asyncGet)).andReturn(fallback); diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java index 5c805473f1..bc9f985e5c 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java @@ -18,7 +18,7 @@ */ package org.jclouds.hpcloud.objectstorage; -import static org.jclouds.rest.config.BinderUtils.bindMappedHttpApi; +import static org.jclouds.rest.config.BinderUtils.bindSyncToAsyncHttpApi; import java.net.URI; import java.util.Properties; @@ -114,7 +114,7 @@ public class HPCloudObjectStorageApiMetadata extends SwiftKeystoneApiMetadata { } @Override protected void bindTemporaryUrlKeyApi() { - bindMappedHttpApi(binder(), TemporaryUrlKeyApi.class, KeystoneTemporaryUrlKeyAsyncApi.class); + bindSyncToAsyncHttpApi(binder(), TemporaryUrlKeyApi.class, KeystoneTemporaryUrlKeyAsyncApi.class); } } } diff --git a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java index 8b56b73c25..e2b50c504b 100644 --- a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java +++ b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java @@ -34,7 +34,7 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.rackspace.cloudidentity.v2_0.config.MappedCloudIdentityAuthenticationApiModule; +import org.jclouds.rackspace.cloudidentity.v2_0.config.SyncToAsyncCloudIdentityAuthenticationApiModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -83,7 +83,7 @@ public class CloudBlockStorageUKProviderMetadata extends BaseProviderMetadata { .endpointName("identity service url ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/overview.html")) .defaultModules(ImmutableSet.>builder() - .add(MappedCloudIdentityAuthenticationApiModule.class) + .add(SyncToAsyncCloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) .add(ZoneModule.class) .add(CinderParserModule.class) diff --git a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java index 70f9e21c0e..0c7174b599 100644 --- a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java +++ b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java @@ -34,7 +34,7 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.rackspace.cloudidentity.v2_0.config.MappedCloudIdentityAuthenticationApiModule; +import org.jclouds.rackspace.cloudidentity.v2_0.config.SyncToAsyncCloudIdentityAuthenticationApiModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; @@ -84,7 +84,7 @@ public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata { .endpointName("identity service url ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/overview.html")) .defaultModules(ImmutableSet.>builder() - .add(MappedCloudIdentityAuthenticationApiModule.class) + .add(SyncToAsyncCloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) .add(ZoneModule.class) .add(CinderParserModule.class) diff --git a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java index 760e5441f3..b50c8ee733 100644 --- a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java +++ b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java @@ -34,7 +34,7 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.rackspace.cloudidentity.v2_0.config.MappedCloudIdentityAuthenticationApiModule; +import org.jclouds.rackspace.cloudidentity.v2_0.config.SyncToAsyncCloudIdentityAuthenticationApiModule; import org.jclouds.rackspace.cloudservers.uk.config.CloudServersUKComputeServiceContextModule; import com.google.common.collect.ImmutableSet; @@ -85,7 +85,7 @@ public class CloudServersUKProviderMetadata extends BaseProviderMetadata { .endpointName("identity service url ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ch_preface.html#webhelp-currentid")) .defaultModules(ImmutableSet.>builder() - .add(MappedCloudIdentityAuthenticationApiModule.class) + .add(SyncToAsyncCloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) .add(ZoneModule.class) .add(NovaParserModule.class) diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java index 8a77916372..dae907c415 100644 --- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java +++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java @@ -34,7 +34,7 @@ import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.internal.BaseProviderMetadata; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; -import org.jclouds.rackspace.cloudidentity.v2_0.config.MappedCloudIdentityAuthenticationApiModule; +import org.jclouds.rackspace.cloudidentity.v2_0.config.SyncToAsyncCloudIdentityAuthenticationApiModule; import org.jclouds.rackspace.cloudservers.us.config.CloudServersUSComputeServiceContextModule; import com.google.common.collect.ImmutableSet; @@ -86,7 +86,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { .endpointName("identity service url ending in /v2.0/") .documentation(URI.create("http://docs.rackspace.com/loadbalancers/api/v1.0/clb-devguide/content/index.html")) .defaultModules(ImmutableSet.>builder() - .add(MappedCloudIdentityAuthenticationApiModule.class) + .add(SyncToAsyncCloudIdentityAuthenticationApiModule.class) .add(CloudIdentityAuthenticationModule.class) .add(ZoneModule.class) .add(NovaParserModule.class)