Updated Branches: refs/heads/master 2077da287 -> ab4473561
Style fixes and corrections. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ab447356 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ab447356 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ab447356 Branch: refs/heads/master Commit: ab4473561e5e0bcb5ceb8043040ee7d7d10b9f72 Parents: 2077da2 Author: Everett Toews <[email protected]> Authored: Thu Nov 14 17:54:32 2013 -0600 Committer: Everett Toews <[email protected]> Committed: Fri Nov 15 10:46:49 2013 -0600 ---------------------------------------------------------------------- .../jclouds/openstack/v2_0/domain/PaginatedCollection.java | 3 ++- .../org/jclouds/rackspace/clouddns/v1/features/DomainApi.java | 7 ++++--- .../cloudloadbalancers/v1/functions/ParseLoadBalancers.java | 3 +-- .../rackspace/cloudloadbalancers/v1/functions/ParseNodes.java | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab447356/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/PaginatedCollection.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/PaginatedCollection.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/PaginatedCollection.java index aab728d..a728627 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/PaginatedCollection.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/PaginatedCollection.java @@ -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; http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab447356/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java index bf17e1c..ffd13f3 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java @@ -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); http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab447356/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java index 7b250c9..d15b359 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseLoadBalancers.java @@ -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 http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab447356/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java index 419736a..f71735d 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/functions/ParseNodes.java @@ -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
