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

Removed @Nullable annotations on region parameters

This commit is contained in:
Jeremy Daggett 2014-08-13 11:02:57 -07:00 committed by Jeremy Daggett
parent 744cd5d7eb
commit 7d70362590
9 changed files with 99 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java
View File

@ -19,7 +19,6 @@ package org.jclouds.openstack.cinder.v1;
import java.io.Closeable; import java.io.Closeable;
import java.util.Set; import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Region; import org.jclouds.location.Region;
import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.location.functions.RegionToEndpoint;
import org.jclouds.openstack.cinder.v1.domain.Snapshot; import org.jclouds.openstack.cinder.v1.domain.Snapshot;
@ -37,7 +36,7 @@ import org.jclouds.rest.annotations.EndpointParam;
import com.google.inject.Provides; import com.google.inject.Provides;
/** /**
* Provides synchronous access to OpenStack Block Storage (Cinder) v1 API. * Provides access to OpenStack Block Storage (Cinder) v1 API.
*/ */
public interface CinderApi extends Closeable { public interface CinderApi extends Closeable {
@ -49,34 +48,34 @@ public interface CinderApi extends Closeable {
Set<String> getConfiguredRegions(); Set<String> getConfiguredRegions();
/** /**
* Provides synchronous access to {@link Extension} features. * Provides access to {@link Extension} features.
*/ */
@Delegate @Delegate
ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides synchronous access to {@link Volume} features. * Provides access to {@link Volume} features.
*/ */
@Delegate @Delegate
VolumeApi getVolumeApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); VolumeApi getVolumeApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides synchronous access to {@link VolumeType} features. * Provides access to {@link VolumeType} features.
*/ */
@Delegate @Delegate
VolumeTypeApi getVolumeTypeApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); VolumeTypeApi getVolumeTypeApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides synchronous access to {@link Snapshot} features. * Provides access to {@link Snapshot} features.
*/ */
@Delegate @Delegate
SnapshotApi getSnapshotApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); SnapshotApi getSnapshotApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides synchronous access to quota features. * Provides access to quota features.
*/ */
@Delegate @Delegate
QuotaApi getQuotaApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); QuotaApi getQuotaApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* @return the Zone codes configured * @return the Zone codes configured
@ -88,43 +87,43 @@ public interface CinderApi extends Closeable {
Set<String> getConfiguredZones(); Set<String> getConfiguredZones();
/** /**
* Provides synchronous access to Extension features. * Provides access to Extension features.
* @deprecated Please use {@link #getExtensionApi(String region)} as this method will be removed * @deprecated Please use {@link #getExtensionApi(String region)} as this method will be removed
* in jclouds 3.0. * in jclouds 3.0.
*/ */
@Deprecated @Deprecated
@Delegate @Delegate
ExtensionApi getExtensionApiForZone( ExtensionApi getExtensionApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides synchronous access to Volume features. * Provides access to Volume features.
* @deprecated Please use {@link #getVolumeApi(String region)} as this method will be removed * @deprecated Please use {@link #getVolumeApi(String region)} as this method will be removed
* in jclouds 3.0. * in jclouds 3.0.
*/ */
@Deprecated @Deprecated
@Delegate @Delegate
VolumeApi getVolumeApiForZone( VolumeApi getVolumeApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides synchronous access to VolumeType features. * Provides access to VolumeType features.
* @deprecated Please use {@link #getVolumeTypeApi(String region)} as this method will be removed * @deprecated Please use {@link #getVolumeTypeApi(String region)} as this method will be removed
* in jclouds 3.0. * in jclouds 3.0.
*/ */
@Deprecated @Deprecated
@Delegate @Delegate
VolumeTypeApi getVolumeTypeApiForZone( VolumeTypeApi getVolumeTypeApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides synchronous access to Snapshot features. * Provides access to Snapshot features.
* @deprecated Please use {@link #getSnapshotApi(String)} as this method will be removed * @deprecated Please use {@link #getSnapshotApi(String)} as this method will be removed
* in jclouds 3.0. * in jclouds 3.0.
*/ */
@Deprecated @Deprecated
@Delegate @Delegate
SnapshotApi getSnapshotApiForZone( SnapshotApi getSnapshotApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
} }

2
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
View File

@ -43,7 +43,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
/** /**
* Provides synchronous access to Volume Snapshots API. * Provides access to Volume Snapshots API.
* *
*/ */
@SkipEncoding({'/', '='}) @SkipEncoding({'/', '='})

2
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
View File

@ -43,7 +43,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
/** /**
* Provides synchronous access to the Volume API. * Provides access to the Volume API.
* *
* This API strictly handles creating and managing Volumes. To attach a Volume to a Server you need to use the * This API strictly handles creating and managing Volumes. To attach a Volume to a Server you need to use the
* @see VolumeAttachmentApi * @see VolumeAttachmentApi

2
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
View File

@ -36,7 +36,7 @@ import org.jclouds.rest.annotations.SkipEncoding;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
/** /**
* Provides synchronous access to the OpenStack Block Storage (Cinder) v1 Volume Types API. * Provides access to the OpenStack Block Storage (Cinder) v1 Volume Types API.
* *
*/ */
@SkipEncoding({'/', '='}) @SkipEncoding({'/', '='})

5
apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2Api.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.nova.ec2; package org.jclouds.openstack.nova.ec2;
import org.jclouds.ec2.EC2Api; import org.jclouds.ec2.EC2Api;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
import org.jclouds.openstack.nova.ec2.features.NovaEC2KeyPairApi; import org.jclouds.openstack.nova.ec2.features.NovaEC2KeyPairApi;
import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Delegate;
@ -26,7 +25,7 @@ import org.jclouds.rest.annotations.EndpointParam;
import com.google.common.base.Optional; import com.google.common.base.Optional;
/** /**
* Provides synchronous access to EC2 services. * Provides access to EC2 services.
*/ */
public interface NovaEC2Api extends EC2Api { public interface NovaEC2Api extends EC2Api {
@ -40,6 +39,6 @@ public interface NovaEC2Api extends EC2Api {
@Delegate @Delegate
@Override @Override
Optional<? extends NovaEC2KeyPairApi> getKeyPairApiForRegion( Optional<? extends NovaEC2KeyPairApi> getKeyPairApiForRegion(
@EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) @Nullable String region); @EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) String region);
} }

3
apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/features/NovaEC2KeyPairApi.java
View File

@ -28,7 +28,6 @@ import org.jclouds.ec2.domain.KeyPair;
import org.jclouds.ec2.features.KeyPairApi; import org.jclouds.ec2.features.KeyPairApi;
import org.jclouds.ec2.functions.EncodedRSAPublicKeyToBase64; import org.jclouds.ec2.functions.EncodedRSAPublicKeyToBase64;
import org.jclouds.ec2.xml.KeyPairResponseHandler; import org.jclouds.ec2.xml.KeyPairResponseHandler;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.EndpointParam;
import org.jclouds.rest.annotations.FormParams; import org.jclouds.rest.annotations.FormParams;
@ -79,7 +78,7 @@ public interface NovaEC2KeyPairApi extends KeyPairApi {
@FormParams(keys = ACTION, values = "ImportKeyPair") @FormParams(keys = ACTION, values = "ImportKeyPair")
@XMLResponseParser(KeyPairResponseHandler.class) @XMLResponseParser(KeyPairResponseHandler.class)
KeyPair importKeyPairInRegion( KeyPair importKeyPairInRegion(
@EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) @Nullable String region, @EndpointParam(parser = RegionToEndpointOrProviderIfNull.class) String region,
@FormParam("KeyName") String keyName, @FormParam("KeyName") String keyName,
@FormParam("PublicKeyMaterial") @ParamParser(EncodedRSAPublicKeyToBase64.class) String publicKeyMaterial); @FormParam("PublicKeyMaterial") @ParamParser(EncodedRSAPublicKeyToBase64.class) String publicKeyMaterial);
} }

81
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
View File

@ -19,7 +19,6 @@ package org.jclouds.openstack.nova.v2_0;
import java.io.Closeable; import java.io.Closeable;
import java.util.Set; import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Region; import org.jclouds.location.Region;
import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.location.functions.RegionToEndpoint;
import org.jclouds.openstack.nova.v2_0.extensions.AvailabilityZoneApi; import org.jclouds.openstack.nova.v2_0.extensions.AvailabilityZoneApi;
@ -66,25 +65,25 @@ public interface NovaApi extends Closeable {
* Provides access to Server features. * Provides access to Server features.
*/ */
@Delegate @Delegate
ServerApi getServerApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); ServerApi getServerApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Flavor features. * Provides access to Flavor features.
*/ */
@Delegate @Delegate
FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Extension features. * Provides access to Extension features.
*/ */
@Delegate @Delegate
ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Image features. * Provides access to Image features.
*/ */
@Delegate @Delegate
ImageApi getImageApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); ImageApi getImageApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Availability Zone features. * Provides access to Availability Zone features.
@ -95,7 +94,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends AvailabilityZoneApi> getAvailabilityZoneApi( Optional<? extends AvailabilityZoneApi> getAvailabilityZoneApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Floating IP features. * Provides access to Floating IP features.
@ -106,7 +105,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends FloatingIPApi> getFloatingIPApi( Optional<? extends FloatingIPApi> getFloatingIPApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Security Group features. * Provides access to Security Group features.
@ -117,7 +116,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends SecurityGroupApi> getSecurityGroupApi( Optional<? extends SecurityGroupApi> getSecurityGroupApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Key Pair features. * Provides access to Key Pair features.
@ -128,7 +127,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends KeyPairApi> getKeyPairApi( Optional<? extends KeyPairApi> getKeyPairApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Host Administration features. * Provides access to Host Administration features.
@ -139,7 +138,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends HostAdministrationApi> getHostAdministrationApi( Optional<? extends HostAdministrationApi> getHostAdministrationApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Simple Tenant Usage features. * Provides access to Simple Tenant Usage features.
@ -150,7 +149,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageApi( Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Virtual Interface features. * Provides access to Virtual Interface features.
@ -161,7 +160,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends VirtualInterfaceApi> getVirtualInterfaceApi( Optional<? extends VirtualInterfaceApi> getVirtualInterfaceApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Server Extra Data features. * Provides access to Server Extra Data features.
@ -172,7 +171,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsApi( Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Server Admin Actions features. * Provides access to Server Admin Actions features.
@ -183,7 +182,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends ServerAdminApi> getServerAdminApi( Optional<? extends ServerAdminApi> getServerAdminApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Aggregate features. * Provides access to Aggregate features.
@ -194,7 +193,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends HostAggregateApi> getHostAggregateApi( Optional<? extends HostAggregateApi> getHostAggregateApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Flavor extra specs features. * Provides access to Flavor extra specs features.
@ -205,7 +204,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsApi( Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Quota features. * Provides access to Quota features.
@ -216,7 +215,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends QuotaApi> getQuotaApi( Optional<? extends QuotaApi> getQuotaApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Volume features. * Provides access to Volume features.
@ -227,7 +226,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends VolumeApi> getVolumeApi( Optional<? extends VolumeApi> getVolumeApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Volume Attachment features. * Provides access to Volume Attachment features.
@ -238,7 +237,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends VolumeAttachmentApi> getVolumeAttachmentApi( Optional<? extends VolumeAttachmentApi> getVolumeAttachmentApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Volume Type features. * Provides access to Volume Type features.
@ -249,7 +248,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends VolumeTypeApi> getVolumeTypeApi( Optional<? extends VolumeTypeApi> getVolumeTypeApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Console features. * Provides access to Console features.
@ -260,7 +259,7 @@ public interface NovaApi extends Closeable {
*/ */
@Delegate @Delegate
Optional<? extends ConsolesApi> getConsolesApi( Optional<? extends ConsolesApi> getConsolesApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* @return the Zone codes configured * @return the Zone codes configured
@ -278,7 +277,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
ServerApi getServerApiForZone( ServerApi getServerApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Flavor features. * Provides access to Flavor features.
@ -287,7 +286,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
FlavorApi getFlavorApiForZone( FlavorApi getFlavorApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Extension features. * Provides access to Extension features.
@ -297,7 +296,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
ExtensionApi getExtensionApiForZone( ExtensionApi getExtensionApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Image features. * Provides access to Image features.
@ -307,7 +306,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
ImageApi getImageApiForZone( ImageApi getImageApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Floating IP features. * Provides access to Floating IP features.
@ -317,7 +316,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends FloatingIPApi> getFloatingIPExtensionForZone( Optional<? extends FloatingIPApi> getFloatingIPExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Security Group features. * Provides access to Security Group features.
@ -327,7 +326,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends SecurityGroupApi> getSecurityGroupExtensionForZone( Optional<? extends SecurityGroupApi> getSecurityGroupExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Key Pair features. * Provides access to Key Pair features.
@ -337,7 +336,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends KeyPairApi> getKeyPairExtensionForZone( Optional<? extends KeyPairApi> getKeyPairExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Host Administration features. * Provides access to Host Administration features.
@ -347,7 +346,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends HostAdministrationApi> getHostAdministrationExtensionForZone( Optional<? extends HostAdministrationApi> getHostAdministrationExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Simple Tenant Usage features. * Provides access to Simple Tenant Usage features.
@ -357,7 +356,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageExtensionForZone( Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Virtual Interface features. * Provides access to Virtual Interface features.
@ -367,7 +366,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends VirtualInterfaceApi> getVirtualInterfaceExtensionForZone( Optional<? extends VirtualInterfaceApi> getVirtualInterfaceExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Server Extra Data features. * Provides access to Server Extra Data features.
@ -377,7 +376,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsExtensionForZone( Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Server Admin Actions features. * Provides access to Server Admin Actions features.
@ -387,7 +386,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends ServerAdminApi> getServerAdminExtensionForZone( Optional<? extends ServerAdminApi> getServerAdminExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Aggregate features. * Provides access to Aggregate features.
@ -397,7 +396,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends HostAggregateApi> getHostAggregateExtensionForZone( Optional<? extends HostAggregateApi> getHostAggregateExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Flavor extra specs features. * Provides access to Flavor extra specs features.
@ -407,7 +406,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsExtensionForZone( Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Quota features. * Provides access to Quota features.
@ -417,7 +416,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends QuotaApi> getQuotaExtensionForZone( Optional<? extends QuotaApi> getQuotaExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Volume features. * Provides access to Volume features.
@ -427,7 +426,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends VolumeApi> getVolumeExtensionForZone( Optional<? extends VolumeApi> getVolumeExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Volume Attachment features. * Provides access to Volume Attachment features.
@ -437,7 +436,7 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends VolumeAttachmentApi> getVolumeAttachmentExtensionForZone( Optional<? extends VolumeAttachmentApi> getVolumeAttachmentExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Volume Type features. * Provides access to Volume Type features.
@ -447,15 +446,15 @@ public interface NovaApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends VolumeTypeApi> getVolumeTypeExtensionForZone( Optional<? extends VolumeTypeApi> getVolumeTypeExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides synchronous access to Console features. * Provides access to Console features.
* @deprecated Please use {@link #getConsolesApi(String region)} as this method will be removed * @deprecated Please use {@link #getConsolesApi(String region)} as this method will be removed
* in jclouds 3.0. * in jclouds 3.0.
*/ */
@Deprecated @Deprecated
@Delegate @Delegate
Optional<? extends ConsolesApi> getConsolesExtensionForZone( Optional<? extends ConsolesApi> getConsolesExtensionForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
} }

17
apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
View File

@ -22,7 +22,6 @@ import java.util.Set;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Region; import org.jclouds.location.Region;
import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.location.functions.RegionToEndpoint;
import org.jclouds.openstack.keystone.v2_0.domain.Tenant; import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
@ -54,20 +53,20 @@ public interface TroveApi extends Closeable {
* Provides access to Flavor features. * Provides access to Flavor features.
*/ */
@Delegate @Delegate
FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); FlavorApi getFlavorApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Instance features. * Provides access to Instance features.
*/ */
@Delegate @Delegate
InstanceApi getInstanceApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); InstanceApi getInstanceApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to User features. * Provides access to User features.
*/ */
@Delegate @Delegate
@Path("/instances/{instanceId}") @Path("/instances/{instanceId}")
UserApi getUserApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, UserApi getUserApi(@EndpointParam(parser = RegionToEndpoint.class) String region,
@PathParam("instanceId") String instanceId); @PathParam("instanceId") String instanceId);
/** /**
@ -75,7 +74,7 @@ public interface TroveApi extends Closeable {
*/ */
@Delegate @Delegate
@Path("/instances/{instanceId}") @Path("/instances/{instanceId}")
DatabaseApi getDatabaseApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, DatabaseApi getDatabaseApi(@EndpointParam(parser = RegionToEndpoint.class) String region,
@PathParam("instanceId") String instanceId); @PathParam("instanceId") String instanceId);
/** /**
@ -98,7 +97,7 @@ public interface TroveApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
FlavorApi getFlavorApiForZone( FlavorApi getFlavorApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Instance features. * Provides access to Instance features.
@ -108,7 +107,7 @@ public interface TroveApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
InstanceApi getInstanceApiForZone( InstanceApi getInstanceApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to User features. * Provides access to User features.
@ -118,7 +117,7 @@ public interface TroveApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
@Path("/instances/{instanceId}") @Path("/instances/{instanceId}")
UserApi getUserApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, UserApi getUserApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) String zone,
@PathParam("instanceId") String instanceId); @PathParam("instanceId") String instanceId);
/** /**
@ -129,7 +128,7 @@ public interface TroveApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
@Path("/instances/{instanceId}") @Path("/instances/{instanceId}")
DatabaseApi getDatabaseApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, DatabaseApi getDatabaseApiForZoneAndInstance(@EndpointParam(parser = RegionToEndpoint.class) String zone,
@PathParam("instanceId") String instanceId); @PathParam("instanceId") String instanceId);
/** /**

45
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java
View File

@ -22,7 +22,6 @@ import java.util.Set;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Region; import org.jclouds.location.Region;
import org.jclouds.location.functions.RegionToEndpoint; import org.jclouds.location.functions.RegionToEndpoint;
import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleApi; import org.jclouds.rackspace.cloudloadbalancers.v1.features.AccessRuleApi;
@ -58,7 +57,7 @@ public interface CloudLoadBalancersApi extends Closeable {
*/ */
@Delegate @Delegate
LoadBalancerApi getLoadBalancerApi( LoadBalancerApi getLoadBalancerApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); @EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* Provides access to Node features. * Provides access to Node features.
@ -66,7 +65,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
NodeApi getNodeApi( NodeApi getNodeApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Access Rule features. * Provides access to Access Rule features.
@ -74,7 +73,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
AccessRuleApi getAccessRuleApi( AccessRuleApi getAccessRuleApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Virtual IP features. * Provides access to Virtual IP features.
@ -82,7 +81,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
VirtualIPApi getVirtualIPApi( VirtualIPApi getVirtualIPApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Connection features. * Provides access to Connection features.
@ -90,7 +89,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
ConnectionApi getConnectionApi( ConnectionApi getConnectionApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Health Monitor features. * Provides access to Health Monitor features.
@ -98,7 +97,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
HealthMonitorApi getHealthMonitorApi( HealthMonitorApi getHealthMonitorApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Session Persistence features. * Provides access to Session Persistence features.
@ -106,7 +105,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
SessionPersistenceApi getSessionPersistenceApi( SessionPersistenceApi getSessionPersistenceApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Content Caching features. * Provides access to Content Caching features.
@ -114,7 +113,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
ContentCachingApi getContentCachingApi( ContentCachingApi getContentCachingApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to SSL Termination features. * Provides access to SSL Termination features.
@ -122,7 +121,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
SSLTerminationApi getSSLTerminationApi( SSLTerminationApi getSSLTerminationApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Error Page features. * Provides access to Error Page features.
@ -130,13 +129,13 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
ErrorPageApi getErrorPageApi( ErrorPageApi getErrorPageApi(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("lbId") int lbId);
/** /**
* Provides access to Report features. * Provides access to Report features.
*/ */
@Delegate @Delegate
ReportApi getReportApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region); ReportApi getReportApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
/** /**
* @return the Zone codes configured * @return the Zone codes configured
@ -154,7 +153,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
LoadBalancerApi getLoadBalancerApiForZone( LoadBalancerApi getLoadBalancerApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
/** /**
* Provides access to Node features. * Provides access to Node features.
@ -165,7 +164,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
NodeApi getNodeApiForZoneAndLoadBalancer( NodeApi getNodeApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Access Rule features. * Provides access to Access Rule features.
@ -176,7 +175,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
AccessRuleApi getAccessRuleApiForZoneAndLoadBalancer( AccessRuleApi getAccessRuleApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Virtual IP features. * Provides access to Virtual IP features.
@ -187,7 +186,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
VirtualIPApi getVirtualIPApiForZoneAndLoadBalancer( VirtualIPApi getVirtualIPApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Connection features. * Provides access to Connection features.
@ -198,7 +197,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
ConnectionApi getConnectionApiForZoneAndLoadBalancer( ConnectionApi getConnectionApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Health Monitor features. * Provides access to Health Monitor features.
@ -209,7 +208,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
HealthMonitorApi getHealthMonitorApiForZoneAndLoadBalancer( HealthMonitorApi getHealthMonitorApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Session Persistence features. * Provides access to Session Persistence features.
@ -220,7 +219,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
SessionPersistenceApi getSessionPersistenceApiForZoneAndLoadBalancer( SessionPersistenceApi getSessionPersistenceApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Content Caching features. * Provides access to Content Caching features.
@ -231,7 +230,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
ContentCachingApi getContentCachingApiForZoneAndLoadBalancer( ContentCachingApi getContentCachingApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to SSL Termination features. * Provides access to SSL Termination features.
@ -242,7 +241,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
SSLTerminationApi getSSLTerminationApiForZoneAndLoadBalancer( SSLTerminationApi getSSLTerminationApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Error Page features. * Provides access to Error Page features.
@ -253,7 +252,7 @@ public interface CloudLoadBalancersApi extends Closeable {
@Delegate @Delegate
@Path("/loadbalancers/{lbId}") @Path("/loadbalancers/{lbId}")
ErrorPageApi getErrorPageApiForZoneAndLoadBalancer( ErrorPageApi getErrorPageApiForZoneAndLoadBalancer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone, @PathParam("lbId") int lbId); @EndpointParam(parser = RegionToEndpoint.class) String zone, @PathParam("lbId") int lbId);
/** /**
* Provides access to Report features. * Provides access to Report features.
@ -262,5 +261,5 @@ public interface CloudLoadBalancersApi extends Closeable {
@Deprecated @Deprecated
@Delegate @Delegate
ReportApi getReportApiForZone( ReportApi getReportApiForZone(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String zone); @EndpointParam(parser = RegionToEndpoint.class) String zone);
} }