Skip to content
Permalink
Browse files
Things in labs shouldn't live long enough to be deprecated.
  • Loading branch information
Adrian Cole authored and Adrian Cole committed Oct 8, 2014
1 parent cc00dee commit ae67f7094785e3b2d51b3ef1ca90c79a1e8ce61f
Showing 4 changed files with 3 additions and 61 deletions.
@@ -67,46 +67,4 @@ ObjectApi getObjectApi(@EndpointParam(parser = RegionToEndpoint.class) String re
@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);

}
@@ -50,15 +50,6 @@ public String getPath() {
return path;
}

/**
* @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.
*/
@@ -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";

@@ -85,16 +85,15 @@ public void testPutWithExpiration() throws Exception {
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 {

0 comments on commit ae67f70

Please sign in to comment.