Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Style fixes and corrections.

This commit is contained in:
Everett Toews 2013-11-14 17:54:32 -06:00
parent 2077da2879
commit ab4473561e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/PaginatedCollection.java
View File

@ -40,7 +40,8 @@ public class PaginatedCollection<T> extends IterableWithMarker<T> {
private final Iterable<Link> links;
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.links = links != null ? links : ImmutableSet.<Link> of();
this.totalEntries = totalEntries;

7
apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java
View File

@ -37,7 +37,6 @@ import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
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.v2_0.domain.PaginatedCollection;
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.binders.BindToJsonPayload;
import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404;
/**
* @author Everett Toews
*/
@ -145,7 +146,7 @@ public interface DomainApi {
@GET
@ResponseParser(ParseDomains.class)
@Consumes(MediaType.APPLICATION_JSON)
@Fallback(KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404.class)
@Fallback(EmptyPaginatedCollectionOnNotFoundOr404.class)
@Path("/domains")
PaginatedCollection<Domain> list(PaginationOptions options);
@ -169,7 +170,7 @@ public interface DomainApi {
@GET
@ResponseParser(ParseSubdomains.class)
@Consumes(MediaType.APPLICATION_JSON)
@Fallback(KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404.class)
@Fallback(EmptyPaginatedCollectionOnNotFoundOr404.class)
@Path("/domains/{domainId}/subdomains")
PaginatedCollection<Subdomain> listSubdomains(@PathParam("domainId") int domainId,
PaginationOptions options);

3
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java
View File

@ -114,8 +114,7 @@ public class ParseLoadBalancers implements Function<HttpResponse, IterableWithMa
@Override
public IterableWithMarker<LoadBalancer> apply(Object input) {
PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
IterableWithMarker<LoadBalancer> list = loadBalancerApi.list(paginationOptions);
return list;
return loadBalancerApi.list(paginationOptions);
}
@Override

3
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java
View File

@ -94,8 +94,7 @@ public class ParseNodes extends ParseJson<Nodes> {
@Override
public IterableWithMarker<Node> apply(Object input) {
PaginationOptions paginationOptions = PaginationOptions.class.cast(input);
IterableWithMarker<Node> list = nodeApi.list(paginationOptions);
return list;
return nodeApi.list(paginationOptions);
}
@Override