Repository: jclouds-labs-openstack Updated Branches: refs/heads/1.8.x 08b554c86 -> 3e6e7ed86
True-up rackspace-cloudfiles with code in master. 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/1fa6366c Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/1fa6366c Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/1fa6366c Branch: refs/heads/1.8.x Commit: 1fa6366ca5cc0c7a3a1de52ae28880bb44339f7d Parents: 08b554c Author: Adrian Cole <[email protected]> Authored: Wed Oct 8 19:28:58 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Wed Oct 8 19:53:57 2014 -0700 ---------------------------------------------------------------------- rackspace-cloudfiles-uk/pom.xml | 23 ++------- rackspace-cloudfiles-us/pom.xml | 25 +++------ rackspace-cloudfiles/pom.xml | 21 ++------ .../rackspace/cloudfiles/v1/CloudFilesApi.java | 21 ++------ .../cloudfiles/v1/features/CDNApi.java | 2 +- .../functions/ParseCDNContainerFromHeaders.java | 6 +-- .../v1/functions/RegionToCDNEndpoint.java | 12 ++--- .../v1/reference/CloudFilesConstants.java | 12 +++-- .../v1/reference/CloudFilesHeaders.java | 26 ++++++---- .../features/CloudFilesAccountApiLiveTest.java | 2 +- .../v1/features/CloudFilesCDNApiLiveTest.java | 54 ++++++++++---------- .../v1/features/CloudFilesCDNApiMockTest.java | 44 ++++++++-------- 12 files changed, 102 insertions(+), 146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles-uk/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles-uk/pom.xml b/rackspace-cloudfiles-uk/pom.xml index abdb89a..911189f 100644 --- a/rackspace-cloudfiles-uk/pom.xml +++ b/rackspace-cloudfiles-uk/pom.xml @@ -23,6 +23,7 @@ <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> <version>1.8.1-SNAPSHOT</version> + <relativePath /> </parent> <!-- TODO: when out of labs, switch to org.jclouds.provider --> @@ -62,20 +63,6 @@ </repository> </repositories> - <!-- For modernizer, which depends on jclouds-resources snapshot. --> - <pluginRepositories> - <pluginRepository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/repositories/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> @@ -101,7 +88,7 @@ <artifactId>rackspace-cloudfiles</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> <version>${project.parent.version}</version> @@ -166,10 +153,9 @@ <goal>test</goal> </goals> <configuration> - <forkCount>5</forkCount> - <reuseForks>true</reuseForks> - <parallel>classes</parallel> <systemPropertyVariables> + <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url> + <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5> <test.rackspace-cloudfiles-uk.endpoint>${test.rackspace-cloudfiles-uk.endpoint}</test.rackspace-cloudfiles-uk.endpoint> <test.rackspace-cloudfiles-uk.api-version>${test.rackspace-cloudfiles-uk.api-version}</test.rackspace-cloudfiles-uk.api-version> <test.rackspace-cloudfiles-uk.build-version>${test.rackspace-cloudfiles-uk.build-version}</test.rackspace-cloudfiles-uk.build-version> @@ -186,4 +172,5 @@ </build> </profile> </profiles> + </project> http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles-us/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles-us/pom.xml b/rackspace-cloudfiles-us/pom.xml index f2282fd..d6224ec 100644 --- a/rackspace-cloudfiles-us/pom.xml +++ b/rackspace-cloudfiles-us/pom.xml @@ -23,6 +23,7 @@ <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> <version>1.8.1-SNAPSHOT</version> + <relativePath /> </parent> <!-- TODO: when out of labs, switch to org.jclouds.provider --> @@ -39,7 +40,7 @@ <test.rackspace-cloudfiles-us.api-version>1</test.rackspace-cloudfiles-us.api-version> <test.rackspace-cloudfiles-us.build-version /> <test.rackspace-cloudfiles-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudfiles-us.identity> - <test.rackspace-cloudfiles-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudfiles-us.credential> + <test.rackspace-cloudfiles-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudfiles-us.credential> <jclouds.osgi.export>org.jclouds.rackspace.cloudfiles.us*;version="${project.version}"</jclouds.osgi.export> <jclouds.osgi.import> org.jclouds.rest.internal;version="${jclouds.version}", @@ -62,20 +63,6 @@ </repository> </repositories> - <!-- For modernizer, which depends on jclouds-resources snapshot. --> - <pluginRepositories> - <pluginRepository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/repositories/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> @@ -101,7 +88,7 @@ <artifactId>rackspace-cloudfiles</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.jclouds.api</groupId> <artifactId>openstack-keystone</artifactId> <version>${project.parent.version}</version> @@ -166,10 +153,9 @@ <goal>test</goal> </goals> <configuration> - <forkCount>5</forkCount> - <reuseForks>true</reuseForks> - <parallel>classes</parallel> <systemPropertyVariables> + <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url> + <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5> <test.rackspace-cloudfiles-us.endpoint>${test.rackspace-cloudfiles-us.endpoint}</test.rackspace-cloudfiles-us.endpoint> <test.rackspace-cloudfiles-us.api-version>${test.rackspace-cloudfiles-us.api-version}</test.rackspace-cloudfiles-us.api-version> <test.rackspace-cloudfiles-us.build-version>${test.rackspace-cloudfiles-us.build-version}</test.rackspace-cloudfiles-us.build-version> @@ -186,4 +172,5 @@ </build> </profile> </profiles> + </project> http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/pom.xml b/rackspace-cloudfiles/pom.xml index ff2a3f3..a678e5d 100644 --- a/rackspace-cloudfiles/pom.xml +++ b/rackspace-cloudfiles/pom.xml @@ -23,6 +23,7 @@ <groupId>org.apache.jclouds</groupId> <artifactId>jclouds-project</artifactId> <version>1.8.1-SNAPSHOT</version> + <relativePath /> </parent> <!-- TODO: when out of labs, switch to org.jclouds.api --> @@ -57,20 +58,6 @@ </repository> </repositories> - <!-- For modernizer, which depends on jclouds-resources snapshot. --> - <pluginRepositories> - <pluginRepository> - <id>apache-snapshots</id> - <url>https://repository.apache.org/content/repositories/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - <dependencies> <dependency> <groupId>org.apache.jclouds.labs</groupId> @@ -161,10 +148,9 @@ <goal>test</goal> </goals> <configuration> - <forkCount>5</forkCount> - <reuseForks>true</reuseForks> - <parallel>classes</parallel> <systemPropertyVariables> + <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url> + <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5> <test.rackspace-cloudfiles.endpoint>${test.rackspace-cloudfiles.endpoint}</test.rackspace-cloudfiles.endpoint> <test.rackspace-cloudfiles.api-version>${test.rackspace-cloudfiles.api-version}</test.rackspace-cloudfiles.api-version> <test.rackspace-cloudfiles.build-version>${test.rackspace-cloudfiles.build-version}</test.rackspace-cloudfiles.build-version> @@ -181,4 +167,5 @@ </build> </profile> </profiles> + </project> http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/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 e888725..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 @@ -16,7 +16,6 @@ */ package org.jclouds.rackspace.cloudfiles.v1; -import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.rackspace.cloudfiles.v1.features.CDNApi; import org.jclouds.rackspace.cloudfiles.v1.functions.RegionToCDNEndpoint; @@ -32,7 +31,7 @@ import com.google.common.annotations.Beta; * <p/> * Additionally, Cloud Files provides a simple yet powerful way to publish and distribute content * behind a Content Distribution Network. - * + * * @see CDNApi * @see SwiftApi */ @@ -41,24 +40,12 @@ public interface CloudFilesApi extends SwiftApi { /** * Provides access to Cloud Files CDN features. - * + * * @param region the region to access the CDN API. - * + * * @return the {@link CDNApi} for the specified region. */ @Delegate - CDNApi getCDNApiForRegion(@EndpointParam(parser = RegionToCDNEndpoint.class) @Nullable String region); + 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) @Nullable String region); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java index 3628e2d..e88626f 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/features/CDNApi.java @@ -64,7 +64,7 @@ import com.google.common.collect.FluentIterable; * noted in the service catalog for Cloud Files during Authentication and set the * <code>X-CDN-Enabled</code> header to <code>true</code>. * - * @see {@link CloudFilesApi#getCDNApiForRegion(String)} + * @see {@link org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi#getCDNApi(String)} */ @Beta @RequestFilters(AuthenticateRequest.class) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java index 3d4e0f9..38430d6 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java @@ -57,11 +57,11 @@ public class ParseCDNContainerFromHeaders implements Function<HttpResponse, CDNC String enabled = checkNotNull(from.getFirstHeaderOrNull(CDN_ENABLED), CDN_ENABLED); String logRetention = checkNotNull(from.getFirstHeaderOrNull(CDN_LOG_RETENTION), CDN_LOG_RETENTION); String ttl = checkNotNull(from.getFirstHeaderOrNull(CDN_TTL), CDN_TTL); - + // just need the name from the path List<String> parts = newArrayList(Splitter.on('/').split(request.getEndpoint().getPath())); - checkArgument(parts.size() > 0); - + checkArgument(!parts.isEmpty()); + return CDNContainer.builder().name(parts.get(parts.size() - 1)) .enabled(Boolean.parseBoolean(enabled)) .logRetention(Boolean.parseBoolean(logRetention)) http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java index 866c34f..07f6f25 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java @@ -34,15 +34,15 @@ import com.google.common.base.Function; import com.google.common.base.Supplier; /** - * This class ensures that the correct Cloud Files CDN endpoint is retrieved from the endpoint - * supplier. The CDN API should never be instantiated directly, but rather accessed through the + * This class ensures that the correct Cloud Files CDN endpoint is retrieved from the endpoint + * supplier. The CDN API should never be instantiated directly, but rather accessed through the * {@link CloudFilesApi#cdnApiInRegion(String)} API. * <p/> * <h3>NOTE</h3> * The Cloud Files Service Type will always default to OpenStack Object Storage ("object-storage"). * <p/> - * - * + * + * * @see CloudFilesApi#cdnApiInRegion(String) * @see CDNApi * @see RegionToEndpoint @@ -53,7 +53,7 @@ import com.google.common.base.Supplier; * Service Access Endpoints</a> */ @Singleton -public class RegionToCDNEndpoint implements Function<Object, URI> { +public class RegionToCDNEndpoint implements Function<Object, URI> { private final Supplier<Map<String, Supplier<URI>>> endpointsSupplier; @@ -65,7 +65,7 @@ public class RegionToCDNEndpoint implements Function<Object, URI> { public URI apply(@Nullable Object from) { checkArgument(from != null && from instanceof String, "you must specify a region, as a String argument"); Map<String, Supplier<URI>> regionToEndpoint = endpointsSupplier.get(); - checkState(regionToEndpoint.size() > 0, "no region name to endpoint mappings configured!"); + checkState(!regionToEndpoint.isEmpty(), "no region name to endpoint mappings configured!"); checkArgument(regionToEndpoint.containsKey(from), "requested location %s, which is not in the configured locations: %s", from, regionToEndpoint); return regionToEndpoint.get(from).get(); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java index 095ea10..57ff302 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesConstants.java @@ -20,8 +20,12 @@ package org.jclouds.rackspace.cloudfiles.v1.reference; /** * Constants specified by Rackspace Cloud Files. */ -public interface CloudFilesConstants { - int CDN_TTL_MIN = 900; - int CDN_TTL_MAX = 31536000; - int CDN_TTL_DEFAULT = 259200; +public final class CloudFilesConstants { + public static final int CDN_TTL_MIN = 900; + public static final int CDN_TTL_MAX = 31536000; + public static final int CDN_TTL_DEFAULT = 259200; + + private CloudFilesConstants() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java index e4d862b..1563c61 100644 --- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java +++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java @@ -21,20 +21,24 @@ import org.jclouds.openstack.swift.v1.reference.SwiftHeaders; /** * Additional headers specified by Rackspace Cloud Files. */ -public interface CloudFilesHeaders extends SwiftHeaders { +public final class CloudFilesHeaders { // Access logs - String CONTAINER_ACCESS_LOG_DELIVERY = CONTAINER_METADATA_PREFIX + "Access-Log-Delivery"; + public static final String CONTAINER_ACCESS_LOG_DELIVERY = SwiftHeaders.CONTAINER_METADATA_PREFIX + "Access-Log-Delivery"; // Common CDN Headers - String CDN_ENABLED = "X-Cdn-Enabled"; - String CDN_LOG_RETENTION = "X-Log-Retention"; - String CDN_TTL = "X-Ttl"; - String CDN_URI = "X-Cdn-Uri"; - String CDN_SSL_URI = "X-Cdn-Ssl-Uri"; - String CDN_STREAMING_URI = "X-Cdn-Streaming-Uri"; - String CDN_IOS_URI = "X-Cdn-Ios-Uri"; + public static final String CDN_ENABLED = "X-Cdn-Enabled"; + public static final String CDN_LOG_RETENTION = "X-Log-Retention"; + public static final String CDN_TTL = "X-Ttl"; + public static final String CDN_URI = "X-Cdn-Uri"; + public static final String CDN_SSL_URI = "X-Cdn-Ssl-Uri"; + public static final String CDN_STREAMING_URI = "X-Cdn-Streaming-Uri"; + public static final String CDN_IOS_URI = "X-Cdn-Ios-Uri"; // CDN Purge - String CDN_PURGE_OBJECT_EMAIL = "X-Purge-Email"; - String CDN_PURGE_OBJECT_FAILED = "X-Purge-Failed-Reason"; + public static final String CDN_PURGE_OBJECT_EMAIL = "X-Purge-Email"; + public static final String CDN_PURGE_OBJECT_FAILED = "X-Purge-Failed-Reason"; + + private CloudFilesHeaders() { + throw new AssertionError("intentionally unimplemented"); + } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/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 8e57cf5..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 @@ -37,7 +37,7 @@ public class CloudFilesAccountApiLiveTest extends AccountApiLiveTest { public void testUrlKeyExists() throws Exception { for (String regionId : regions) { - Account account = api.getAccountApiForRegion(regionId).get(); + Account account = api.getAccountApi(regionId).get(); assertTrue(account.getTemporaryUrlKey().isPresent()); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/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 39e95cc..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 @@ -54,9 +54,9 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testEnable() throws Exception { for (String regionId : regions) { - assertNotNull(api.getCDNApiForRegion(regionId).enable(name)); - - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + assertNotNull(api.getCDNApi(regionId).enable(name)); + + CDNContainer container = api.getCDNApi(regionId).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); } @@ -64,9 +64,9 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testEnableWithTTL() throws Exception { for (String regionId : regions) { - assertNotNull(api.getCDNApiForRegion(regionId).enable(name, 777777)); + assertNotNull(api.getCDNApi(regionId).enable(name, 777777)); - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + CDNContainer container = api.getCDNApi(regionId).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); assertTrue(container.getTtl() == 777777); @@ -75,18 +75,18 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testDisable() throws Exception { for (String regionId : regions) { - assertTrue(api.getCDNApiForRegion(regionId).disable(name)); + assertTrue(api.getCDNApi(regionId).disable(name)); - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + CDNContainer container = api.getCDNApi(regionId).get(name); assertFalse(container.isEnabled()); } } public void testList() throws Exception { for (String regionId : regions) { - List<CDNContainer> cdnResponse = api.getCDNApiForRegion(regionId).list().toList(); + List<CDNContainer> cdnResponse = api.getCDNApi(regionId).list().toList(); assertNotNull(cdnResponse); - + for (CDNContainer cdnContainer : cdnResponse) { assertCDNContainerNotNull(cdnContainer); assertTrue(cdnContainer.isEnabled()); @@ -98,8 +98,8 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { String lexicographicallyBeforeName = name.substring(0, name.length() - 1); for (String regionId : regions) { ListCDNContainerOptions options = new ListCDNContainerOptions().marker(lexicographicallyBeforeName); - - CDNContainer cdnContainer = api.getCDNApiForRegion(regionId).list(options).get(0); + + CDNContainer cdnContainer = api.getCDNApi(regionId).list(options).get(0); assertCDNContainerNotNull(cdnContainer); assertTrue(cdnContainer.isEnabled()); } @@ -107,7 +107,7 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testGet() throws Exception { for (String regionId : regions) { - CDNContainer container = api.getCDNApiForRegion(regionId).get(name); + CDNContainer container = api.getCDNApi(regionId).get(name); assertCDNContainerNotNull(container); assertTrue(container.isEnabled()); } @@ -117,14 +117,14 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { for (String regionId : regions) { String objectName = "testPurge"; Payload payload = Payloads.newByteSourcePayload(ByteSource.wrap(new byte[] {1, 2, 3})); - ObjectApi objectApi = api.getObjectApiForRegionAndContainer(regionId, name); - + ObjectApi objectApi = api.getObjectApi(regionId, name); + // create a new object objectApi.put(objectName, payload); - - CDNApi cdnApi = api.getCDNApiForRegion(regionId); + + CDNApi cdnApi = api.getCDNApi(regionId); assertTrue(cdnApi.purgeObject(name, "testPurge", ImmutableList.<String>of())); - + // delete the object objectApi.delete(objectName); assertNull(objectApi.get(objectName, GetOptions.NONE)); @@ -134,10 +134,10 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void testUpdate() throws Exception { for (String regionId : regions) { // enable with a ttl - assertNotNull(api.getCDNApiForRegion(regionId).enable(name, 777777)); - + assertNotNull(api.getCDNApi(regionId).enable(name, 777777)); + // now get the container - CDNContainer original = api.getCDNApiForRegion(regionId).get(name); + CDNContainer original = api.getCDNApi(regionId).get(name); assertTrue(original.isEnabled()); assertCDNContainerNotNull(original); @@ -147,13 +147,13 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { .logRetention(true) .enabled(false); // update the container - assertTrue(api.getCDNApiForRegion(regionId).update(name, opts)); - + assertTrue(api.getCDNApi(regionId).update(name, opts)); + // now get the updated container - CDNContainer updated = api.getCDNApiForRegion(regionId).get(name); + CDNContainer updated = api.getCDNApi(regionId).get(name); assertFalse(updated.isEnabled()); assertCDNContainerNotNull(updated); - + assertNotEquals(original.getTtl(), updated.getTtl()); assertTrue(updated.isLogRetentionEnabled()); } @@ -174,7 +174,7 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { public void setup() { super.setup(); for (String regionId : regions) { - api.getContainerApiForRegion(regionId).create(name); + api.getContainerApi(regionId).create(name); } } @@ -182,8 +182,8 @@ public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest { @AfterClass(groups = "live") public void tearDown() { for (String regionId : regions) { - api.getCDNApiForRegion(regionId).disable(name); - api.getContainerApiForRegion(regionId).deleteIfEmpty(name); + api.getCDNApi(regionId).disable(name); + api.getContainerApi(regionId).deleteIfEmpty(name); } super.tearDown(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1fa6366c/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java ---------------------------------------------------------------------- diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java index de55058..a3fa13c 100644 --- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java +++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java @@ -61,7 +61,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNApi cdnApi = api.getCDNApiForRegion("DFW"); + CDNApi cdnApi = api.getCDNApi("DFW"); ImmutableList<CDNContainer> cdnContainers = cdnApi.list().toList(); @@ -82,7 +82,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNApi cdnApi = api.getCDNApiForRegion("DFW"); + CDNApi cdnApi = api.getCDNApi("DFW"); List<CDNContainer> cdnContainers = cdnApi.list().toList(); @@ -104,7 +104,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); ListCDNContainerOptions options = new ListCDNContainerOptions().marker("cdn-container-3"); - ImmutableList<CDNContainer> containers = api.getCDNApiForRegion("DFW").list(options).toList(); + ImmutableList<CDNContainer> containers = api.getCDNApi("DFW").list(options).toList(); for (CDNContainer container : containers) { assertCDNContainerNotNull(container); @@ -128,7 +128,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); ListCDNContainerOptions options = ListCDNContainerOptions.Builder.marker("cdn-container-3"); - FluentIterable<CDNContainer> containers = api.getCDNApiForRegion("DFW").list(options); + FluentIterable<CDNContainer> containers = api.getCDNApi("DFW").list(options); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -150,7 +150,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container - URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1"); + URI enabledContainer = api.getCDNApi("DFW").enable("container-1"); assertNotNull(enabledContainer); assertEquals(server.getRequestCount(), 2); @@ -165,11 +165,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(404))); - + try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container - assertNull(api.getCDNApiForRegion("DFW").enable("container-1")); + assertNull(api.getCDNApi("DFW").enable("container-1")); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -188,7 +188,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container with a TTL - URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1", 777777); + URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777); assertNotNull(enabledContainer); assertEquals(server.getRequestCount(), 2); @@ -208,7 +208,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // enable a CDN Container with a TTL - URI enabledContainer = api.getCDNApiForRegion("DFW").enable("container-1", 777777); + URI enabledContainer = api.getCDNApi("DFW").enable("container-1", 777777); assertNull(enabledContainer); assertEquals(server.getRequestCount(), 2); @@ -228,7 +228,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // disable a CDN Container - assertTrue(api.getCDNApiForRegion("DFW").disable("container-1")); + assertTrue(api.getCDNApi("DFW").disable("container-1")); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -247,7 +247,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // disable a CDN Container - boolean disbledContainer = api.getCDNApiForRegion("DFW").disable("container-1"); + boolean disbledContainer = api.getCDNApi("DFW").disable("container-1"); assertFalse(disbledContainer); assertEquals(server.getRequestCount(), 2); @@ -262,11 +262,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201))); - + try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); assertEquals(mockCDNContainer, cdnContainer); @@ -286,7 +286,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("cdn-container with spaces"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("cdn-container with spaces"); assertCDNContainerNotNull(cdnContainer); assertEquals(mockCDNContainerWithSpaces, cdnContainer); @@ -306,7 +306,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertAuthentication(server); assertRequest(server.takeRequest(), "HEAD", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/container-1"); @@ -325,7 +325,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // purge the object - assertTrue(api.getCDNApiForRegion("DFW").purgeObject("myContainer", "myObject", emails)); + assertTrue(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails)); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -344,7 +344,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); // purge the object - assertFalse(api.getCDNApiForRegion("DFW").purgeObject("myContainer", "myObject", emails)); + assertFalse(api.getCDNApi("DFW").purgeObject("myContainer", "myObject", emails)); assertEquals(server.getRequestCount(), 2); assertAuthentication(server); @@ -364,13 +364,13 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); // update the CDN Container - assertTrue(api.getCDNApiForRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); + assertTrue(api.getCDNApi("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); - cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); CDNContainer updatedContainer = CDNContainer.builder() @@ -405,11 +405,11 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp try { CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles"); - CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("container-1"); + CDNContainer cdnContainer = api.getCDNApi("DFW").get("container-1"); assertCDNContainerNotNull(cdnContainer); // update the CDN Container - assertFalse(api.getCDNApiForRegion("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); + assertFalse(api.getCDNApi("DFW").update("container-1", enabled(false).logRetention(true).ttl(7654321))); assertEquals(server.getRequestCount(), 3); assertAuthentication(server);
