From 7375ca4619ccb0503188501927f111140e25ba37 Mon Sep 17 00:00:00 2001 From: Everett Toews Date: Wed, 21 Jan 2015 10:55:08 -0600 Subject: [PATCH] Normalize deprecation messages to make them easier to find --- .../openstack/cinder/v1/CinderApi.java | 14 ++--- .../config/KeystoneAuthenticationModule.java | 3 +- .../v2_0/options/PaginationOptions.java | 4 +- .../jclouds/openstack/nova/v2_0/NovaApi.java | 57 +++++++------------ .../compute/options/NovaTemplateOptions.java | 6 +- .../openstack/nova/v2_0/domain/Server.java | 2 +- .../domain/zonescoped/FlavorInRegion.java | 4 +- .../v2_0/domain/zonescoped/ImageInRegion.java | 4 +- .../v2_0/domain/zonescoped/RegionAndId.java | 4 +- .../v2_0/domain/zonescoped/RegionAndName.java | 4 +- .../RegionSecurityGroupNameAndPorts.java | 4 +- .../zonescoped/SecurityGroupInRegion.java | 4 +- .../domain/zonescoped/ServerInRegion.java | 4 +- .../nova/v2_0/options/ListOptions.java | 2 +- .../swift/v1/domain/SwiftObject.java | 2 +- .../jclouds/openstack/trove/v1/TroveApi.java | 17 +++--- .../rackspace/clouddns/v1/CloudDNSApi.java | 4 +- .../v1/CloudLoadBalancersApi.java | 38 ++++++------- 18 files changed, 74 insertions(+), 103 deletions(-) diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java index 7cd0f5548a..4ecbd8868f 100644 --- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java +++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java @@ -88,7 +88,7 @@ public interface CinderApi extends Closeable { /** * @return the Zone codes configured - * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0. */ @Deprecated @Provides @@ -97,8 +97,7 @@ public interface CinderApi extends Closeable { /** * Provides access to Extension features. - * @deprecated Please use {@link #getExtensionApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getExtensionApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -107,8 +106,7 @@ public interface CinderApi extends Closeable { /** * Provides access to Volume features. - * @deprecated Please use {@link #getVolumeApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getVolumeApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -117,8 +115,7 @@ public interface CinderApi extends Closeable { /** * Provides access to VolumeType features. - * @deprecated Please use {@link #getVolumeTypeApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getVolumeTypeApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -127,8 +124,7 @@ public interface CinderApi extends Closeable { /** * Provides access to Snapshot features. - * @deprecated Please use {@link #getSnapshotApi(String)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getSnapshotApi(String)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java index 90e54889c1..2c2fac338a 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/KeystoneAuthenticationModule.java @@ -149,8 +149,7 @@ public class KeystoneAuthenticationModule extends AbstractModule { } /** - * @deprecated All OpenStack APIs rely on regions in jclouds 2.0 and this module will be removed - * in jclouds 3.0. + * @deprecated All OpenStack APIs rely on regions in jclouds 2.0. To be removed in jclouds 2.0. */ @Deprecated public static class ZoneModule extends AbstractModule { diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/options/PaginationOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/options/PaginationOptions.java index 80ac0107db..f4d88e1199 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/options/PaginationOptions.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/options/PaginationOptions.java @@ -45,7 +45,7 @@ public class PaginationOptions extends BaseHttpRequestOptions { * * @deprecated The {@code changes-since} query does not apply to all OpenStack APIs. Please refer to the OpenStack * Nova {@code ListOptions.changesSince(Date)} and Glance {@code ListImageOptions.changesSince(Date)}. - * This option will be removed in 2.1. + * To be removed in jclouds 2.0. */ @Deprecated public PaginationOptions changesSince(Date changesSince) { @@ -90,7 +90,7 @@ public class PaginationOptions extends BaseHttpRequestOptions { * @see PaginationOptions#changesSince(Date) * @deprecated The {@code changes-since} query does not apply to all OpenStack APIs. Please refer to the OpenStack * Nova {@code ListOptions.changesSince(Date)} and Glance {@code ListImageOptions.changesSince(Date)}. - * This option will be removed in 2.1. + * To be removed in jclouds 2.0. */ @Deprecated public static PaginationOptions changesSince(Date changesSince) { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java index a0748df403..c1d2e7ff2f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java @@ -275,7 +275,7 @@ public interface NovaApi extends Closeable { /** * @return the Zone codes configured - * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0. */ @Deprecated @Provides @@ -284,7 +284,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Server features. - * @deprecated Please use {@link #getServerApi(String)} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getServerApi(String)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -293,7 +293,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Flavor features. - * @deprecated Please use {@link #getFlavorApi(String)} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getFlavorApi(String)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -302,8 +302,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Extension features. - * @deprecated Please use {@link #getExtensionApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getExtensionApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -312,8 +311,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Image features. - * @deprecated Please use {@link #getImageApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getImageApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -322,8 +320,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Floating IP features. - * @deprecated Please use {@link #getFloatingIPApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getFloatingIPApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -332,8 +329,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Security Group features. - * @deprecated Please use {@link #getSecurityGroupApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getSecurityGroupApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -342,8 +338,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Key Pair features. - * @deprecated Please use {@link #getKeyPairApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getKeyPairApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -352,8 +347,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Host Administration features. - * @deprecated Please use {@link #getHostAdministrationApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getHostAdministrationApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -362,8 +356,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Simple Tenant Usage features. - * @deprecated Please use {@link #getSimpleTenantUsageApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getSimpleTenantUsageApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -372,8 +365,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Virtual Interface features. - * @deprecated Please use {@link #getVirtualInterfaceApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getVirtualInterfaceApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -382,8 +374,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Server Extra Data features. - * @deprecated Please use {@link #getServerWithSecurityGroupsApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getServerWithSecurityGroupsApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -392,8 +383,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Server Admin Actions features. - * @deprecated Please use {@link #getServerAdminApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getServerAdminApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -402,8 +392,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Aggregate features. - * @deprecated Please use {@link #getHostAggregateApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getHostAggregateApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -412,8 +401,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Flavor extra specs features. - * @deprecated Please use {@link #getFlavorExtraSpecsApi(String)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getFlavorExtraSpecsApi(String)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -422,8 +410,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Quota features. - * @deprecated Please use {@link #getQuotaApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getQuotaApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -432,8 +419,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Volume features. - * @deprecated Please use {@link #getVolumeApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getVolumeApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -442,8 +428,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Volume Attachment features. - * @deprecated Please use {@link #getVolumeAttachmentApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getVolumeAttachmentApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -452,8 +437,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Volume Type features. - * @deprecated Please use {@link #getVolumeTypeApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getVolumeTypeApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -462,8 +446,7 @@ public interface NovaApi extends Closeable { /** * Provides access to Console features. - * @deprecated Please use {@link #getConsolesApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getConsolesApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java index b7d6c5d1b2..a6b1ed63c7 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java @@ -180,7 +180,7 @@ public class NovaTemplateOptions extends TemplateOptions implements Cloneable { /** * * @see org.jclouds.openstack.nova.v2_0.options.CreateServerOptions#getSecurityGroupNames - * @deprecated Use @link {@link TemplateOptions#securityGroups(String...)} instead. + * @deprecated Use @link {@link TemplateOptions#securityGroups(String...)} instead. To be removed in jclouds 2.0. */ @Deprecated public NovaTemplateOptions securityGroupNames(String... securityGroupNames) { @@ -189,7 +189,7 @@ public class NovaTemplateOptions extends TemplateOptions implements Cloneable { /** * @see org.jclouds.openstack.nova.v2_0.options.CreateServerOptions#getSecurityGroupNames - * @deprecated Use {@link TemplateOptions#securityGroups(Iterable)} instead. + * @deprecated Use {@link TemplateOptions#securityGroups(Iterable)} instead. To be removed in jclouds 2.0. */ @Deprecated public NovaTemplateOptions securityGroupNames(Iterable securityGroupNames) { @@ -256,7 +256,7 @@ public class NovaTemplateOptions extends TemplateOptions implements Cloneable { * to {@link #getInboundPorts()} * * @see org.jclouds.openstack.nova.v2_0.options.CreateServerOptions#getSecurityGroupNames - * @deprecated Use {@link TemplateOptions#getGroups()} instead. + * @deprecated Use {@link TemplateOptions#getGroups()} instead. To be removed in jclouds 2.0. */ @Deprecated public Optional> getSecurityGroupNames() { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java index 220ff62416..4164155a63 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java @@ -61,7 +61,7 @@ public class Server extends Resource { DELETED, UNKNOWN, ERROR, /** - * @deprecated please use {@code Status.SHUTOFF} instead + * @deprecated please use {@code Status.SHUTOFF} instead. To be removed in jclouds 2.0. */ @Deprecated STOPPED, diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/FlavorInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/FlavorInRegion.java index b547f96e82..df8c70b170 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/FlavorInRegion.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/FlavorInRegion.java @@ -22,8 +22,8 @@ import org.jclouds.openstack.nova.v2_0.domain.Flavor; /** * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.FlavorInRegion FlavorInRegion}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.FlavorInRegion FlavorInRegion} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class FlavorInRegion extends RegionAndId { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ImageInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ImageInRegion.java index cf818ffe7c..1d793359ca 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ImageInRegion.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ImageInRegion.java @@ -22,8 +22,8 @@ import org.jclouds.openstack.nova.v2_0.domain.Image; /** * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.ImageInRegion ImageInRegion}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.ImageInRegion ImageInRegion} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class ImageInRegion extends RegionAndId { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndId.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndId.java index 7d45bff7ae..87c53cc164 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndId.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndId.java @@ -25,8 +25,8 @@ import com.google.common.collect.Iterables; /** * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId RegionAndId}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId RegionAndId} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class RegionAndId { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java index dd628c2011..cdf79c93df 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java @@ -30,8 +30,8 @@ import com.google.common.collect.Iterables; * Helpful when looking for resources by region and name * * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndName RegionAndName}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndName RegionAndName} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class RegionAndName { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java index a0322fc922..86202c3e45 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java @@ -27,8 +27,8 @@ import com.google.common.collect.ImmutableSet; /** * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionSecurityGroupNameAndPorts RegionSecurityGroupNameAndPorts}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionSecurityGroupNameAndPorts RegionSecurityGroupNameAndPorts} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class RegionSecurityGroupNameAndPorts extends RegionAndName { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInRegion.java index fb2793baab..1a147ed284 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInRegion.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/SecurityGroupInRegion.java @@ -22,8 +22,8 @@ import org.jclouds.openstack.nova.v2_0.domain.SecurityGroup; /** * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.SecurityGroupInRegion SecurityGroupInRegion}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.SecurityGroupInRegion SecurityGroupInRegion} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class SecurityGroupInRegion extends RegionAndName { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInRegion.java index 9e7c405983..18dfe363c6 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInRegion.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ServerInRegion.java @@ -22,8 +22,8 @@ import org.jclouds.openstack.nova.v2_0.domain.Server; /** * @deprecated This package has been replaced with {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped}. - * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.ServerInRegion ServerInRegion}, - * as this class will be removed in jclouds 2.1.0. + * Please use {@link org.jclouds.openstack.nova.v2_0.domain.regionscoped.ServerInRegion ServerInRegion} + * instead. To be removed in jclouds 2.0. */ @Deprecated public class ServerInRegion extends RegionAndId { diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/ListOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/ListOptions.java index 6b1e648a47..f9e4f4e88d 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/ListOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/ListOptions.java @@ -94,7 +94,7 @@ public class ListOptions extends PaginationOptions { /** * * @see PaginationOptions#limit(int) - * @deprecated Please use {@link #limit(int)} as this builder method will be removed in 2.0. + * @deprecated Please use {@link #limit(int)} instead. To be removed in jclouds 2.0. */ @Deprecated public static ListOptions maxResults(int maxKeys) { diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java index 0bbea90e48..d238ab81e1 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java @@ -76,7 +76,7 @@ public class SwiftObject implements Comparable { /** * @return The ETag of the content of this object. - * @deprecated Please use {@link #getETag()} as this method will be removed in jclouds 1.8. + * @deprecated Please use {@link #getETag()} instead. To be removed in jclouds 2.0. */ @Deprecated public String getEtag() { diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java index 563117b27e..25869fbf61 100644 --- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java +++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java @@ -81,8 +81,7 @@ public interface TroveApi extends Closeable { * Provides a set of all zones available. * * @return the Zone codes configured - * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0. */ @Deprecated @Provides @@ -91,8 +90,7 @@ public interface TroveApi extends Closeable { /** * Provides access to Flavor features. - * @deprecated Please use {@link #getFlavorApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getFlavorApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -101,8 +99,7 @@ public interface TroveApi extends Closeable { /** * Provides access to Instance features. - * @deprecated Please use {@link #getInstanceApi(String region)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getInstanceApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -111,8 +108,8 @@ public interface TroveApi extends Closeable { /** * Provides access to User features. - * @deprecated Please use {@link #getUserApi(String region, String instanceId)} as this method will be - * removed in jclouds 3.0. + * @deprecated Please use {@link #getUserApi(String region, String instanceId)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -122,8 +119,8 @@ public interface TroveApi extends Closeable { /** * Provides access to Database features. - * @deprecated Please use {@link #getDatabaseApi(String region, String instanceId)} as this method will - * be removed in jclouds 3.0. + * @deprecated Please use {@link #getDatabaseApi(String region, String instanceId)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java index 2b3bc55fab..651d6b7560 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApi.java @@ -101,7 +101,7 @@ public interface CloudDNSApi extends Closeable { /** * Provides access to Record features. - * @deprecated Please use {@link #getRecordApi(int)} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getRecordApi(int)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -110,7 +110,7 @@ public interface CloudDNSApi extends Closeable { /** * Provides access to Reverse DNS features. - * @deprecated Please use {@link #getReverseDNSApi(String)} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getReverseDNSApi(String)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java index e1446886a5..325cc4d8ff 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApi.java @@ -139,7 +139,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * @return the Zone codes configured - * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0. */ @Deprecated @Provides @@ -148,7 +148,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Load Balancer features. - * @deprecated Please use {@link #getLoadBalancerApi(String region)} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getLoadBalancerApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -157,8 +157,8 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Node features. - * @deprecated Please use {@link #getNodeApiForLoadBalancer(String region. int lbId)} as this method will be removed - * in jclouds 3.0. + * @deprecated Please use {@link #getNodeApi(String, int)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -168,8 +168,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Access Rule features. - * @deprecated Please use {@link #getAccessRuleApi(String region, int lbId)} as this method will be - * removed in jclouds 3.0. + * @deprecated Please use {@link #getAccessRuleApi(String region, int lbId)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -179,8 +178,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Virtual IP features. - * @deprecated Please use {@link #getVirtualIPApi(String region, int lbId)} as this method will be - * removed in jclouds 3.0. + * @deprecated Please use {@link #getVirtualIPApi(String region, int lbId)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -190,8 +188,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Connection features. - * @deprecated Please use {@link #getConnectionApi(String region, int lbId)} as this method will be - * removed in jclouds 3.0. + * @deprecated Please use {@link #getConnectionApi(String region, int lbId)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -201,8 +198,8 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Health Monitor features. - * @deprecated Please use {@link #getHealthMonitorApi(String region, int lbId)} as this method will be - * removed in jclouds 3.0. + * @deprecated Please use {@link #getHealthMonitorApi(String region, int lbId)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -212,8 +209,8 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Session Persistence features. - * @deprecated Please use {@link #getSessionPersistenceApi(String region, int lbId)} as this method - * will be removed in jclouds 3.0. + * @deprecated Please use {@link #getSessionPersistenceApi(String region, int lbId)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -223,8 +220,8 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Content Caching features. - * @deprecated Please use {@link #getContentCachingApi(String region, int lbId)} as this method - * will be removed in jclouds 3.0. + * @deprecated Please use {@link #getContentCachingApi(String region, int lbId)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -234,8 +231,8 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to SSL Termination features. - * @deprecated Please use {@link #getSSLTerminationApi(String region, int lbId)} as this method - * will be removed in jclouds 3.0. + * @deprecated Please use {@link #getSSLTerminationApi(String region, int lbId)} instead. + * To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -245,8 +242,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Error Page features. - * @deprecated Please use {@link #getErrorPageApi(String region, int lbId)} as this method - * will be removed in jclouds 3.0. + * @deprecated Please use {@link #getErrorPageApi(String region, int lbId)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate @@ -256,7 +252,7 @@ public interface CloudLoadBalancersApi extends Closeable { /** * Provides access to Report features. - * @deprecated Please use {@link #getReportApi(String region)} as this method will be removed in jclouds 3.0. + * @deprecated Please use {@link #getReportApi(String region)} instead. To be removed in jclouds 2.0. */ @Deprecated @Delegate