Repository: jclouds-labs-openstack Updated Branches: refs/heads/master 1c3ea466d -> 242e5bcd0
Removed @Nullable annotations on region parameters Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/242e5bcd Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/242e5bcd Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/242e5bcd Branch: refs/heads/master Commit: 242e5bcd0cb2ffd05188996cf2d8e7d98b79649a Parents: 1c3ea46 Author: Jeremy Daggett <[email protected]> Authored: Wed Aug 13 11:03:10 2014 -0700 Committer: Jeremy Daggett <[email protected]> Committed: Wed Aug 13 16:04:05 2014 -0700 ---------------------------------------------------------------------- .../openstack/glance/v1_0/GlanceApi.java | 3 +- .../openstack/marconi/v1/MarconiApi.java | 28 +++++------- .../openstack/neutron/v2/NeutronApi.java | 27 ++++++----- .../neutron/v2/extensions/RouterApi.java | 2 +- .../neutron/v2/features/NetworkApi.java | 2 +- .../openstack/neutron/v2/features/PortApi.java | 2 +- .../neutron/v2/features/SubnetApi.java | 2 +- .../openstack/neutron/v2_0/NeutronApi.java | 44 +++++++++--------- .../neutron/v2_0/extensions/RouterApi.java | 2 +- .../neutron/v2_0/features/NetworkApi.java | 2 +- .../neutron/v2_0/features/PortApi.java | 2 +- .../neutron/v2_0/features/SubnetApi.java | 2 +- .../v2_0/functions/ParseNetworkDetails.java | 23 +++++----- .../neutron/v2_0/functions/ParseNetworks.java | 23 +++++----- .../v2_0/functions/ParsePortDetails.java | 23 +++++----- .../neutron/v2_0/functions/ParsePorts.java | 23 +++++----- .../v2_0/functions/ParseRouterDetails.java | 23 +++++----- .../neutron/v2_0/functions/ParseRouters.java | 23 +++++----- .../v2_0/functions/ParseSubnetDetails.java | 23 +++++----- .../neutron/v2_0/functions/ParseSubnets.java | 23 +++++----- .../v2_0/extensions/RouterApiExpectTest.java | 21 ++++----- .../v2_0/extensions/RouterApiLiveTest.java | 13 +++--- .../v2_0/features/NetworkApiExpectTest.java | 23 +++++----- .../v2_0/features/NetworkApiLiveTest.java | 18 ++++---- .../v2_0/features/PortApiExpectTest.java | 20 ++++----- .../neutron/v2_0/features/PortApiLiveTest.java | 1 - .../v2_0/features/SubnetApiExpectTest.java | 2 - .../v2_0/features/SubnetApiLiveTest.java | 1 - .../jclouds/openstack/swift/v1/SwiftApi.java | 21 +++++---- .../rackspace/autoscale/v1/AutoscaleApi.java | 11 +++-- .../cloudbigdata/v1/CloudBigDataApi.java | 9 ++-- .../rackspace/cloudfiles/v1/CloudFilesApi.java | 5 +-- .../cloudfiles/v1/features/CDNApi.java | 47 ++++++++++---------- .../functions/ParseCDNContainerFromHeaders.java | 6 +-- .../v1/functions/RegionToCDNEndpoint.java | 12 ++--- 35 files changed, 250 insertions(+), 262 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java index db88dcc..bacecdd 100644 --- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java +++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.glance.v1_0; import java.io.Closeable; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.openstack.glance.functions.RegionToEndpointNegotiateVersion; import org.jclouds.openstack.glance.v1_0.features.ImageApi; @@ -47,6 +46,6 @@ public interface GlanceApi extends Closeable { * Provides access to Image features. */ @Delegate - ImageApi getImageApi(@EndpointParam(parser = RegionToEndpointNegotiateVersion.class) @Nullable String region); + ImageApi getImageApi(@EndpointParam(parser = RegionToEndpointNegotiateVersion.class) String region); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java ---------------------------------------------------------------------- diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java index c69e0d4..532e1e2 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java @@ -24,7 +24,6 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.openstack.marconi.v1.features.ClaimApi; @@ -57,7 +56,7 @@ public interface MarconiApi extends Closeable { * are not echoed back to the client that posted them, unless the client explicitly requests this. */ @Delegate - QueueApi getQueueApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + QueueApi getQueueApi(@EndpointParam(parser = RegionToEndpoint.class) String region, @HeaderParam("Client-ID") UUID clientId); /** @@ -73,9 +72,8 @@ public interface MarconiApi extends Closeable { */ @Delegate @Path("/queues/{name}") - MessageApi getMessageApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, - @HeaderParam("Client-ID") UUID clientId, - @PathParam("name") String name); + MessageApi getMessageApi(@EndpointParam(parser = RegionToEndpoint.class) String region, + @HeaderParam("Client-ID") UUID clientId, @PathParam("name") String name); /** * Provides access to Claim features. @@ -90,9 +88,8 @@ public interface MarconiApi extends Closeable { */ @Delegate @Path("/queues/{name}") - ClaimApi getClaimApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, - @HeaderParam("Client-ID") UUID clientId, - @PathParam("name") String name); + ClaimApi getClaimApi(@EndpointParam(parser = RegionToEndpoint.class) String region, + @HeaderParam("Client-ID") UUID clientId, @PathParam("name") String name); /** * @return the Zone codes configured @@ -117,8 +114,7 @@ public interface MarconiApi extends Closeable { */ @Deprecated @Delegate - QueueApi getQueueApiForZoneAndClient( - @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, + QueueApi getQueueApiForZoneAndClient(@EndpointParam(parser = RegionToEndpoint.class) String zone, @HeaderParam("Client-ID") UUID clientId); /** @@ -137,10 +133,8 @@ public interface MarconiApi extends Closeable { @Deprecated @Delegate @Path("/queues/{name}") - MessageApi getMessageApiForZoneAndClientAndQueue( - @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, - @HeaderParam("Client-ID") UUID clientId, - @PathParam("name") String name); + MessageApi getMessageApiForZoneAndClientAndQueue(@EndpointParam(parser = RegionToEndpoint.class) String zone, + @HeaderParam("Client-ID") UUID clientId, @PathParam("name") String name); /** * Provides access to Claim features. @@ -158,8 +152,6 @@ public interface MarconiApi extends Closeable { @Deprecated @Delegate @Path("/queues/{name}") - ClaimApi getClaimApiForZoneAndClientAndQueue( - @EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, - @HeaderParam("Client-ID") UUID clientId, - @PathParam("name") String name); + ClaimApi getClaimApiForZoneAndClientAndQueue(@EndpointParam(parser = RegionToEndpoint.class) String zone, + @HeaderParam("Client-ID") UUID clientId, @PathParam("name") String name); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java index 77d4d97..29a75e1 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.neutron.v2; import java.io.Closeable; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.openstack.neutron.v2.extensions.RouterApi; @@ -34,7 +33,7 @@ import com.google.common.base.Optional; import com.google.inject.Provides; /** - * Provides synchronous access to the OpenStack Networking (Neutron) v2 API + * Provides access to the OpenStack Networking (Neutron) v2 API. */ public interface NeutronApi extends Closeable { /** @@ -45,45 +44,45 @@ public interface NeutronApi extends Closeable { Set<String> getConfiguredRegions(); /** - * Provides synchronous access to Extension features. + * Provides access to Extension features. */ @Delegate - ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Network features. + * Provides access to Network features. */ @Delegate - NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Subnet features + * Provides access to Subnet features. */ @Delegate - SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Port features. + * Provides access to Port features. */ @Delegate - PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Router features. + * Provides access to Router features. * * <h3>NOTE</h3> * This API is an extension that may or may not be present in your OpenStack cloud. Use the Optional return type * to determine if it is present. */ @Delegate - Optional<? extends RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + Optional<? extends RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Router features. + * Provides access to Router features. * @deprecated Please use {@link #getRouterApi(String)} as this method will be removed in jclouds 3.0. */ @Deprecated @Delegate - Optional<? extends RouterApi> getRouterExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + Optional<? extends RouterApi> getRouterExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java index 27b2205..376cdea 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java @@ -52,7 +52,7 @@ import org.jclouds.rest.annotations.WrapWith; import com.google.common.annotations.Beta; /** - * Provides synchronous access to Router operations on the OpenStack Neutron API. + * Provides access to Router operations for the OpenStack Networking (Neutron) v2 API. * <p/> * A logical entity for forwarding packets across internal subnets and NATting them on external * networks through an appropriate external gateway. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java index 4eace9a..6ab6fc9 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java @@ -49,7 +49,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; /** - * Provides synchronous access to Network operations on the openstack Neutron API. + * Provides access to Network operations for the OpenStack Networking (Neutron) v2 API. * <p/> * Each tenant can define one or more networks. A network is a virtual isolated layer-2 broadcast domain reserved to the * tenant. A tenant can create several ports for a network, and plug virtual interfaces into these ports. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java index 7079fa0..dabdc86 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java @@ -48,7 +48,7 @@ import javax.ws.rs.core.MediaType; import java.util.List; /** - * Provides synchronous access to Port operations on the openstack Neutron API. + * Provides access to Port operations for the OpenStack Networking (Neutron) v2 API. * <p/> * A port represents a virtual switch port on a logical network switch where all the interfaces attached to a given network are connected. * <p/> http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java index 8891921..a3aec61 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java @@ -48,7 +48,7 @@ import javax.ws.rs.core.MediaType; import java.util.List; /** - * Provides synchronous access to Subnet operations on the Openstack Neutron API. + * Provides access to Subnet operations for the OpenStack Networking (Neutron) v2 API. * * @see <a href= * "http://docs.openstack.org/api/openstack-network/2.0/content/Subnets.html";>api doc</a> http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java index d2fc042..a5ff027 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java @@ -20,7 +20,6 @@ package org.jclouds.openstack.neutron.v2_0; import java.io.Closeable; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.Zone; import org.jclouds.location.functions.RegionToEndpoint; @@ -37,7 +36,7 @@ import com.google.common.base.Optional; import com.google.inject.Provides; /** - * Provides synchronous access to Neutron. + * Provides access to the OpenStack Networking (Neutron) v2 API. * <p/> * * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.NeutronApi} as this @@ -54,35 +53,34 @@ public interface NeutronApi extends Closeable { Set<String> getConfiguredRegions(); /** - * Provides synchronous access to Extension features. + * Provides access to Extension features. */ @Delegate - ExtensionApi getExtensionApi( - @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Network features. + * Provides access to Network features. */ @Delegate - NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Subnet features + * Provides access to Subnet features. */ @Delegate - SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Port features. + * Provides access to Port features. */ @Delegate - PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** - * Provides synchronous access to Router features. + * Provides access to Router features. */ @Delegate - Optional<? extends RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + Optional<? extends RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** * @return the Zone codes configured @@ -94,43 +92,43 @@ public interface NeutronApi extends Closeable { Set<String> getConfiguredZones(); /** - * Provides synchronous access to Extension features. + * Provides access to Extension features. * @deprecated Please use {@link #getExtensionApi(String)} as this method will be removed in jclouds 3.0. */ @Deprecated @Delegate ExtensionApi getExtensionApiForZone( - @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + @EndpointParam(parser = ZoneToEndpoint.class) String zone); /** - * Provides synchronous access to Network features. + * Provides access to Network features. * @deprecated Please use {@link #getNetworkApi(String)} as this method will be removed in jclouds 3.0. */ @Deprecated @Delegate - NetworkApi getNetworkApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + NetworkApi getNetworkApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) String zone); /** - * Provides synchronous access to Subnet features. + * Provides access to Subnet features. * @deprecated Please use {@link #getSubnetApi(String)} as this method will be removed in jclouds 3.0. */ @Deprecated @Delegate - SubnetApi getSubnetApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + SubnetApi getSubnetApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) String zone); /** - * Provides synchronous access to Port features. + * Provides access to Port features. * @deprecated Please use {@link #getPortApi(String)} as this method will be removed in jclouds 3.0. */ @Deprecated @Delegate - PortApi getPortApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + PortApi getPortApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) String zone); /** - * Provides synchronous access to Router features. + * Provides access to Router features. * @deprecated Please use {@link #getRouterApi(String)} as this method will be removed in jclouds 3.0. */ @Deprecated @Delegate - Optional<? extends RouterApi> getRouterExtensionForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone); + Optional<? extends RouterApi> getRouterExtensionForZone(@EndpointParam(parser = ZoneToEndpoint.class) String zone); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java index 3e8e5a2..dca4427 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java @@ -51,7 +51,7 @@ import org.jclouds.rest.annotations.SelectJson; import org.jclouds.rest.annotations.Transform; /** - * Provides synchronous access to Router operations on the OpenStack Neutron API. + * Provides access to Router operations for the OpenStack Networking (Neutron) v2 API. * <p/> * A logical entity for forwarding packets across internal subnets and NATting them on external * networks through an appropriate external gateway. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java index f11fe7c..c2b4aa5 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java @@ -52,7 +52,7 @@ import static org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; /** - * Provides synchronous access to Network operations on the openstack Neutron API. + * Provides access to Network operations for the OpenStack Networking (Neutron) v2 API. * <p/> * Each tenant can define one or more networks. A network is a virtual isolated layer-2 broadcast domain reserved to the * tenant. A tenant can create several ports for a network, and plug virtual interfaces into these ports. http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java index 0b6b8a6..7390131 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java @@ -54,7 +54,7 @@ import static org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; /** - * Provides synchronous access to Port operations on the openstack Neutron API. + * Provides access to Port operations for the OpenStack Networking (Neutron) v2 API. * <p/> * A port represents a virtual switch port on a logical network switch where all the interfaces attached to a given network are connected. * <p/> http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java index 27dcddb..5c2acc5 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java @@ -53,7 +53,7 @@ import static org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404; import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; /** - * Provides synchronous access to Subnet operations on the Openstack Neutron API. + * Provides access to Subnet operations for the OpenStack Networking (Neutron) v2 API. * * @see <a href= http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java index ffc3df2..421bf71 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java @@ -16,30 +16,31 @@ */ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.neutron.v2_0.NeutronApi; import org.jclouds.openstack.neutron.v2_0.domain.Network; import org.jclouds.openstack.neutron.v2_0.features.NetworkApi; import org.jclouds.openstack.neutron.v2_0.functions.ParseNetworkDetails.Networks; import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java index 35d0f1c..a1c1448 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java @@ -16,30 +16,31 @@ */ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.neutron.v2_0.NeutronApi; import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName; import org.jclouds.openstack.neutron.v2_0.features.NetworkApi; import org.jclouds.openstack.neutron.v2_0.functions.ParseNetworks.Networks; import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java index e0c53ed..a4e461e 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java @@ -16,31 +16,32 @@ */ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.neutron.v2_0.NeutronApi; import org.jclouds.openstack.neutron.v2_0.domain.Port; import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName; import org.jclouds.openstack.neutron.v2_0.features.PortApi; import org.jclouds.openstack.neutron.v2_0.functions.ParsePortDetails.Ports; import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java index 9295df9..1a11231 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java @@ -16,30 +16,31 @@ */ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.neutron.v2_0.NeutronApi; import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName; import org.jclouds.openstack.neutron.v2_0.features.PortApi; import org.jclouds.openstack.neutron.v2_0.functions.ParsePorts.Ports; import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java index be8e227..537cc97 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java @@ -17,10 +17,14 @@ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; @@ -32,15 +36,12 @@ import org.jclouds.openstack.neutron.v2_0.functions.ParseRouterDetails.Routers; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.PaginatedCollection; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java index f1e70b1..eb612f4 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java @@ -17,10 +17,14 @@ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; @@ -32,15 +36,12 @@ import org.jclouds.openstack.neutron.v2_0.functions.ParseRouters.Routers; import org.jclouds.openstack.v2_0.domain.Link; import org.jclouds.openstack.v2_0.domain.PaginatedCollection; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java index 4ef5928..17201f2 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java @@ -16,30 +16,31 @@ */ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.neutron.v2_0.NeutronApi; import org.jclouds.openstack.neutron.v2_0.domain.Subnet; import org.jclouds.openstack.neutron.v2_0.features.SubnetApi; import org.jclouds.openstack.neutron.v2_0.functions.ParseSubnetDetails.Subnets; import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java index ba7b731..bc7ef13 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java @@ -16,30 +16,31 @@ */ package org.jclouds.openstack.neutron.v2_0.functions; -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.internal.Arg0ToPagedIterable; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.neutron.v2_0.NeutronApi; import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName; import org.jclouds.openstack.neutron.v2_0.features.SubnetApi; import org.jclouds.openstack.neutron.v2_0.functions.ParseSubnets.Subnets; import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.beans.ConstructorProperties; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.inject.TypeLiteral; /** - * @author Nick Livens */ @Beta @Singleton http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java index 8583428..c3f04cc 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java @@ -17,7 +17,16 @@ package org.jclouds.openstack.neutron.v2_0.extensions; -import com.google.common.collect.ImmutableSet; +import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + +import javax.ws.rs.core.MediaType; + import org.jclouds.http.HttpResponse; import org.jclouds.openstack.neutron.v2_0.domain.ExternalGatewayInfo; import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName; @@ -31,19 +40,11 @@ import org.jclouds.openstack.neutron.v2_0.parse.ParseRouterTest; import org.jclouds.rest.AuthorizationException; import org.testng.annotations.Test; -import javax.ws.rs.core.MediaType; -import java.util.Set; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableSet; /** * Tests parsing and Guice wiring of RouterApi * - * @author Nick Livens */ @Test(groups = "unit", testName = "RouterApiExpectTest") public class RouterApiExpectTest extends BaseNeutronApiExpectTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java index bc4f69a..e51a8c4 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java @@ -17,6 +17,12 @@ package org.jclouds.openstack.neutron.v2_0.extensions; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + import org.jclouds.openstack.neutron.v2_0.domain.ExternalGatewayInfo; import org.jclouds.openstack.neutron.v2_0.domain.Network; import org.jclouds.openstack.neutron.v2_0.domain.NetworkType; @@ -34,16 +40,9 @@ import org.jclouds.openstack.neutron.v2_0.options.CreateRouterOptions; import org.jclouds.openstack.neutron.v2_0.options.UpdateRouterOptions; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - /** * Tests parsing and Guice wiring of RouterApi * - * @author Nick Livens */ @Test(groups = "live", testName = "RouterApiLiveTest") public class RouterApiLiveTest extends BaseNeutronApiLiveTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java index 3e16b52..2d2b09c 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java @@ -16,8 +16,16 @@ */ package org.jclouds.openstack.neutron.v2_0.features; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + +import javax.ws.rs.core.MediaType; + import org.jclouds.http.HttpResponse; import org.jclouds.openstack.neutron.v2_0.domain.BulkNetwork; import org.jclouds.openstack.neutron.v2_0.domain.Network; @@ -31,19 +39,12 @@ import org.jclouds.openstack.neutron.v2_0.parse.ParseNetworkTest; import org.jclouds.rest.AuthorizationException; import org.testng.annotations.Test; -import javax.ws.rs.core.MediaType; -import java.util.Set; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; /** * Tests parsing and Guice wiring of NetworkApi * - * @author Nick Livens */ @Test(groups = "unit", testName = "NetworkApiExpectTest") public class NetworkApiExpectTest extends BaseNeutronApiExpectTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java index 6950a89..cc72b1c 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java @@ -16,9 +16,12 @@ */ package org.jclouds.openstack.neutron.v2_0.features; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + import org.jclouds.openstack.neutron.v2_0.domain.BulkNetwork; import org.jclouds.openstack.neutron.v2_0.domain.Network; import org.jclouds.openstack.neutron.v2_0.domain.NetworkType; @@ -30,16 +33,13 @@ import org.jclouds.openstack.neutron.v2_0.options.UpdateNetworkOptions; import org.jclouds.openstack.neutron.v2_0.util.PredicateUtil; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; /** * Tests parsing and Guice wiring of NetworkApi * - * @author Nick Livens */ @Test(groups = "live", testName = "NetworkApiLiveTest") public class NetworkApiLiveTest extends BaseNeutronApiLiveTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java index 47a7af3..7f5338d 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java @@ -16,8 +16,14 @@ */ package org.jclouds.openstack.neutron.v2_0.features; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + import org.jclouds.http.HttpResponse; import org.jclouds.openstack.neutron.v2_0.domain.BulkPort; import org.jclouds.openstack.neutron.v2_0.domain.Port; @@ -31,18 +37,12 @@ import org.jclouds.openstack.neutron.v2_0.parse.ParsePortTest; import org.jclouds.rest.AuthorizationException; import org.testng.annotations.Test; -import java.util.Set; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; /** * Tests parsing and Guice wiring of PortApi * - * @author Nick Livens */ @Test(groups = "unit", testName = "PortApiExpectTest") public class PortApiExpectTest extends BaseNeutronApiExpectTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java index 1a368b3..76f3734 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java @@ -44,7 +44,6 @@ import com.google.common.collect.Sets; /** * Tests PortApi in combination with the Network & SubnetApi * - * @author Nick Livens */ @Test(groups = "live", testName = "PortApiLiveTest") public class PortApiLiveTest extends BaseNeutronApiLiveTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java index 581e6a1..0cab1dd 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java @@ -40,8 +40,6 @@ import static org.testng.Assert.assertTrue; /** * Tests parsing and Guice wiring of SubnetApi - * - * @author Nick Livens */ @Test(groups = "unit", testName = "SubnetApiExpectTest") public class SubnetApiExpectTest extends BaseNeutronApiExpectTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java index bd3574f..b463339 100644 --- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java +++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java @@ -44,7 +44,6 @@ import com.google.common.collect.Sets; /** * Tests subnet api in combination with the network api * - * @author Nick Livens */ @Test(groups = "live", testName = "SubnetApiLiveTest") public class SubnetApiLiveTest extends BaseNeutronApiLiveTest { http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java index 2b2cb6b..857978a 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java @@ -22,7 +22,6 @@ import java.util.Set; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.openstack.swift.v1.features.AccountApi; @@ -51,49 +50,49 @@ public interface SwiftApi extends Closeable { Set<String> getConfiguredRegions(); @Delegate - AccountApi getAccountApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + AccountApi getAccountApi(@EndpointParam(parser = RegionToEndpoint.class) String region); @Delegate - BulkApi getBulkApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + BulkApi getBulkApi(@EndpointParam(parser = RegionToEndpoint.class) String region); @Delegate - ContainerApi getContainerApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + ContainerApi getContainerApi(@EndpointParam(parser = RegionToEndpoint.class) String region); @Delegate @Path("/{containerName}") - ObjectApi getObjectApiForContainer(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + ObjectApi getObjectApiForContainer(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("containerName") String containerName); @Delegate @Path("/{containerName}") StaticLargeObjectApi getStaticLargeObjectApiForContainer( - @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("containerName") String containerName); /** * @deprecated Please use {@link #getAccountApi(String)} as this method will be removed in jclouds 2.0. */ @Delegate - AccountApi getAccountApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + AccountApi getAccountApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region); /** * @deprecated Please use {@link #getBulkApi(String)} as this method will be removed in jclouds 2.0. */ @Delegate - BulkApi getBulkApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + BulkApi getBulkApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region); /** * @deprecated Please use {@link #getContainerApi(String)} as this method will be removed in jclouds 2.0. */ @Delegate - ContainerApi getContainerApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + ContainerApi getContainerApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region); /** * @deprecated Please use {@link #getObjectApiForContainer(String)} as this method will be removed in jclouds 2.0. */ @Delegate @Path("/{containerName}") - ObjectApi getObjectApiForRegionAndContainer(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + ObjectApi getObjectApiForRegionAndContainer(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("containerName") String containerName); /** @@ -102,6 +101,6 @@ public interface SwiftApi extends Closeable { @Delegate @Path("/{containerName}") StaticLargeObjectApi getStaticLargeObjectApiForRegionAndContainer( - @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("containerName") String containerName); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java ---------------------------------------------------------------------- diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java index 6d17492..3504c85 100644 --- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java +++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java @@ -22,7 +22,6 @@ import java.util.Set; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.openstack.keystone.v2_0.domain.Tenant; @@ -53,7 +52,7 @@ public interface AutoscaleApi extends Closeable { * Provides access to all scaling Group features. */ @Delegate - GroupApi getGroupApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + GroupApi getGroupApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** @@ -61,7 +60,7 @@ public interface AutoscaleApi extends Closeable { */ @Delegate @Path("/groups/{groupId}") - PolicyApi getPolicyApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + PolicyApi getPolicyApi(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("groupId") String groupId); /** @@ -69,7 +68,7 @@ public interface AutoscaleApi extends Closeable { */ @Delegate @Path("/groups/{groupId}/policies/{policyId}") - WebhookApi getWebhookApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + WebhookApi getWebhookApi(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("groupId") String groupId, @PathParam("policyId") String policyId); @@ -96,7 +95,7 @@ public interface AutoscaleApi extends Closeable { @Deprecated @Delegate @Path("/groups/{groupId}") - PolicyApi getPolicyApiForGroup(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + PolicyApi getPolicyApiForGroup(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("groupId") String groupId); /** @@ -107,7 +106,7 @@ public interface AutoscaleApi extends Closeable { @Deprecated @Delegate @Path("/groups/{groupId}/policies/{policyId}") - WebhookApi getWebhookApiForGroupAndPolicy(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, + WebhookApi getWebhookApiForGroupAndPolicy(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("groupId") String groupId, @PathParam("policyId") String policyId); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java index 7d52ab0..93e64a1 100644 --- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java +++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java @@ -19,7 +19,6 @@ package org.jclouds.rackspace.cloudbigdata.v1; import java.io.Closeable; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.Region; import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.rackspace.cloudbigdata.v1.features.ClusterApi; @@ -51,7 +50,7 @@ public interface CloudBigDataApi extends Closeable { * @return A profile API context. */ @Delegate - ProfileApi getProfileApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + ProfileApi getProfileApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** * Provides access to all Cluster features. @@ -59,7 +58,7 @@ public interface CloudBigDataApi extends Closeable { * @return A cluster API context. */ @Delegate - ClusterApi getClusterApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); + ClusterApi getClusterApi(@EndpointParam(parser = RegionToEndpoint.class) String region); /** * @return the Zone codes configured @@ -78,7 +77,7 @@ public interface CloudBigDataApi extends Closeable { */ @Deprecated @Delegate - ProfileApi getProfileApiForZone(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); + ProfileApi getProfileApiForZone(@EndpointParam(parser = RegionToEndpoint.class) String zone); /** * Provides access to all Cluster features. @@ -88,6 +87,6 @@ public interface CloudBigDataApi extends Closeable { */ @Deprecated @Delegate - ClusterApi getClusterApiForZone(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); + ClusterApi getClusterApiForZone(@EndpointParam(parser = RegionToEndpoint.class) String zone); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java index 2a0e50d..ff19eb8 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java @@ -16,7 +16,6 @@ */ package org.jclouds.rackspace.cloudfiles.v1; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.rackspace.cloudfiles.v1.features.CDNApi; import org.jclouds.rackspace.cloudfiles.v1.functions.RegionToCDNEndpoint; @@ -47,7 +46,7 @@ public interface CloudFilesApi extends SwiftApi { * @return the {@link CDNApi} for the specified region. */ @Delegate - CDNApi getCDNApi(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region); + CDNApi getCDNApi(@EndpointParam(parser = RegionToCDNEndpoint.class) String region); /** * Provides access to Cloud Files CDN features. @@ -60,5 +59,5 @@ public interface CloudFilesApi extends SwiftApi { */ @Deprecated @Delegate - CDNApi cdnApiInRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region); + CDNApi cdnApiInRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) String region); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java index 27a9e8c..e88626f 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java @@ -39,7 +39,6 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; -import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import org.jclouds.rackspace.cloudfiles.v1.binders.BindCDNPurgeEmailAddressesToHeaders; import org.jclouds.rackspace.cloudfiles.v1.domain.CDNContainer; import org.jclouds.rackspace.cloudfiles.v1.functions.ParseCDNContainerFromHeaders; @@ -60,12 +59,12 @@ import com.google.common.collect.FluentIterable; * Provides access to the Rackspace Cloud Files CDN API features. * * <h3>NOTE</h3> - * Before a container can be CDN enabled, it must exist in the storage system. - * To CDN enable the container, perform PUT request against it using the <code>publicURL</code> - * noted in the service catalog for Cloud Files during Authentication and set the + * Before a container can be CDN enabled, it must exist in the storage system. + * To CDN enable the container, perform PUT request against it using the <code>publicURL</code> + * noted in the service catalog for Cloud Files during Authentication and set the * <code>X-CDN-Enabled</code> header to <code>true</code>. - * - * @see {@link CloudFilesApi#getCDNApiForRegion(String)} + * + * @see {@link org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi#getCDNApi(String)} */ @Beta @RequestFilters(AuthenticateRequest.class) @@ -74,7 +73,7 @@ public interface CDNApi extends Closeable { /** * Lists up to 10,000 CDN containers. - * + * * @return a list of CDN enabled containers ordered by name. */ @Named("cdn:list") @@ -86,10 +85,10 @@ public interface CDNApi extends Closeable { /** * Lists CDN containers, with the given options. - * + * * @param options * the options to control output. - * + * * @return a list of CDN enabled containers ordered by name. */ @Named("cdn:list") @@ -101,10 +100,10 @@ public interface CDNApi extends Closeable { /** * Gets the specified CDN Container. - * + * * @param containerName * the name of the CDN Container - * + * * @return the CDNContainer or null, if not found. */ @Named("cdn:get") @@ -117,10 +116,10 @@ public interface CDNApi extends Closeable { /** * Enables the {@link CDNContainer}. - * + * * @param containerName * corresponds to {@link CDNContainer#getName()}. - * + * * @return the CDN container {@link URI} or {@code null}, if not found. */ @Named("cdn:enable") @@ -134,12 +133,12 @@ public interface CDNApi extends Closeable { /** * Enables the {@link CDNContainer} with a TTL. - * + * * @param containerName * corresponds to {@link CDNContainer#getName()}. * @param ttl * the TTL for the CDN Container. - * + * * @return the CDN container {@link URI} or {@code null}, if not found. */ @Named("cdn:enable") @@ -149,15 +148,15 @@ public interface CDNApi extends Closeable { @Path("/{containerName}") @Headers(keys = CDN_ENABLED, values = "true") @Nullable - URI enable(@PathParam("containerName") String containerName, + URI enable(@PathParam("containerName") String containerName, @HeaderParam(CDN_TTL) int ttl); /** * Disables the {@link CDNContainer}. - * + * * @param containerName * corresponds to {@link CDNContainer#getName()}. - * + * * @return {@code true} if the container was disabled, {@code false} if not. */ @Named("cdn:disable") @@ -169,14 +168,14 @@ public interface CDNApi extends Closeable { /** * Purges an object from the CDN. - * + * * @param containerName * corresponds to {@link CDNContainer#getName()}. * @param objectName * the object in the {@link CDNContainer} to purge. * @param emails * the email addresses to notify after purging. - * + * * @return {@code true} if the object was successfully purged, {@code false} if not. */ @Named("cdn:purge") @@ -184,16 +183,16 @@ public interface CDNApi extends Closeable { @Fallback(FalseOnNotFoundOr404.class) @Path("/{containerName}/{objectName}") @Headers(keys = CloudFilesHeaders.CDN_PURGE_OBJECT_EMAIL, values = "{email}") - boolean purgeObject(@PathParam("containerName") String containerName, - @PathParam("objectName") String objectName, + boolean purgeObject(@PathParam("containerName") String containerName, + @PathParam("objectName") String objectName, @BinderParam(BindCDNPurgeEmailAddressesToHeaders.class) Iterable<String> emails); /** * Updates a CDN container with the supplied {@link UpdateCDNContainerOptions} options. - * + * * @param containerName * corresponds to {@link CDNContainer#getName()}. - * + * * @param options * the {@link UpdateCDNContainerOptions} options. */ http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java index 3d4e0f9..38430d6 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java @@ -57,11 +57,11 @@ public class ParseCDNContainerFromHeaders implements Function<HttpResponse, CDNC String enabled = checkNotNull(from.getFirstHeaderOrNull(CDN_ENABLED), CDN_ENABLED); String logRetention = checkNotNull(from.getFirstHeaderOrNull(CDN_LOG_RETENTION), CDN_LOG_RETENTION); String ttl = checkNotNull(from.getFirstHeaderOrNull(CDN_TTL), CDN_TTL); - + // just need the name from the path List<String> parts = newArrayList(Splitter.on('/').split(request.getEndpoint().getPath())); - checkArgument(parts.size() > 0); - + checkArgument(!parts.isEmpty()); + return CDNContainer.builder().name(parts.get(parts.size() - 1)) .enabled(Boolean.parseBoolean(enabled)) .logRetention(Boolean.parseBoolean(logRetention)) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/242e5bcd/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java index 866c34f..07f6f25 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java @@ -34,15 +34,15 @@ import com.google.common.base.Function; import com.google.common.base.Supplier; /** - * This class ensures that the correct Cloud Files CDN endpoint is retrieved from the endpoint - * supplier. The CDN API should never be instantiated directly, but rather accessed through the + * This class ensures that the correct Cloud Files CDN endpoint is retrieved from the endpoint + * supplier. The CDN API should never be instantiated directly, but rather accessed through the * {@link CloudFilesApi#cdnApiInRegion(String)} API. * <p/> * <h3>NOTE</h3> * The Cloud Files Service Type will always default to OpenStack Object Storage ("object-storage"). * <p/> - * - * + * + * * @see CloudFilesApi#cdnApiInRegion(String) * @see CDNApi * @see RegionToEndpoint @@ -53,7 +53,7 @@ import com.google.common.base.Supplier; * Service Access Endpoints</a> */ @Singleton -public class RegionToCDNEndpoint implements Function<Object, URI> { +public class RegionToCDNEndpoint implements Function<Object, URI> { private final Supplier<Map<String, Supplier<URI>>> endpointsSupplier; @@ -65,7 +65,7 @@ public class RegionToCDNEndpoint implements Function<Object, URI> { public URI apply(@Nullable Object from) { checkArgument(from != null && from instanceof String, "you must specify a region, as a String argument"); Map<String, Supplier<URI>> regionToEndpoint = endpointsSupplier.get(); - checkState(regionToEndpoint.size() > 0, "no region name to endpoint mappings configured!"); + checkState(!regionToEndpoint.isEmpty(), "no region name to endpoint mappings configured!"); checkArgument(regionToEndpoint.containsKey(from), "requested location %s, which is not in the configured locations: %s", from, regionToEndpoint); return regionToEndpoint.get(from).get();
