Repository: jclouds Updated Branches: refs/heads/keystone3 [created] f4e2e0a5c
fix rackspace cloudidentity Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f4e2e0a5 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f4e2e0a5 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f4e2e0a5 Branch: refs/heads/keystone3 Commit: f4e2e0a5c1139b86a8e9eb5f7b48dea6a2a1f44f Parents: 963a46a Author: Andrea Turli <[email protected]> Authored: Thu Jan 11 14:28:36 2018 +0100 Committer: Andrea Turli <[email protected]> Committed: Thu Jan 11 14:28:36 2018 +0100 ---------------------------------------------------------------------- .../cloudidentity/v2_0/CloudIdentityAuthenticationApi.java | 4 ++-- .../v2_0/functions/AuthenticateApiKeyCredentials.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/f4e2e0a5/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java index 66ec404..db462b6 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityAuthenticationApi.java @@ -23,7 +23,7 @@ import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; import org.jclouds.openstack.keystone.auth.AuthenticationApi; -import org.jclouds.openstack.keystone.auth.domain.TenantAndCredentials; +import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials; import org.jclouds.openstack.keystone.v2_0.binders.BindAuthToJsonPayload; import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.rackspace.cloudidentity.v2_0.domain.ApiKeyCredentials; @@ -46,6 +46,6 @@ public interface CloudIdentityAuthenticationApi extends AuthenticationApi { @POST @SelectJson("access") @MapBinder(BindAuthToJsonPayload.class) - Access authenticateApiKey(TenantAndCredentials<ApiKeyCredentials> credentials); + Access authenticateApiKey(TenantOrDomainAndCredentials<ApiKeyCredentials> credentials); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/f4e2e0a5/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java index 5e54244..254a53b 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/AuthenticateApiKeyCredentials.java @@ -21,7 +21,7 @@ import javax.inject.Singleton; import org.jclouds.openstack.keystone.auth.config.CredentialType; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; -import org.jclouds.openstack.keystone.auth.domain.TenantAndCredentials; +import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials; import org.jclouds.openstack.keystone.auth.functions.BaseAuthenticator; import org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityAuthenticationApi; import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes; @@ -53,7 +53,7 @@ public class AuthenticateApiKeyCredentials extends BaseAuthenticator<ApiKeyCrede } @Override - public AuthInfo authenticate(TenantAndCredentials<ApiKeyCredentials> credentials) { + public AuthInfo authenticate(TenantOrDomainAndCredentials<ApiKeyCredentials> credentials) { return api.authenticateApiKey(credentials); } }
