mirror of https://github.com/apache/jclouds.git
Renaming the service client (user operations) ServiceClient to better match up to Keystone documentation
This commit is contained in:
parent
10c6d80a39
commit
7d53e18ed7
|
@ -1,78 +0,0 @@
|
||||||
/**
|
|
||||||
* Licensed to jclouds, Inc. (jclouds) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file
|
|
||||||
* distributed with this work for additional information
|
|
||||||
* regarding copyright ownership. jclouds licenses this file
|
|
||||||
* to you under the Apache License, Version 2.0 (the
|
|
||||||
* "License"); you may not use this file except in compliance
|
|
||||||
* with the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing,
|
|
||||||
* software distributed under the License is distributed on an
|
|
||||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
* KIND, either express or implied. See the License for the
|
|
||||||
* specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*/
|
|
||||||
package org.jclouds.openstack.keystone.v2_0;
|
|
||||||
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import javax.ws.rs.Consumes;
|
|
||||||
import javax.ws.rs.GET;
|
|
||||||
import javax.ws.rs.POST;
|
|
||||||
import javax.ws.rs.Path;
|
|
||||||
import javax.ws.rs.core.MediaType;
|
|
||||||
|
|
||||||
import org.jclouds.openstack.filters.AuthenticateRequest;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.binders.BindAuthToJsonPayload;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.Access;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.ApiAccessKeyCredentials;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.ApiMetadata;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.PasswordCredentials;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
|
|
||||||
import org.jclouds.rest.annotations.ExceptionParser;
|
|
||||||
import org.jclouds.rest.annotations.MapBinder;
|
|
||||||
import org.jclouds.rest.annotations.PayloadParam;
|
|
||||||
import org.jclouds.rest.annotations.RequestFilters;
|
|
||||||
import org.jclouds.rest.annotations.SelectJson;
|
|
||||||
import org.jclouds.rest.annotations.SkipEncoding;
|
|
||||||
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
|
|
||||||
import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
|
|
||||||
|
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides asynchronous access to Service via their REST API.
|
|
||||||
* <p/>
|
|
||||||
*
|
|
||||||
* @see UserClient
|
|
||||||
* @see <a href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/Service_API_Client_Operations.html"
|
|
||||||
* />
|
|
||||||
* @author Adrian Cole, Adam Lowe
|
|
||||||
*/
|
|
||||||
@SkipEncoding({ '/', '=' })
|
|
||||||
public interface UserAsyncClient {
|
|
||||||
/**
|
|
||||||
* @see UserClient#getApiMetadata()
|
|
||||||
*/
|
|
||||||
@GET
|
|
||||||
@SelectJson("version")
|
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
|
||||||
@Path("/")
|
|
||||||
@ExceptionParser(ReturnNullOnNotFoundOr404.class)
|
|
||||||
ListenableFuture<ApiMetadata> getApiMetadata();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see UserClient#listTenants()
|
|
||||||
*/
|
|
||||||
@GET
|
|
||||||
@SelectJson("tenants")
|
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
|
||||||
@Path("/tenants")
|
|
||||||
@RequestFilters(AuthenticateRequest.class)
|
|
||||||
@ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
|
|
||||||
ListenableFuture<Set<Tenant>> listTenants();
|
|
||||||
}
|
|
|
@ -1,54 +0,0 @@
|
||||||
/**
|
|
||||||
* Licensed to jclouds, Inc. (jclouds) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file
|
|
||||||
* distributed with this work for additional information
|
|
||||||
* regarding copyright ownership. jclouds licenses this file
|
|
||||||
* to you under the Apache License, Version 2.0 (the
|
|
||||||
* "License"); you may not use this file except in compliance
|
|
||||||
* with the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing,
|
|
||||||
* software distributed under the License is distributed on an
|
|
||||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
* KIND, either express or implied. See the License for the
|
|
||||||
* specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*/
|
|
||||||
package org.jclouds.openstack.keystone.v2_0;
|
|
||||||
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import org.jclouds.concurrent.Timeout;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.Access;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.ApiAccessKeyCredentials;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.ApiMetadata;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.PasswordCredentials;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides synchronous access to the KeyStone Service API.
|
|
||||||
* <p/>
|
|
||||||
*
|
|
||||||
* @author Adrian Cole, Adam Lowe
|
|
||||||
* @see UserAsyncClient
|
|
||||||
* @see <a href="http://docs.openstack.org/api/openstack-identity-service/2.0/content/Service_API_Client_Operations.html"
|
|
||||||
* />
|
|
||||||
*/
|
|
||||||
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
|
|
||||||
public interface UserClient {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Discover API version information, links to documentation (PDF, HTML, WADL), and supported media types
|
|
||||||
*
|
|
||||||
* @return the requested information
|
|
||||||
*/
|
|
||||||
ApiMetadata getApiMetadata();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The operation returns a list of tenants which the current token provides access to.
|
|
||||||
*/
|
|
||||||
Set<Tenant> listTenants();
|
|
||||||
}
|
|
Loading…
Reference in New Issue