From 70fc6f5c52c76511b53e46624714e3100662a885 Mon Sep 17 00:00:00 2001
From: Andrew Donald Kennedy <andrew.kennedy@cloudsoftcorp.com>
Date: Sun, 12 Aug 2012 12:43:55 +0100
Subject: [PATCH] openstack-swift extensibility

---
 .../org/jclouds/openstack/swift/v1/features/AccountApi.java | 4 ++--
 .../openstack/swift/v1/features/AccountAsyncApi.java        | 6 +++---
 .../openstack/swift/v1/features/AccountApiLiveTest.java     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java b/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
index 8bdbcecec4..1cf2e2b664 100644
--- a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
+++ b/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
@@ -47,7 +47,7 @@ public interface AccountApi {
    /**
     * @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
@@ -57,6 +57,6 @@ public interface AccountApi {
     * @param options
     * @return a list of existing storage containers ordered by name.
     */
-   Set<ContainerMetadata> listContainers(ListContainersOptions options);
+   Set<? extends ContainerMetadata> listContainers(ListContainersOptions options);
 
 }
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java b/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
index 542fff1357..de64deef66 100644
--- a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
+++ b/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountAsyncApi.java
@@ -59,7 +59,7 @@ public interface AccountAsyncApi {
    @HEAD
    @ResponseParser(ParseAccountMetadataResponseFromHeaders.class)
    @Path("/")
-   ListenableFuture<AccountMetadata> getAccountMetadata();
+   ListenableFuture<? extends AccountMetadata> getAccountMetadata();
 
    /**
     * @see AccountApi#listContainers()
@@ -69,7 +69,7 @@ public interface AccountAsyncApi {
    @QueryParams(keys = "format", values = "json")
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    @Path("/")
-   ListenableFuture<Set<ContainerMetadata>> listContainers();
+   ListenableFuture<? extends Set<? extends ContainerMetadata>> listContainers();
 
    /**
     * @see AccountApi#listContainers(ListContainersOptions)
@@ -79,5 +79,5 @@ public interface AccountAsyncApi {
    @QueryParams(keys = "format", values = "json")
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    @Path("/")
-   ListenableFuture<Set<ContainerMetadata>> listContainers(ListContainersOptions options);
+   ListenableFuture<? extends Set<? extends ContainerMetadata>> listContainers(ListContainersOptions options);
 }
diff --git a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java b/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
index c3633dd096..8521c0e236 100644
--- a/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
+++ b/labs/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
@@ -49,7 +49,7 @@ public class AccountApiLiveTest extends BaseSwiftApiLiveTest {
    public void testListContainers() throws Exception {
       for (String regionId : swiftContext.getApi().getConfiguredRegions()) {
          AccountApi api = swiftContext.getApi().getAccountApiForRegion(regionId);
-         Set<ContainerMetadata> response = api.listContainers();
+         Set<? extends ContainerMetadata> response = api.listContainers();
          assertNotNull(response);
          for (ContainerMetadata container : response) {
             assertNotNull(container.getName());