From 71ad3abf2a271df99d3d85204a4f780886ceb7ca Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Mon, 30 Apr 2012 10:46:50 +0100 Subject: [PATCH] Renaming 'ServiceClient's AuthenticationClients to save confusion with user-accessible ServiceClient in keystone 2.0 --- ...iceAsyncClient.java => AuthenticationAsyncClient.java} | 6 +++--- .../{ServiceClient.java => AuthenticationClient.java} | 4 ++-- .../keystone/v1_1/config/AuthenticationServiceModule.java | 8 ++++---- ...iceAsyncClient.java => AuthenticationAsyncClient.java} | 8 ++++---- .../{ServiceClient.java => AuthenticationClient.java} | 4 ++-- .../v2_0/config/KeystoneAuthenticationModule.java | 6 +++--- .../functions/AuthenticateApiAccessKeyCredentials.java | 6 +++--- .../v2_0/functions/AuthenticatePasswordCredentials.java | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) rename common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/{ServiceAsyncClient.java => AuthenticationAsyncClient.java} (93%) rename common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/{ServiceClient.java => AuthenticationClient.java} (95%) rename common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/{ServiceAsyncClient.java => AuthenticationAsyncClient.java} (90%) rename common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/{ServiceClient.java => AuthenticationClient.java} (96%) diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/ServiceAsyncClient.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationAsyncClient.java similarity index 93% rename from common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/ServiceAsyncClient.java rename to common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationAsyncClient.java index d47967c2c8..be75da1b5a 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/ServiceAsyncClient.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationAsyncClient.java @@ -35,17 +35,17 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to Service via their REST API. *

* - * @see ServiceClient + * @see AuthenticationClient * @see * @author Adrian Cole */ @Path("/v1.1") -public interface ServiceAsyncClient { +public interface AuthenticationAsyncClient { /** - * @see ServiceClient#authenticate + * @see AuthenticationClient#authenticate */ @POST @SelectJson("auth") diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/ServiceClient.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java similarity index 95% rename from common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/ServiceClient.java rename to common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java index 5bbb520611..0e51289ad8 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/ServiceClient.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/AuthenticationClient.java @@ -27,13 +27,13 @@ import org.jclouds.openstack.keystone.v1_1.domain.Auth; * Provides synchronous access to the KeyStone Service API. *

* - * @see ServiceAsyncClient + * @see AuthenticationAsyncClient * @see * @author Adrian Cole */ @Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) -public interface ServiceClient { +public interface AuthenticationClient { /** * Authenticate to generate a token. 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 ba16265d27..4f70bc4c0f 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 @@ -35,8 +35,8 @@ import org.jclouds.http.annotation.ClientError; import org.jclouds.location.Provider; import org.jclouds.location.suppliers.RegionIdToURISupplier; import org.jclouds.openstack.Authentication; -import org.jclouds.openstack.keystone.v1_1.ServiceAsyncClient; -import org.jclouds.openstack.keystone.v1_1.ServiceClient; +import org.jclouds.openstack.keystone.v1_1.AuthenticationAsyncClient; +import org.jclouds.openstack.keystone.v1_1.AuthenticationClient; import org.jclouds.openstack.keystone.v1_1.domain.Auth; import org.jclouds.openstack.keystone.v1_1.handlers.RetryOnRenew; import org.jclouds.openstack.keystone.v1_1.suppliers.RegionIdToURIFromAuthForServiceSupplier; @@ -63,7 +63,7 @@ public class AuthenticationServiceModule extends AbstractModule { }).to(GetAuth.class); // ServiceClient is used directly for filters and retry handlers, so let's bind it // explicitly - bindClientAndAsyncClient(binder(), ServiceClient.class, ServiceAsyncClient.class); + bindClientAndAsyncClient(binder(), AuthenticationClient.class, AuthenticationAsyncClient.class); install(new FactoryModuleBuilder().implement(RegionIdToURISupplier.class, RegionIdToURIFromAuthForServiceSupplier.class).build(RegionIdToURISupplier.Factory.class)); bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(RetryOnRenew.class); @@ -88,7 +88,7 @@ public class AuthenticationServiceModule extends AbstractModule { public static class GetAuth extends RetryOnTimeOutExceptionFunction { @Inject - public GetAuth(final ServiceClient client) { + public GetAuth(final AuthenticationClient client) { super(new Function() { @Override diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/ServiceAsyncClient.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationAsyncClient.java similarity index 90% rename from common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/ServiceAsyncClient.java rename to common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationAsyncClient.java index 31c1ffcd70..2f160ed365 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/ServiceAsyncClient.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationAsyncClient.java @@ -37,16 +37,16 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to Service via their REST API. *

* - * @see ServiceClient + * @see AuthenticationClient * @see * @author Adrian Cole */ @Path("/v2.0") -public interface ServiceAsyncClient { +public interface AuthenticationAsyncClient { /** - * @see ServiceClient#authenticateTenantWithCredentials(String,PasswordCredentials) + * @see AuthenticationClient#authenticateTenantWithCredentials(String,PasswordCredentials) */ @POST @SelectJson("access") @@ -57,7 +57,7 @@ public interface ServiceAsyncClient { PasswordCredentials passwordCredentials); /** - * @see ServiceClient#authenticateTenantWithCredentials(String,ApiAccessKeyCredentials) + * @see AuthenticationClient#authenticateTenantWithCredentials(String,ApiAccessKeyCredentials) */ @POST @SelectJson("access") diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/ServiceClient.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationClient.java similarity index 96% rename from common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/ServiceClient.java rename to common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationClient.java index 0e53e6067a..695b55f527 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/ServiceClient.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationClient.java @@ -29,13 +29,13 @@ import org.jclouds.openstack.keystone.v2_0.domain.PasswordCredentials; * Provides synchronous access to the KeyStone Service API. *

* - * @see ServiceAsyncClient + * @see AuthenticationAsyncClient * @see * @author Adrian Cole */ @Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) -public interface ServiceClient { +public interface AuthenticationClient { /** * Authenticate to generate a token. diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java index 01c5257001..21b1733918 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java @@ -40,8 +40,8 @@ import org.jclouds.location.suppliers.ZoneIdsSupplier; import org.jclouds.location.suppliers.derived.RegionIdsFromRegionIdToURIKeySet; import org.jclouds.location.suppliers.derived.ZoneIdsFromZoneIdToURIKeySet; import org.jclouds.openstack.Authentication; -import org.jclouds.openstack.keystone.v2_0.ServiceAsyncClient; -import org.jclouds.openstack.keystone.v2_0.ServiceClient; +import org.jclouds.openstack.keystone.v2_0.AuthenticationAsyncClient; +import org.jclouds.openstack.keystone.v2_0.AuthenticationClient; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.functions.AuthenticateApiAccessKeyCredentials; import org.jclouds.openstack.keystone.v2_0.functions.AuthenticatePasswordCredentials; @@ -146,7 +146,7 @@ public class KeystoneAuthenticationModule extends AbstractModule { bind(CredentialType.class).toProvider(CredentialTypeFromPropertyOrDefault.class); // ServiceClient is used directly for filters and retry handlers, so let's bind it // explicitly - bindClientAndAsyncClient(binder(), ServiceClient.class, ServiceAsyncClient.class); + bindClientAndAsyncClient(binder(), AuthenticationClient.class, AuthenticationAsyncClient.class); install(locationModule); } diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticateApiAccessKeyCredentials.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticateApiAccessKeyCredentials.java index b62cb33d69..29be1b1ded 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticateApiAccessKeyCredentials.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticateApiAccessKeyCredentials.java @@ -22,7 +22,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import org.jclouds.domain.Credentials; -import org.jclouds.openstack.keystone.v2_0.ServiceClient; +import org.jclouds.openstack.keystone.v2_0.AuthenticationClient; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.domain.ApiAccessKeyCredentials; import org.jclouds.rest.AuthorizationException; @@ -31,10 +31,10 @@ import com.google.common.base.Function; @Singleton public class AuthenticateApiAccessKeyCredentials implements Function { - private final ServiceClient client; + private final AuthenticationClient client; @Inject - public AuthenticateApiAccessKeyCredentials(ServiceClient client) { + public AuthenticateApiAccessKeyCredentials(AuthenticationClient client) { this.client = client; } diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticatePasswordCredentials.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticatePasswordCredentials.java index 0191266ead..0c59e02ede 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticatePasswordCredentials.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/AuthenticatePasswordCredentials.java @@ -20,7 +20,7 @@ package org.jclouds.openstack.keystone.v2_0.functions; import javax.inject.Inject; import org.jclouds.domain.Credentials; -import org.jclouds.openstack.keystone.v2_0.ServiceClient; +import org.jclouds.openstack.keystone.v2_0.AuthenticationClient; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.domain.PasswordCredentials; import org.jclouds.rest.AuthorizationException; @@ -28,10 +28,10 @@ import org.jclouds.rest.AuthorizationException; import com.google.common.base.Function; public class AuthenticatePasswordCredentials implements Function { - private final ServiceClient client; + private final AuthenticationClient client; @Inject - public AuthenticatePasswordCredentials(ServiceClient client) { + public AuthenticatePasswordCredentials(AuthenticationClient client) { this.client = client; }