Repository: jclouds-labs-openstack Updated Branches: refs/heads/master d65048dcc -> 23a293ec5
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/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 c0b2a6e..36bdc21 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 @@ -66,16 +66,16 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { final String objectName = "object # ! special"; for (String regionId : regions) { - assertNotNull(api.getContainerApiForRegion(regionId).create(containerName)); - assertNotNull(api.getObjectApiForRegionAndContainer(regionId, containerName).put(objectName, PAYLOAD)); + assertNotNull(api.getContainerApi(regionId).create(containerName)); + assertNotNull(api.getObjectApi(regionId, containerName).put(objectName, PAYLOAD)); - 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.getContainerApiForRegion(regionId).deleteIfEmpty(containerName); + api.getObjectApi(regionId, containerName).delete(objectName); + api.getContainerApi(regionId).deleteIfEmpty(containerName); } } @@ -113,15 +113,15 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { String destinationObject = "copy.txt"; String destinationPath = "/" + destinationContainer + "/" + destinationObject; - ContainerApi containerApi = api.getContainerApiForRegion(regionId); + ContainerApi containerApi = api.getContainerApi(regionId); // create source and destination dirs containerApi.create(sourceContainer); containerApi.create(destinationContainer); // get the api for this region and container - ObjectApi srcApi = api.getObjectApiForRegionAndContainer(regionId, sourceContainer); - ObjectApi destApi = api.getObjectApiForRegionAndContainer(regionId, destinationContainer); + ObjectApi srcApi = api.getObjectApi(regionId, sourceContainer); + ObjectApi destApi = api.getObjectApi(regionId, destinationContainer); // Create source object assertNotNull(srcApi.put(sourceObjectName, PAYLOAD)); @@ -160,9 +160,9 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testList() throws Exception { for (String regionId : regions) { - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, containerName); + ObjectApi objectApi = api.getObjectApi(regionId, containerName); ObjectList response = objectApi.list(); - assertEquals(response.getContainer(), api.getContainerApiForRegion(regionId).get(containerName)); + assertEquals(response.getContainer(), api.getContainerApi(regionId).get(containerName)); for (SwiftObject object : response) { checkObject(object); } @@ -171,9 +171,9 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testListWithOptions() throws Exception { for (String regionId : regions) { - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, containerName); + ObjectApi objectApi = api.getObjectApi(regionId, containerName); ObjectList response = objectApi.list(ListContainerOptions.NONE); - assertEquals(response.getContainer(), api.getContainerApiForRegion(regionId).get(containerName)); + assertEquals(response.getContainer(), api.getContainerApi(regionId).get(containerName)); for (SwiftObject object : response) { checkObject(object); } @@ -182,7 +182,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testMetadata() throws Exception { for (String regionId : regions) { - SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name); + SwiftObject object = api.getObjectApi(regionId, containerName).get(name); assertEquals(object.getName(), name); checkObject(object); assertEquals(toStringAndClose(object.getPayload().openStream()), "swifty"); @@ -191,7 +191,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testUpdateMetadata() throws Exception { for (String regionId : regions) { - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, containerName); + ObjectApi objectApi = api.getObjectApi(regionId, containerName); Map<String, String> meta = ImmutableMap.of("MyAdd1", "foo", "MyAdd2", "bar"); assertTrue(objectApi.updateMetadata(name, meta)); @@ -207,7 +207,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testGet() throws Exception { for (String regionId : regions) { - SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name, GetOptions.NONE); + SwiftObject object = api.getObjectApi(regionId, containerName).get(name, GetOptions.NONE); assertEquals(object.getName(), name); checkObject(object); assertEquals(toStringAndClose(object.getPayload().openStream()), "swifty"); @@ -216,7 +216,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testPrivateByDefault() throws Exception { for (String regionId : regions) { - SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name); + SwiftObject object = api.getObjectApi(regionId, containerName).get(name); try { object.getUri().toURL().openStream(); fail("shouldn't be able to access " + object); @@ -227,7 +227,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testGetOptions() throws Exception { for (String regionId : regions) { - SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name, tail(1)); + SwiftObject object = api.getObjectApi(regionId, containerName).get(name, tail(1)); assertEquals(object.getName(), name); checkObject(object); assertEquals(toStringAndClose(object.getPayload().openStream()), "y"); @@ -237,7 +237,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testListOptions() throws Exception { String lexicographicallyBeforeName = name.substring(0, name.length() - 1); for (String regionId : regions) { - SwiftObject object = api.getObjectApiForRegionAndContainer(regionId, containerName) + SwiftObject object = api.getObjectApi(regionId, containerName) .list(marker(lexicographicallyBeforeName)).get(0); assertEquals(object.getName(), name); checkObject(object); @@ -246,7 +246,7 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void testDeleteMetadata() throws Exception { for (String regionId : regions) { - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, containerName); + ObjectApi objectApi = api.getObjectApi(regionId, containerName); Map<String, String> meta = ImmutableMap.of("MyDelete1", "foo", "MyDelete2", "bar"); @@ -263,8 +263,8 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void setup() { super.setup(); for (String regionId : regions) { - api.getContainerApiForRegion(regionId).create(containerName); - api.getObjectApiForRegionAndContainer(regionId, containerName).put(name, PAYLOAD); + api.getContainerApi(regionId).create(containerName); + api.getObjectApi(regionId, containerName).put(name, PAYLOAD); } } @@ -273,8 +273,8 @@ public class ObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> { public void tearDown() { for (String regionId : regions) { deleteAllObjectsInContainer(regionId, containerName); - api.getObjectApiForRegionAndContainer(regionId, containerName).delete(name); - api.getContainerApiForRegion(regionId).deleteIfEmpty(containerName); + api.getObjectApi(regionId, containerName).delete(name); + api.getContainerApi(regionId).deleteIfEmpty(containerName); } super.tearDown(); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java index 972a1e7..d267f11 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java @@ -105,14 +105,14 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - ObjectList objects = api.getObjectApiForRegionAndContainer("DFW", "myContainer").list(); + ObjectList objects = api.getObjectApi("DFW", "myContainer").list(); assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(objects.getContainer().getName(), "myContainer"); assertTrue(objects.getContainer().getAnybodyRead().get()); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/?format=json"); + assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer"); } finally { server.shutdown(); } @@ -127,14 +127,14 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - ObjectList objects = api.getObjectApiForRegionAndContainer("DFW", "myContainer").list(new ListContainerOptions()); + ObjectList objects = api.getObjectApi("DFW", "myContainer").list(new ListContainerOptions()); assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(objects.getContainer().getName(), "myContainer"); assertTrue(objects.getContainer().getAnybodyRead().get()); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/?format=json"); + assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer"); } finally { server.shutdown(); } @@ -147,12 +147,12 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - ObjectList objects = api.getObjectApiForRegionAndContainer("DFW", "myContainer").list(marker("test")); + ObjectList objects = api.getObjectApi("DFW", "myContainer").list(marker("test")); assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/?format=json&marker=test"); + assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer?marker=test"); } finally { server.shutdown(); } @@ -169,7 +169,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertEquals( - api.getObjectApiForRegionAndContainer("DFW", "myContainer").put("myObject", PAYLOAD, + api.getObjectApi("DFW", "myContainer").put("myObject", PAYLOAD, metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); assertEquals(server.getRequestCount(), 2); @@ -197,7 +197,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertEquals( - api.getObjectApiForRegionAndContainer("DFW", containerName).put(objectName, PAYLOAD, + api.getObjectApi("DFW", containerName).put(objectName, PAYLOAD, metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); assertEquals(server.getRequestCount(), 2); @@ -229,7 +229,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); assertEquals( - api.getObjectApiForRegionAndContainer("DFW", "myContainer").put("myObject", PAYLOAD, + api.getObjectApi("DFW", "myContainer").put("myObject", PAYLOAD, metadata(metadata)), "d9f5eb4bba4e2f2f046e54611bc8196b"); assertEquals(server.getRequestCount(), 5); @@ -258,7 +258,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - SwiftObject object = api.getObjectApiForRegionAndContainer("DFW", "myContainer").getWithoutBody("myObject"); + SwiftObject object = api.getObjectApi("DFW", "myContainer").getWithoutBody("myObject"); assertEquals(object.getName(), "myObject"); assertEquals(object.getETag(), "8a964ee2a5e88be344f36c22562a6486"); assertEquals(object.getLastModified(), dates.rfc822DateParse("Fri, 12 Jun 2010 13:40:18 GMT")); @@ -286,7 +286,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - SwiftObject object = api.getObjectApiForRegionAndContainer("DFW", "myContainer").get("myObject", tail(1)); + SwiftObject object = api.getObjectApi("DFW", "myContainer").get("myObject", tail(1)); assertEquals(object.getName(), "myObject"); assertEquals(object.getETag(), "8a964ee2a5e88be344f36c22562a6486"); assertEquals(object.getLastModified(), dates.rfc822DateParse("Fri, 12 Jun 2010 13:40:18 GMT")); @@ -326,7 +326,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { final SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); - api.getObjectApiForRegionAndContainer("DFW", "myContainer").put("myObject", new ByteSourcePayload(ByteSource.wrap("swifty".getBytes())), metadata(metadata)); + api.getObjectApi("DFW", "myContainer").put("myObject", new ByteSourcePayload(ByteSource.wrap("swifty".getBytes())), metadata(metadata)); fail("testReplaceTimeout test should have failed with an HttpResponseException."); } finally { @@ -343,7 +343,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - assertTrue(api.getObjectApiForRegionAndContainer("DFW", "myContainer").updateMetadata("myObject", metadata)); + assertTrue(api.getObjectApi("DFW", "myContainer").updateMetadata("myObject", metadata)); assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); @@ -367,7 +367,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - assertTrue(api.getObjectApiForRegionAndContainer("DFW", "myContainer").updateMetadata("myObject", metadata)); + assertTrue(api.getObjectApi("DFW", "myContainer").updateMetadata("myObject", metadata)); assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); @@ -392,7 +392,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - assertTrue(api.getObjectApiForRegionAndContainer("DFW", "myContainer").deleteMetadata("myObject", metadata)); + assertTrue(api.getObjectApi("DFW", "myContainer").deleteMetadata("myObject", metadata)); assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); @@ -414,7 +414,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - api.getObjectApiForRegionAndContainer("DFW", "myContainer").delete("myObject"); + api.getObjectApi("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); @@ -433,7 +433,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - api.getObjectApiForRegionAndContainer("DFW", "myContainer").delete("myObject"); + api.getObjectApi("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); @@ -452,7 +452,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { .addHeader(SwiftHeaders.OBJECT_COPY_FROM, "/bar/foo.txt"))); try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - assertTrue(api.getObjectApiForRegionAndContainer("DFW", "foo") + assertTrue(api.getObjectApi("DFW", "foo") .copy("bar.txt", "bar", "foo.txt")); assertEquals(server.getRequestCount(), 2); @@ -476,7 +476,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); // the following line will throw the CopyObjectException - api.getObjectApiForRegionAndContainer("DFW", "foo").copy("bar.txt", "bogus", "foo.txt"); + api.getObjectApi("DFW", "foo").copy("bar.txt", "bogus", "foo.txt"); } finally { server.shutdown(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java index 28a5c8d..b248c3f 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiLiveTest.java @@ -47,13 +47,13 @@ public class StaticLargeObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> public void testNotPresentWhenDeleting() throws Exception { for (String regionId : regions) { - api.getStaticLargeObjectApiForRegionAndContainer(regionId, containerName).delete(UUID.randomUUID().toString()); + api.getStaticLargeObjectApi(regionId, containerName).delete(UUID.randomUUID().toString()); } } public void testReplaceManifest() throws Exception { for (String regionId : regions) { - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, containerName); + ObjectApi objectApi = api.getObjectApi(regionId, containerName); String etag1s = objectApi.put(name + "/1", newByteSourcePayload(ByteSource.wrap(megOf1s))); assertMegabyteAndETagMatches(regionId, name + "/1", etag1s); @@ -70,31 +70,31 @@ public class StaticLargeObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> .build()) .build(); - String etagOfEtags = api.getStaticLargeObjectApiForRegionAndContainer(regionId, containerName).replaceManifest( + String etagOfEtags = api.getStaticLargeObjectApi(regionId, containerName).replaceManifest( name, segments, ImmutableMap.of("myfoo", "Bar")); assertNotNull(etagOfEtags); - SwiftObject bigObject = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name); + SwiftObject bigObject = api.getObjectApi(regionId, containerName).get(name); assertEquals(bigObject.getETag(), etagOfEtags); assertEquals(bigObject.getPayload().getContentMetadata().getContentLength(), new Long(2 * 1024 * 1024)); assertEquals(bigObject.getMetadata(), ImmutableMap.of("myfoo", "Bar")); // segments are visible - assertEquals(api.getContainerApiForRegion(regionId).get(containerName).getObjectCount(), 3); + assertEquals(api.getContainerApi(regionId).get(containerName).getObjectCount(), 3); } } @Test(dependsOnMethods = "testReplaceManifest") public void testDelete() throws Exception { for (String regionId : regions) { - api.getStaticLargeObjectApiForRegionAndContainer(regionId, containerName).delete(name); - assertEquals(api.getContainerApiForRegion(regionId).get(containerName).getObjectCount(), 0); + api.getStaticLargeObjectApi(regionId, containerName).delete(name); + assertEquals(api.getContainerApi(regionId).get(containerName).getObjectCount(), 0); } } protected void assertMegabyteAndETagMatches(String regionId, String name, String etag1s) { - SwiftObject object1s = api.getObjectApiForRegionAndContainer(regionId, containerName).get(name); + SwiftObject object1s = api.getObjectApi(regionId, containerName).get(name); assertEquals(object1s.getETag(), etag1s); assertEquals(object1s.getPayload().getContentMetadata().getContentLength(), new Long(1024 * 1024)); } @@ -104,7 +104,7 @@ public class StaticLargeObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> public void setup() { super.setup(); for (String regionId : regions) { - boolean created = api.getContainerApiForRegion(regionId).create(containerName); + boolean created = api.getContainerApi(regionId).create(containerName); if (!created) { deleteAllObjectsInContainer(regionId, containerName); } @@ -122,7 +122,7 @@ public class StaticLargeObjectApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> public void tearDown() { for (String regionId : regions) { deleteAllObjectsInContainer(regionId, containerName); - api.getContainerApiForRegion(regionId).deleteIfEmpty(containerName); + api.getContainerApi(regionId).deleteIfEmpty(containerName); } super.tearDown(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java index 0d150d5..c5627a6 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java @@ -42,7 +42,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertEquals( - api.getStaticLargeObjectApiForRegionAndContainer("DFW", "myContainer").replaceManifest( + api.getStaticLargeObjectApi("DFW", "myContainer").replaceManifest( "myObject", ImmutableList .<Segment> builder() @@ -77,12 +77,12 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - api.getStaticLargeObjectApiForRegionAndContainer("DFW", "myContainer").delete("myObject"); + api.getStaticLargeObjectApi("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); assertRequest(server.takeRequest(), "DELETE", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject?multipart-manifest=delete"); - + } finally { server.shutdown(); } @@ -95,7 +95,7 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - api.getStaticLargeObjectApiForRegionAndContainer("DFW", "myContainer").delete("myObject"); + api.getStaticLargeObjectApi("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java index d65638c..a5cf538 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java @@ -71,7 +71,7 @@ public abstract class BaseSwiftApiLiveTest<A extends SwiftApi> extends BaseApiLi protected void deleteAllObjectsInContainer(String regionId, final String containerName) { Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS); - ObjectList objects = api.getObjectApiForContainer(regionId, containerName).list(new ListContainerOptions()); + ObjectList objects = api.getObjectApi(regionId, containerName).list(new ListContainerOptions()); if (objects == null) { return; } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java index ff19eb8..7c25ec2 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApi.java @@ -48,16 +48,4 @@ public interface CloudFilesApi extends SwiftApi { @Delegate CDNApi getCDNApi(@EndpointParam(parser = RegionToCDNEndpoint.class) String region); - /** - * Provides access to Cloud Files CDN features. - * - * @param region the region to access the CDN API. - * - * @return the {@link CDNApi} for the specified region. - * - * @deprecated Please use {@link #getCDNApiForRegion(String)}. This method will be removed in jclouds 1.8. - */ - @Deprecated - @Delegate - CDNApi cdnApiInRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) String region); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java index f91d2ba..95de2b3 100644 --- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java +++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java @@ -36,8 +36,8 @@ public class CloudFilesAccountApiLiveTest extends AccountApiLiveTest { } public void testUrlKeyExists() throws Exception { - for (String region : regions) { - Account account = api.getAccountApi(region).get(); + for (String regionId : regions) { + Account account = api.getAccountApi(regionId).get(); assertTrue(account.getTemporaryUrlKey().isPresent()); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/23a293ec/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java index 887033d..beeb15a 100644 --- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java +++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java @@ -53,20 +53,20 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { } public void testEnable() throws Exception { - for (String region : regions) { - assertNotNull(api.getCDNApi(region).enable(name)); + for (String regionId : regions) { + assertNotNull(api.getCDNApi(regionId).enable(name)); - CDNContainer container = api.getCDNApi(region).get(name); + CDNContainer container = api.getCDNApi(regionId).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); } } public void testEnableWithTTL() throws Exception { - for (String region : regions) { - assertNotNull(api.getCDNApi(region).enable(name, 777777)); + for (String regionId : regions) { + assertNotNull(api.getCDNApi(regionId).enable(name, 777777)); - CDNContainer container = api.getCDNApi(region).get(name); + CDNContainer container = api.getCDNApi(regionId).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); assertTrue(container.getTtl() == 777777); @@ -74,17 +74,17 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { } public void testDisable() throws Exception { - for (String region : regions) { - assertTrue(api.getCDNApi(region).disable(name)); + for (String regionId : regions) { + assertTrue(api.getCDNApi(regionId).disable(name)); - CDNContainer container = api.getCDNApi(region).get(name); + CDNContainer container = api.getCDNApi(regionId).get(name); assertFalse(container.isEnabled()); } } public void testList() throws Exception { - for (String region : regions) { - List<CDNContainer> cdnResponse = api.getCDNApi(region).list().toList(); + for (String regionId : regions) { + List<CDNContainer> cdnResponse = api.getCDNApi(regionId).list().toList(); assertNotNull(cdnResponse); for (CDNContainer cdnContainer : cdnResponse) { @@ -96,33 +96,33 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testListWithOptions() throws Exception { String lexicographicallyBeforeName = name.substring(0, name.length() - 1); - for (String region : regions) { + for (String regionId : regions) { ListCDNContainerOptions options = new ListCDNContainerOptions().marker(lexicographicallyBeforeName); - CDNContainer cdnContainer = api.getCDNApi(region).list(options).get(0); + CDNContainer cdnContainer = api.getCDNApi(regionId).list(options).get(0); assertCDNContainerNotNull(cdnContainer); assertTrue(cdnContainer.isEnabled()); } } public void testGet() throws Exception { - for (String region : regions) { - CDNContainer container = api.getCDNApi(region).get(name); + for (String regionId : regions) { + CDNContainer container = api.getCDNApi(regionId).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); } } public void testPurgeObject() throws Exception { - for (String region : regions) { + for (String regionId : regions) { String objectName = "testPurge"; Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[] {1, 2, 3})); - ObjectApi objectApi = api.getObjectApiForContainer(region, name); + ObjectApi objectApi = api.getObjectApi(regionId, name); // create a new object objectApi.put(objectName, payload); - CDNApi cdnApi = api.getCDNApi(region); + CDNApi cdnApi = api.getCDNApi(regionId); assertTrue(cdnApi.purgeObject(name, "testPurge", ImmutableList.<String>of())); // delete the object @@ -132,12 +132,12 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { } public void testUpdate() throws Exception { - for (String region : regions) { + for (String regionId : regions) { // enable with a ttl - assertNotNull(api.getCDNApi(region).enable(name, 777777)); + assertNotNull(api.getCDNApi(regionId).enable(name, 777777)); // now get the container - CDNContainer original = api.getCDNApi(region).get(name); + CDNContainer original = api.getCDNApi(regionId).get(name); assertTrue(original.isEnabled()); assertCDNContainerNotNull(original); @@ -147,10 +147,10 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { .logRetention(true) .enabled(false); // update the container - assertTrue(api.getCDNApi(region).update(name, opts)); + assertTrue(api.getCDNApi(regionId).update(name, opts)); // now get the updated container - CDNContainer updated = api.getCDNApi(region).get(name); + CDNContainer updated = api.getCDNApi(regionId).get(name); assertFalse(updated.isEnabled()); assertCDNContainerNotNull(updated); @@ -173,17 +173,17 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { @BeforeClass(groups = "live") public void setup() { super.setup(); - for (String region : regions) { - api.getContainerApi(region).create(name); + for (String regionId : regions) { + api.getContainerApi(regionId).create(name); } } @Override @AfterClass(groups = "live") public void tearDown() { - for (String region : regions) { - api.getCDNApi(region).disable(name); - api.getContainerApi(region).deleteIfEmpty(name); + for (String regionId : regions) { + api.getCDNApi(regionId).disable(name); + api.getContainerApi(regionId).deleteIfEmpty(name); } super.tearDown(); }
