From 907c6a3a111b9d852eae3f9e4c11c743b8a083f1 Mon Sep 17 00:00:00 2001 From: Everett Toews Date: Mon, 28 Jan 2013 15:06:48 -0600 Subject: [PATCH] Rename methods for consistency with other Rackspace/OpenStack APIs. Changed remove to delete as delete is the opposite of create. --- .../features/AccessRuleApi.java | 16 ++++++++-------- .../features/AccessRuleAsyncApi.java | 18 +++++++++--------- .../features/ConnectionApi.java | 6 +++--- .../features/ConnectionAsyncApi.java | 6 +++--- .../features/ErrorPageApi.java | 2 +- .../features/ErrorPageAsyncApi.java | 6 +++--- .../features/HealthMonitorApi.java | 6 +++--- .../features/HealthMonitorAsyncApi.java | 6 +++--- .../features/LoadBalancerApi.java | 19 +++++++++---------- .../features/LoadBalancerAsyncApi.java | 18 +++++++++--------- .../cloudloadbalancers/features/NodeApi.java | 8 ++++---- .../features/NodeAsyncApi.java | 12 ++++++------ .../features/SSLTerminationApi.java | 6 +++--- .../features/SSLTerminationAsyncApi.java | 6 +++--- .../features/SessionPersistenceApi.java | 4 ++-- .../features/SessionPersistenceAsyncApi.java | 10 +++++----- .../features/VirtualIPApi.java | 12 ++++++------ .../features/VirtualIPAsyncApi.java | 12 ++++++------ ...dBalancersDestroyLoadBalancerStrategy.java | 2 +- .../features/AccessRuleApiExpectTest.java | 6 +++--- .../features/AccessRuleApiLiveTest.java | 8 ++++---- .../features/ConnectionApiExpectTest.java | 2 +- .../features/ConnectionApiLiveTest.java | 4 ++-- .../features/ContentCachingApiLiveTest.java | 2 +- .../features/ErrorPageApiExpectTest.java | 2 +- .../features/ErrorPageApiLiveTest.java | 4 ++-- .../features/HealthMonitorApiExpectTest.java | 2 +- .../features/HealthMonitorApiLiveTest.java | 4 ++-- .../features/LoadBalancerApiExpectTest.java | 6 +++--- .../features/LoadBalancerApiLiveTest.java | 6 +++--- .../features/NodeApiExpectTest.java | 4 ++-- .../features/NodeApiLiveTest.java | 6 +++--- .../features/ReportApiLiveTest.java | 2 +- .../features/SSLTerminationApiExpectTest.java | 2 +- .../features/SSLTerminationApiLiveTest.java | 4 ++-- .../SessionPersistenceApiExpectTest.java | 2 +- .../SessionPersistenceApiLiveTest.java | 4 ++-- .../features/VirtualIPApiExpectTest.java | 4 ++-- .../features/VirtualIPApiLiveTest.java | 6 +++--- 39 files changed, 127 insertions(+), 128 deletions(-) diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java index fd020adbe7..6a2562d6c0 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApi.java @@ -46,23 +46,23 @@ public interface AccessRuleApi { Iterable list(); /** - * Remove an access rule from the access list. + * Delete an access rule from the access list. * - * @return true on a successful removal, false if the access rule was not found + * @return true on a successful delete, false if the access rule was not found */ - boolean remove(int id); + boolean delete(int id); /** * Batch delete the access rules given the specified ids. * - * @return true on a successful removal, false if the access rule was not found + * @return true on a successful delete, false if the access rule was not found */ - boolean remove(Iterable ids); + boolean delete(Iterable ids); /** - * Remove the entire access list. + * Delete the entire access list. * - * @return true on a successful removal, false if the access rule was not found + * @return true on a successful delete, false if the access rule was not found */ - boolean removeAll(); + boolean deleteAll(); } \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java index 3a11bb8bec..7983918f27 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleAsyncApi.java @@ -73,32 +73,32 @@ public interface AccessRuleAsyncApi { ListenableFuture> list(); /** - * @see AccessRuleApi#remove(int) + * @see AccessRuleApi#delete(int) */ - @Named("accessrule:remove") + @Named("accessrule:delete") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Path("/accesslist/{id}") @Consumes("*/*") - ListenableFuture remove(@PathParam("id") int id); + ListenableFuture delete(@PathParam("id") int id); /** - * @see AccessRuleApi#remove(Iterable) + * @see AccessRuleApi#delete(Iterable) */ - @Named("accessrule:remove") + @Named("accessrule:delete") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Path("/accesslist") @Consumes("*/*") - ListenableFuture remove(@QueryParam("id") Iterable ids); + ListenableFuture delete(@QueryParam("id") Iterable ids); /** - * @see AccessRuleApi#removeAll() + * @see AccessRuleApi#deleteAll() */ - @Named("accessrule:remove") + @Named("accessrule:delete") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Path("/accesslist") @Consumes("*/*") - ListenableFuture removeAll(); + ListenableFuture deleteAll(); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java index 4d46bd4c0b..060509e608 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApi.java @@ -41,11 +41,11 @@ public interface ConnectionApi { ConnectionThrottle getConnectionThrottle(); /** - * Remove connection throttle. + * Delete connection throttle. * - * @return true on a successful removal, false if the connection throttle was not found + * @return true on a successful delete, false if the connection throttle was not found */ - boolean removeConnectionThrottle(); + boolean deleteConnectionThrottle(); /** * Determine if the load balancer is logging connections. diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java index c940ff2786..aedc00baa7 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionAsyncApi.java @@ -76,14 +76,14 @@ public interface ConnectionAsyncApi { ListenableFuture getConnectionThrottle(); /** - * @see ConnectionApi#removeConnectionThrottle() + * @see ConnectionApi#deleteConnectionThrottle() */ - @Named("connectionthrottle:remove") + @Named("connectionthrottle:delete") @DELETE @Fallback(FalseOnNotFoundOr422.class) @Path("/connectionthrottle") @Consumes("*/*") - ListenableFuture removeConnectionThrottle(); + ListenableFuture deleteConnectionThrottle(); /** * @see ConnectionApi#isConnectionLogging() diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java index 86f83eae3b..490d658503 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApi.java @@ -43,5 +43,5 @@ public interface ErrorPageApi { * If a custom error page is deleted, or the load balancer is changed to a non-HTTP protocol, the default error * page will be restored. */ - boolean remove(); + boolean delete(); } \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java index 569ed19a7c..1dc2a14253 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageAsyncApi.java @@ -73,12 +73,12 @@ public interface ErrorPageAsyncApi { ListenableFuture get(); /** - * @see ErrorPageApi#remove() + * @see ErrorPageApi#delete() */ - @Named("errorpage:remove") + @Named("errorpage:delete") @DELETE @Consumes(MediaType.WILDCARD) @Fallback(FalseOnNotFoundOr404.class) @Path("/errorpage") - ListenableFuture remove(); + ListenableFuture delete(); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java index 3ec0bf56fa..cb6eda24ef 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorApi.java @@ -46,9 +46,9 @@ public interface HealthMonitorApi { HealthMonitor get(); /** - * Remove health monitor. + * Delete health monitor. * - * @return true on a successful removal, false if the health monitor was not found + * @return true on a successful delete, false if the health monitor was not found */ - boolean remove(); + boolean delete(); } \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java index 4544f143ed..d9044a1dbb 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/HealthMonitorAsyncApi.java @@ -70,12 +70,12 @@ public interface HealthMonitorAsyncApi { ListenableFuture get(); /** - * @see HealthMonitorApi#remove() + * @see HealthMonitorApi#delete() */ - @Named("healthmonitor:remove") + @Named("healthmonitor:delete") @DELETE @Fallback(FalseOnNotFoundOr422.class) @Path("/healthmonitor") @Consumes("*/*") - ListenableFuture remove(); + ListenableFuture delete(); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java index 3985f18ab7..4de6f56754 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApi.java @@ -88,7 +88,7 @@ public interface LoadBalancerApi { IterableWithMarker list(PaginationOptions options); /** - * + * Get a load balancer. * * @param id * id of the loadbalancer to retrieve @@ -97,16 +97,15 @@ public interface LoadBalancerApi { LoadBalancer get(int id); /** - * Remove a load balancer from the account. + * Delete a load balancer. *

- * The remove load balancer function removes the specified load balancer and its associated - * configuration from the account. Any and all configuration data is immediately purged and is - * not recoverable. + * Delete the specified load balancer and its associated configuration from the account. Any and all configuration + * data is immediately purged and isnot recoverable. * * @param id * to remove */ - void remove(int id); + void delete(int id); /** * When a metadata item is added, it is assigned a unique identifier that can be used for mutating operations such @@ -128,13 +127,13 @@ public interface LoadBalancerApi { boolean updateMetadatum(int id, int metadatumId, String value); /** - * Remove metadatum. + * Delete metadatum. * - * @see LoadBalancerApi#remove(int, Iterable) + * @see LoadBalancerApi#deleteMetadata(int, Iterable) * * @return true on a successful removal, false if the metadatum was not found */ - boolean removeMetadatum(int id, int metadatumId); + boolean deleteMetadatum(int id, int metadatumId); /** * Batch delete metadata given the specified ids. @@ -145,5 +144,5 @@ public interface LoadBalancerApi { * * @return true on a successful removal, false if the metadata was not found */ - boolean removeMetadata(int id, Iterable metadataIds); + boolean deleteMetadata(int id, Iterable metadataIds); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java index 27141c9ddd..c20352cbf2 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncApi.java @@ -127,14 +127,14 @@ public interface LoadBalancerAsyncApi { ListenableFuture get(@PathParam("id") int id); /** - * @see LoadBalancerApi#remove(int) + * @see LoadBalancerApi#delete(int) */ - @Named("lb:remove") + @Named("lb:delete") @DELETE @Fallback(VoidOnNotFoundOr404.class) @Path("/loadbalancers/{id}") @Consumes("*/*") - ListenableFuture remove(@PathParam("id") int id); + ListenableFuture delete(@PathParam("id") int id); /** * @see LoadBalancerApi#createMetadata(int, Iterable) @@ -175,23 +175,23 @@ public interface LoadBalancerAsyncApi { @PayloadParam("value") String value); /** - * @see LoadBalancerApi#removeMetadatum(int, int) + * @see LoadBalancerApi#deleteMetadatum(int, int) */ - @Named("lb:removemetadatum") + @Named("lb:deletemetadatum") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Consumes("*/*") @Path("/loadbalancers/{id}/metadata/{metadatumId}") - ListenableFuture removeMetadatum(@PathParam("id") int id, @PathParam("metadatumId") int metadatumId); + ListenableFuture deleteMetadatum(@PathParam("id") int id, @PathParam("metadatumId") int metadatumId); /** - * @see LoadBalancerApi#removeMetadata(int, Iterable) + * @see LoadBalancerApi#deleteMetadata(int, Iterable) */ - @Named("lb:removemetadata") + @Named("lb:deletemetadata") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Consumes("*/*") @Path("/loadbalancers/{id}/metadata") - ListenableFuture removeMetadata(@PathParam("id") int id, + ListenableFuture deleteMetadata(@PathParam("id") int id, @QueryParam("id") Iterable metadataIds); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java index a601dd9eca..af326ff15a 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApi.java @@ -134,13 +134,13 @@ public interface NodeApi { boolean updateMetadatum(int id, int metadatumId, String value); /** - * Remove metadatum. + * Delete metadatum. * - * @see NodeApi#remove(int, Iterable) + * @see NodeApi#deleteMetadata(int, Iterable) * * @return true on a successful removal, false if the metadatum was not found */ - boolean removeMetadatum(int id, int metadatumId); + boolean deleteMetadatum(int id, int metadatumId); /** * Batch delete metadata given the specified ids. @@ -151,5 +151,5 @@ public interface NodeApi { * * @return true on a successful removal, false if the metadata was not found */ - boolean removeMetadata(int id, Iterable metadataIds); + boolean deleteMetadata(int id, Iterable metadataIds); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java index bab8382e94..d263e56681 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncApi.java @@ -187,23 +187,23 @@ public interface NodeAsyncApi { @PayloadParam("value") String value); /** - * @see NodeApi#removeMetadatum(int, int) + * @see NodeApi#deleteMetadatum(int, int) */ - @Named("node:removemetadatum") + @Named("node:deletemetadatum") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Consumes("*/*") @Path("/nodes/{id}/metadata/{metadatumId}") - ListenableFuture removeMetadatum(@PathParam("id") int id, @PathParam("metadatumId") int metadatumId); + ListenableFuture deleteMetadatum(@PathParam("id") int id, @PathParam("metadatumId") int metadatumId); /** - * @see NodeApi#removeMetadata(int, Iterable) + * @see NodeApi#deleteMetadata(int, Iterable) */ - @Named("node:removemetadata") + @Named("node:deletemetadata") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Consumes("*/*") @Path("/nodes/{id}/metadata") - ListenableFuture removeMetadata(@PathParam("id") int id, + ListenableFuture deleteMetadata(@PathParam("id") int id, @QueryParam("id") Iterable metadataIds); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java index 7376c1402c..ed8258584f 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApi.java @@ -79,9 +79,9 @@ public interface SSLTerminationApi { SSLTermination get(); /** - * Remove SSL termination. + * Delete SSL termination. * - * @return true on a successful removal, false if the SSL termination was not found + * @return true on a successful delete, false if the SSL termination was not found */ - boolean remove(); + boolean delete(); } \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java index caf51515c9..0014240713 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationAsyncApi.java @@ -70,12 +70,12 @@ public interface SSLTerminationAsyncApi { ListenableFuture get(); /** - * @see SSLTerminationApi#remove() + * @see SSLTerminationApi#delete() */ - @Named("ssltermination:remove") + @Named("ssltermination:delete") @DELETE @Fallback(FalseOnNotFoundOr422.class) @Path("/ssltermination") @Consumes("*/*") - ListenableFuture remove(); + ListenableFuture delete(); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java index 554fc1db2d..b6bcf52b36 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApi.java @@ -45,9 +45,9 @@ public interface SessionPersistenceApi { void create(SessionPersistence sessionPersistence); /** - * Remove session persistence. + * Delete session persistence. * * @see SessionPersistence */ - void remove(); + void delete(); } \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java index 7c2e8ffdf1..1487a431a0 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceAsyncApi.java @@ -53,7 +53,7 @@ public interface SessionPersistenceAsyncApi { /** * @see SessionPersistenceApi#get() */ - @Named("sessionpersistence:state") + @Named("sessionpersistence:get") @GET @Consumes(MediaType.APPLICATION_JSON) @ResponseParser(ParseSessionPersistence.class) @@ -64,7 +64,7 @@ public interface SessionPersistenceAsyncApi { /** * @see SessionPersistenceApi#create(SessionPersistence) */ - @Named("sessionpersistence:state") + @Named("sessionpersistence:create") @PUT @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) @@ -74,12 +74,12 @@ public interface SessionPersistenceAsyncApi { ListenableFuture create(@PayloadParam("sessionPersistence") SessionPersistence sessionPersistence); /** - * @see SessionPersistenceApi#remove() + * @see SessionPersistenceApi#delete() */ - @Named("sessionpersistence:state") + @Named("sessionpersistence:delete") @DELETE @Consumes(MediaType.APPLICATION_JSON) @Fallback(VoidOnNotFoundOr404.class) @Path("/sessionpersistence") - ListenableFuture remove(); + ListenableFuture delete(); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java index d9bb4e37c7..f63880fd01 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApi.java @@ -42,13 +42,13 @@ public interface VirtualIPApi { Iterable list(); /** - * Remove a virtual IP. + * Delete a virtual IP. * - * @see VirtualIPApi#remove(Iterable) + * @see VirtualIPApi#delete(Iterable) * - * @return true on a successful removal, false if the virtual IP was not found + * @return true on a successful delete, false if the virtual IP was not found */ - boolean remove(int id); + boolean delete(int id); /** * Batch delete virtual IPs given the specified ids. @@ -59,7 +59,7 @@ public interface VirtualIPApi { * cannot be removed due to its current status, an exception is thrown along with the ids of the ones the * system identified as potential failures for this request. * - * @return true on a successful removal, false if the virtual IP was not found + * @return true on a successful delete, false if the virtual IP was not found */ - boolean remove(Iterable ids); + boolean delete(Iterable ids); } \ No newline at end of file diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java index f535a95cb2..de0ceaa220 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPAsyncApi.java @@ -74,22 +74,22 @@ public interface VirtualIPAsyncApi { ListenableFuture> list(); /** - * @see VirtualIPApi#remove(int) + * @see VirtualIPApi#delete(int) */ - @Named("virtualip:remove") + @Named("virtualip:delete") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Path("/virtualips/{id}") @Consumes("*/*") - ListenableFuture remove(@PathParam("id") int id); + ListenableFuture delete(@PathParam("id") int id); /** - * @see VirtualIPApi#remove(Iterable) + * @see VirtualIPApi#delete(Iterable) */ - @Named("virtualip:remove") + @Named("virtualip:delete") @DELETE @Fallback(FalseOnNotFoundOr404.class) @Path("/virtualips") @Consumes("*/*") - ListenableFuture remove(@QueryParam("id") Iterable ids); + ListenableFuture delete(@QueryParam("id") Iterable ids); } diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java index bcb69c82b8..a902329f79 100644 --- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java +++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java @@ -57,7 +57,7 @@ public class CloudLoadBalancersDestroyLoadBalancerStrategy implements DestroyLoa String[] parts = checkNotNull(id, "id").split("/"); String region = parts[0]; int lbId = Integer.parseInt(parts[1]); - client.getLoadBalancerApiForZone(region).remove(lbId); + client.getLoadBalancerApiForZone(region).delete(lbId); return getLoadBalancer.getLoadBalancer(id); } } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java index bb01c24855..f89ca7ce44 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiExpectTest.java @@ -79,7 +79,7 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest< HttpResponse.builder().statusCode(200).build() ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000); - assertTrue(api.remove(23)); + assertTrue(api.delete(23)); } public void testRemoveManyAccessRules() { @@ -92,7 +92,7 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest< ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000); List accessRuleIds = ImmutableList. of(23, 24); - assertTrue(api.remove(accessRuleIds)); + assertTrue(api.delete(accessRuleIds)); } public void testRemoveAllAccessRules() { @@ -104,7 +104,7 @@ public class AccessRuleApiExpectTest extends BaseCloudLoadBalancerApiExpectTest< HttpResponse.builder().statusCode(200).build() ).getAccessRuleApiForZoneAndLoadBalancer("DFW", 2000); - assertTrue(api.removeAll()); + assertTrue(api.deleteAll()); } private Iterable getAccessRules() { diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java index 9815bf70b7..2c49cc8e1e 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/AccessRuleApiLiveTest.java @@ -96,7 +96,7 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { AccessRuleWithId removedAccessRule = Iterables.getFirst(actualAccessList, null); accessRules.remove(removedAccessRule.getAddress()); - assertTrue(clbApi.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).remove(removedAccessRule.getId())); + assertTrue(clbApi.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).delete(removedAccessRule.getId())); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); assertExpectedAccessRules(accessRules); @@ -111,7 +111,7 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { accessRules.remove(removedAccessRule1.getAddress()); accessRules.remove(removedAccessRule2.getAddress()); - assertTrue(clbApi.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).remove(removedAccessRuleIds)); + assertTrue(clbApi.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).delete(removedAccessRuleIds)); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); assertExpectedAccessRules(accessRules); @@ -119,7 +119,7 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @Test(dependsOnMethods = "testRemoveManyAccessRules") public void testRemoveAllAccessRules() throws Exception { - assertTrue(clbApi.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).removeAll()); + assertTrue(clbApi.getAccessRuleApiForZoneAndLoadBalancer(zone, lb.getId()).deleteAll()); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); assertExpectedAccessRules(new HashMap()); @@ -138,7 +138,7 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java index 77bc3a3bd4..669c18ff81 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiExpectTest.java @@ -93,7 +93,7 @@ public class ConnectionApiExpectTest extends BaseCloudLoadBalancerApiExpectTest< HttpResponse.builder().statusCode(200).build() ).getConnectionApiForZoneAndLoadBalancer("DFW", 2000); - assertTrue(api.removeConnectionThrottle()); + assertTrue(api.deleteConnectionThrottle()); } public void testIsConnectionLogging() { diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java index 66ec7d2812..26cf862ebc 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ConnectionApiLiveTest.java @@ -69,7 +69,7 @@ public class ConnectionApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @Test(dependsOnMethods = "testCreateAndGetConnectionThrottling") public void testRemoveAndGetConnectionThrottle() throws Exception { - assertTrue(clbApi.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).removeConnectionThrottle()); + assertTrue(clbApi.getConnectionApiForZoneAndLoadBalancer(zone, lb.getId()).deleteConnectionThrottle()); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); ConnectionThrottle connectionThrottle = @@ -104,7 +104,7 @@ public class ConnectionApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java index be1923eaaf..fb93f47d50 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ContentCachingApiLiveTest.java @@ -78,7 +78,7 @@ public class ContentCachingApiLiveTest extends BaseCloudLoadBalancersApiLiveTest @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java index 7fc4bd2ee6..b5c77cf423 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ErrorPageApiExpectTest.java @@ -89,7 +89,7 @@ public class ErrorPageApiExpectTest extends BaseCloudLoadBalancerApiExpectTest of(23, 24))); + assertTrue(api.deleteMetadata(2000, ImmutableList. of(23, 24))); } private Object getExpectedLoadBalancer() { diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java index 4c7d582183..e433ceba87 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerApiLiveTest.java @@ -56,7 +56,7 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { protected void tearDownContext() { for (LoadBalancer lb: lbs) { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); - clbApi.getLoadBalancerApiForZone(lb.getRegion()).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(lb.getRegion()).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); } super.tearDownContext(); @@ -172,12 +172,12 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { metadata = clbApi.getLoadBalancerApiForZone(lb.getRegion()).getMetadata(lb.getId()); assertEquals(metadata.get("key1"), "key1-updated"); - assertTrue(clbApi.getLoadBalancerApiForZone(lb.getRegion()).removeMetadatum(lb.getId(), metadata.getId("key1"))); + assertTrue(clbApi.getLoadBalancerApiForZone(lb.getRegion()).deleteMetadatum(lb.getId(), metadata.getId("key1"))); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); metadata = clbApi.getLoadBalancerApiForZone(lb.getRegion()).getMetadata(lb.getId()); assertNull(metadata.get("key1")); - assertTrue(clbApi.getLoadBalancerApiForZone(lb.getRegion()).removeMetadata(lb.getId(), + assertTrue(clbApi.getLoadBalancerApiForZone(lb.getRegion()).deleteMetadata(lb.getId(), ImmutableList. of(metadata.getId("key2"), metadata.getId("key3")))); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); metadata = clbApi.getLoadBalancerApiForZone(lb.getRegion()).getMetadata(lb.getId()); diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java index 20cdac0a01..0dbf99c597 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiExpectTest.java @@ -192,7 +192,7 @@ public class NodeApiExpectTest extends BaseCloudLoadBalancerApiExpectTest of(23, 24))); + assertTrue(api.deleteMetadata(410, ImmutableList. of(23, 24))); } private Metadata getExpectedMetadata() { diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java index d359e01213..3366675d44 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeApiLiveTest.java @@ -163,12 +163,12 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { metadata = clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).getMetadata(node.getId()); assertEquals(metadata.get("key1"), "key1-updated"); - assertTrue(clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).removeMetadatum(node.getId(), metadata.getId("key1"))); + assertTrue(clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).deleteMetadatum(node.getId(), metadata.getId("key1"))); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); metadata = clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).getMetadata(node.getId()); assertNull(metadata.get("key1")); - assertTrue(clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).removeMetadata(node.getId(), + assertTrue(clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).deleteMetadata(node.getId(), ImmutableList. of(metadata.getId("key2"), metadata.getId("key3")))); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); metadata = clbApi.getNodeApiForZoneAndLoadBalancer(lb.getRegion(), lb.getId()).getMetadata(node.getId()); @@ -185,7 +185,7 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { if (lbClient.get(lb.getId()).getStatus() != Status.DELETED) { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); - lbClient.remove(lb.getId()); + lbClient.delete(lb.getId()); } assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb)); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java index 8884db7948..c288756547 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/ReportApiLiveTest.java @@ -103,7 +103,7 @@ public class ReportApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java index 98a90d4bd0..5d2c65d465 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiExpectTest.java @@ -91,7 +91,7 @@ public class SSLTerminationApiExpectTest extends BaseCloudLoadBalancerApiExpectT HttpResponse.builder().statusCode(200).build() ).getSSLTerminationApiForZoneAndLoadBalancer("DFW", 2000); - assertTrue(api.remove()); + assertTrue(api.delete()); } public static SSLTermination getSSLTermination() throws IOException { diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java index a7260ceb37..d503250e99 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SSLTerminationApiLiveTest.java @@ -68,7 +68,7 @@ public class SSLTerminationApiLiveTest extends BaseCloudLoadBalancersApiLiveTest @Test(dependsOnMethods = "testCreateAndGetSSLTermination") public void testRemoveAndGetSSLTermination() throws Exception { - assertTrue(clbApi.getSSLTerminationApiForZoneAndLoadBalancer(zone, lb.getId()).remove()); + assertTrue(clbApi.getSSLTerminationApiForZoneAndLoadBalancer(zone, lb.getId()).delete()); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); SSLTermination sslTermination = @@ -81,7 +81,7 @@ public class SSLTerminationApiLiveTest extends BaseCloudLoadBalancersApiLiveTest @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java index 896f9335d0..56214cad9e 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiExpectTest.java @@ -81,6 +81,6 @@ public class SessionPersistenceApiExpectTest extends BaseCloudLoadBalancerApiExp HttpResponse.builder().statusCode(200).build() ).getSessionPersistenceApiForZoneAndLoadBalancer("DFW", 2000); - api.remove(); + api.delete(); } } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java index 4bcb3cfd2c..25e20ef061 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/SessionPersistenceApiLiveTest.java @@ -67,7 +67,7 @@ public class SessionPersistenceApiLiveTest extends BaseCloudLoadBalancersApiLive @Test(dependsOnMethods = "testCreateAndGetSessionPersistence") public void testRemoveAndGetSessionPersistence() throws Exception { - clbApi.getSessionPersistenceApiForZoneAndLoadBalancer(zone, lb.getId()).remove(); + clbApi.getSessionPersistenceApiForZoneAndLoadBalancer(zone, lb.getId()).delete(); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); SessionPersistence sessionPersistence = @@ -80,7 +80,7 @@ public class SessionPersistenceApiLiveTest extends BaseCloudLoadBalancersApiLive @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); } diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java index 62f792adb7..1aa590cf70 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiExpectTest.java @@ -73,7 +73,7 @@ public class VirtualIPApiExpectTest extends BaseCloudLoadBalancerApiExpectTest virtualIPIds = ImmutableList. of(23, 24); - api.remove(virtualIPIds); + api.delete(virtualIPIds); } private Iterable getVirtualIPs() { diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java index ee8e1390cc..1a53863cf8 100644 --- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java +++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/VirtualIPApiLiveTest.java @@ -77,7 +77,7 @@ public class VirtualIPApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { Iterable actualVirtualIPs = clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).list(); VirtualIPWithId removedVirtualIP = Iterables.getFirst(actualVirtualIPs, null); - assertTrue(clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).remove(removedVirtualIP.getId())); + assertTrue(clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).delete(removedVirtualIP.getId())); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); actualVirtualIPs = clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).list(); @@ -92,7 +92,7 @@ public class VirtualIPApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { VirtualIPWithId removedVirtualIP2 = Iterables.getLast(actualVirtualIPs); List removedVirtualIPIds = ImmutableList. of(removedVirtualIP1.getId(), removedVirtualIP2.getId()); - assertTrue(clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).remove(removedVirtualIPIds)); + assertTrue(clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).delete(removedVirtualIPIds)); assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); actualVirtualIPs = clbApi.getVirtualIPApiForZoneAndLoadBalancer(zone, lb.getId()).list(); @@ -104,7 +104,7 @@ public class VirtualIPApiLiveTest extends BaseCloudLoadBalancersApiLiveTest { @AfterGroups(groups = "live") protected void tearDownContext() { assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); - clbApi.getLoadBalancerApiForZone(zone).remove(lb.getId()); + clbApi.getLoadBalancerApiForZone(zone).delete(lb.getId()); assertTrue(awaitDeleted(clbApi.getLoadBalancerApiForZone(zone)).apply(lb)); super.tearDownContext(); }