Things in labs shouldn't live long enough to be deprecated.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/ae67f709 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/ae67f709 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/ae67f709 Branch: refs/heads/master Commit: ae67f7094785e3b2d51b3ef1ca90c79a1e8ce61f Parents: cc00dee Author: Adrian Cole <[email protected]> Authored: Tue Oct 7 19:28:49 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Tue Oct 7 22:05:58 2014 -0700 ---------------------------------------------------------------------- .../jclouds/openstack/swift/v1/SwiftApi.java | 42 -------------------- .../openstack/swift/v1/domain/Segment.java | 9 ----- .../swift/v1/reference/SwiftHeaders.java | 6 --- .../swift/v1/features/ObjectApiLiveTest.java | 7 ++-- 4 files changed, 3 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/ae67f709/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java index d5b4ba3..1d4d1d0 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java @@ -67,46 +67,4 @@ public interface SwiftApi extends Closeable { @Path("/{containerName}") StaticLargeObjectApi getStaticLargeObjectApi(@EndpointParam(parser = RegionToEndpoint.class) String region, @PathParam("containerName") String containerName); - - /** - * @deprecated Please use {@link #getAccountApi(String)} as this method will be removed in jclouds 3.0. - */ - @Deprecated - @Delegate - AccountApi getAccountApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region); - - /** - * @deprecated Please use {@link #getBulkApi(String)} as this method will be removed in jclouds 3.0. - */ - @Deprecated - @Delegate - BulkApi getBulkApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region); - - /** - * @deprecated Please use {@link #getContainerApi(String)} as this method will be removed in jclouds 3.0. - */ - @Deprecated - @Delegate - ContainerApi getContainerApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) String region); - - /** - * @deprecated Please use {@link #getObjectApi(String, String)} as this method will be removed in jclouds 3.0. - */ - @Deprecated - @Delegate - @Path("/{containerName}") - ObjectApi getObjectApiForRegionAndContainer(@EndpointParam(parser = RegionToEndpoint.class) String region, - @PathParam("containerName") String containerName); - - /** - * @deprecated Please use {@link #getStaticLargeObjectApi(String, String)} as this method - * will be removed in jclouds 3.0. - */ - @Deprecated - @Delegate - @Path("/{containerName}") - StaticLargeObjectApi getStaticLargeObjectApiForRegionAndContainer( - @EndpointParam(parser = RegionToEndpoint.class) String region, - @PathParam("containerName") String containerName); - } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/ae67f709/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java index 977d789..a5f064f 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java @@ -52,15 +52,6 @@ public class Segment { /** * @return The ETag of the content of the segment object. - * @deprecated Please use {@link #getETag()} as this method will be removed in jclouds 1.8. - */ - @Deprecated - public String getEtag() { - return etag; - } - - /** - * @return The ETag of the content of the segment object. */ public String getETag() { return etag; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/ae67f709/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java index 56e7949..caab5e7 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java @@ -66,12 +66,6 @@ public final class SwiftHeaders { // Versioning public static final String VERSIONS_LOCATION = "X-Versions-Location"; - /** - * @deprecated Please use {@link #VERSIONS_LOCATION}. This field will be removed in jclouds 1.8. - */ - @Deprecated - public static final String CONTAINER_VERSIONS_LOCATION = "X-Versions-Location"; - // Misc functionality public static final String CONTAINER_WEB_MODE = "X-Web-Mode"; http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/ae67f709/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java index 9558a16..5a472ff 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java @@ -85,16 +85,15 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { payload.getContentMetadata().setExpires(expireAt); for (String regionId : regions) { - String etag = api.getObjectApiForRegionAndContainer(regionId, containerName) - .put(objectName, payload); + String etag = api.getObjectApi(regionId, containerName).put(objectName, payload); assertNotNull(etag); - SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName).get(objectName); + SwiftObject object = api.getObjectApi(regionId, containerName).get(objectName); assertEquals(object.getName(), objectName); checkObject(object); assertEquals(toStringAndClose(object.getPayload().openStream()), "swifty"); - api.getObjectApiForRegionAndContainer(regionId, containerName).delete(objectName); + api.getObjectApi(regionId, containerName).delete(objectName); } } public void testCopyObject() throws Exception {
