Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openstack-swift extensibility

This commit is contained in:
Andrew Donald Kennedy 2012-08-12 12:43:55 +01:00
parent b3121b7889
commit 70fc6f5c52
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
View File

@ -47,7 +47,7 @@ public interface AccountApi {
/** /**
* @see #listContainers(ListContainersOptions) * @see #listContainers(ListContainersOptions)
*/ */
Set<ContainerMetadata> listContainers(); Set<? extends ContainerMetadata> listContainers();
/** /**
* retrieve a list of existing storage containers ordered by name. The sort order for the name is * retrieve a list of existing storage containers ordered by name. The sort order for the name is
@ -57,6 +57,6 @@ public interface AccountApi {
* @param options * @param options
* @return a list of existing storage containers ordered by name. * @return a list of existing storage containers ordered by name.
*/ */
Set<ContainerMetadata> listContainers(ListContainersOptions options); Set<? extends ContainerMetadata> listContainers(ListContainersOptions options);
} }

6
labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
View File

@ -59,7 +59,7 @@ public interface AccountAsyncApi {
@HEAD @HEAD
@ResponseParser(ParseAccountMetadataResponseFromHeaders.class) @ResponseParser(ParseAccountMetadataResponseFromHeaders.class)
@Path("/") @Path("/")
ListenableFuture<AccountMetadata> getAccountMetadata(); ListenableFuture<? extends AccountMetadata> getAccountMetadata();
/** /**
* @see AccountApi#listContainers() * @see AccountApi#listContainers()
@ -69,7 +69,7 @@ public interface AccountAsyncApi {
@QueryParams(keys = "format", values = "json") @QueryParams(keys = "format", values = "json")
@ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
@Path("/") @Path("/")
ListenableFuture<Set<ContainerMetadata>> listContainers(); ListenableFuture<? extends Set<? extends ContainerMetadata>> listContainers();
/** /**
* @see AccountApi#listContainers(ListContainersOptions) * @see AccountApi#listContainers(ListContainersOptions)
@ -79,5 +79,5 @@ public interface AccountAsyncApi {
@QueryParams(keys = "format", values = "json") @QueryParams(keys = "format", values = "json")
@ExceptionParser(ReturnEmptySetOnNotFoundOr404.class) @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
@Path("/") @Path("/")
ListenableFuture<Set<ContainerMetadata>> listContainers(ListContainersOptions options); ListenableFuture<? extends Set<? extends ContainerMetadata>> listContainers(ListContainersOptions options);
} }

2
labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
View File

@ -49,7 +49,7 @@ public class AccountApiLiveTest extends BaseSwiftApiLiveTest {
public void testListContainers() throws Exception { public void testListContainers() throws Exception {
for (String regionId : swiftContext.getApi().getConfiguredRegions()) { for (String regionId : swiftContext.getApi().getConfiguredRegions()) {
AccountApi api = swiftContext.getApi().getAccountApiForRegion(regionId); AccountApi api = swiftContext.getApi().getAccountApiForRegion(regionId);
Set<ContainerMetadata> response = api.listContainers(); Set<? extends ContainerMetadata> response = api.listContainers();
assertNotNull(response); assertNotNull(response);
for (ContainerMetadata container : response) { for (ContainerMetadata container : response) {
assertNotNull(container.getName()); assertNotNull(container.getName());