mirror of
https://github.com/apache/jclouds.git
synced 2025-02-09 11:35:41 +00:00
Style fixes and corrections.
This commit is contained in:
parent
2077da2879
commit
ab4473561e
@ -40,7 +40,8 @@ public class PaginatedCollection<T> extends IterableWithMarker<T> {
|
|||||||
private final Iterable<Link> links;
|
private final Iterable<Link> links;
|
||||||
private final Integer totalEntries;
|
private final Integer totalEntries;
|
||||||
|
|
||||||
protected PaginatedCollection(Iterable<T> resources, Iterable<Link> links, @Nullable Integer totalEntries) {
|
protected PaginatedCollection(@Nullable Iterable<T> resources, @Nullable Iterable<Link> links,
|
||||||
|
@Nullable Integer totalEntries) {
|
||||||
this.resources = resources != null ? resources : ImmutableSet.<T> of();
|
this.resources = resources != null ? resources : ImmutableSet.<T> of();
|
||||||
this.links = links != null ? links : ImmutableSet.<Link> of();
|
this.links = links != null ? links : ImmutableSet.<Link> of();
|
||||||
this.totalEntries = totalEntries;
|
this.totalEntries = totalEntries;
|
||||||
|
@ -37,7 +37,6 @@ import org.jclouds.Fallbacks.NullOnNotFoundOr404;
|
|||||||
import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
|
import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
|
||||||
import org.jclouds.collect.PagedIterable;
|
import org.jclouds.collect.PagedIterable;
|
||||||
import org.jclouds.javax.annotation.Nullable;
|
import org.jclouds.javax.annotation.Nullable;
|
||||||
import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks;
|
|
||||||
import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
|
import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
|
||||||
import org.jclouds.openstack.v2_0.domain.PaginatedCollection;
|
import org.jclouds.openstack.v2_0.domain.PaginatedCollection;
|
||||||
import org.jclouds.openstack.v2_0.options.PaginationOptions;
|
import org.jclouds.openstack.v2_0.options.PaginationOptions;
|
||||||
@ -73,6 +72,8 @@ import org.jclouds.rest.annotations.Transform;
|
|||||||
import org.jclouds.rest.annotations.WrapWith;
|
import org.jclouds.rest.annotations.WrapWith;
|
||||||
import org.jclouds.rest.binders.BindToJsonPayload;
|
import org.jclouds.rest.binders.BindToJsonPayload;
|
||||||
|
|
||||||
|
import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Everett Toews
|
* @author Everett Toews
|
||||||
*/
|
*/
|
||||||
@ -145,7 +146,7 @@ public interface DomainApi {
|
|||||||
@GET
|
@GET
|
||||||
@ResponseParser(ParseDomains.class)
|
@ResponseParser(ParseDomains.class)
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
@Consumes(MediaType.APPLICATION_JSON)
|
||||||
@Fallback(KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404.class)
|
@Fallback(EmptyPaginatedCollectionOnNotFoundOr404.class)
|
||||||
@Path("/domains")
|
@Path("/domains")
|
||||||
PaginatedCollection<Domain> list(PaginationOptions options);
|
PaginatedCollection<Domain> list(PaginationOptions options);
|
||||||
|
|
||||||
@ -169,7 +170,7 @@ public interface DomainApi {
|
|||||||
@GET
|
@GET
|
||||||
@ResponseParser(ParseSubdomains.class)
|
@ResponseParser(ParseSubdomains.class)
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
@Consumes(MediaType.APPLICATION_JSON)
|
||||||
@Fallback(KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404.class)
|
@Fallback(EmptyPaginatedCollectionOnNotFoundOr404.class)
|
||||||
@Path("/domains/{domainId}/subdomains")
|
@Path("/domains/{domainId}/subdomains")
|
||||||
PaginatedCollection<Subdomain> listSubdomains(@PathParam("domainId") int domainId,
|
PaginatedCollection<Subdomain> listSubdomains(@PathParam("domainId") int domainId,
|
||||||
PaginationOptions options);
|
PaginationOptions options);
|
||||||
|
@ -114,8 +114,7 @@ public class ParseLoadBalancers implements Function<HttpResponse, IterableWithMa
|
|||||||
@Override
|
@Override
|
||||||
public IterableWithMarker<LoadBalancer> apply(Object input) {
|
public IterableWithMarker<LoadBalancer> apply(Object input) {
|
||||||
PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
|
PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
|
||||||
IterableWithMarker<LoadBalancer> list = loadBalancerApi.list(paginationOptions);
|
return loadBalancerApi.list(paginationOptions);
|
||||||
return list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -94,8 +94,7 @@ public class ParseNodes extends ParseJson<Nodes> {
|
|||||||
@Override
|
@Override
|
||||||
public IterableWithMarker<Node> apply(Object input) {
|
public IterableWithMarker<Node> apply(Object input) {
|
||||||
PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
|
PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
|
||||||
IterableWithMarker<Node> list = nodeApi.list(paginationOptions);
|
return nodeApi.list(paginationOptions);
|
||||||
return list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
x
Reference in New Issue
Block a user