Merge pull request #560 from danikov/covariant-future-iterables

covariant compatible version of futureIterables

apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java

@@ -72,7 +72,7 @@ public class CloudLoadBalancersListLoadBalancersStrategy implements ListLoadBala
 
    @Override
    public Iterable<? extends LoadBalancerMetadata> listLoadBalancers() {
-      return transform(concat(transformParallel(regions.get(), new Function<String, Future<Set<LoadBalancer>>>() {
+      return transform(concat(transformParallel(regions.get(), new Function<String, Future<? extends Set<LoadBalancer>>>() {
 
          @Override
          public ListenableFuture<Set<LoadBalancer>> apply(String from) {

apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java

@@ -56,6 +56,7 @@ import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.LoginCredentials;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -170,8 +171,8 @@ public class CloudSigmaComputeServiceAdapter implements
     */
    @Override
    public Iterable<DriveInfo> listImages() {
-      Iterable<DriveInfo> drives = transformParallel(client.listStandardDrives(),
+      Iterable<? extends DriveInfo> drives = transformParallel(client.listStandardDrives(),
-            new Function<String, Future<DriveInfo>>() {
+            new Function<String, Future<? extends DriveInfo>>() {
 
                @Override
                public Future<DriveInfo> apply(String input) {
@@ -190,7 +191,7 @@ public class CloudSigmaComputeServiceAdapter implements
                   return "seedDriveCache()";
                }
             }, executor, null, logger, "drives");
-      return filter(drives, PREINSTALLED_DISK);
+      return Iterables2.concreteCopy(filter(drives, PREINSTALLED_DISK));
    }
 
    @SuppressWarnings("unchecked")

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/DescribeImagesParallel.java

@@ -65,7 +65,7 @@ public class DescribeImagesParallel implements
             Iterable<Entry<String, DescribeImagesOptions>> queries) {
       return concat(transformParallel(
                queries,
-               new Function<Entry<String, DescribeImagesOptions>, Future<Set<? extends org.jclouds.ec2.domain.Image>>>() {
+               new Function<Entry<String, DescribeImagesOptions>, Future<? extends Set<? extends org.jclouds.ec2.domain.Image>>>() {
 
                   @Override
                   public Future<Set<? extends org.jclouds.ec2.domain.Image>> apply(

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java

@@ -92,7 +92,7 @@ public class EC2ListNodesStrategy implements ListNodesStrategy {
 
    protected Iterable<? extends RunningInstance> pollRunningInstances() {
       Iterable<? extends Set<? extends Reservation<? extends RunningInstance>>> reservations = transformParallel(
-               regions.get(), new Function<String, Future<Set<? extends Reservation<? extends RunningInstance>>>>() {
+               regions.get(), new Function<String, Future<? extends Set<? extends Reservation<? extends RunningInstance>>>>() {
 
                   @Override
                   public Future<Set<? extends Reservation<? extends RunningInstance>>> apply(String from) {

apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java

@@ -58,6 +58,7 @@ import org.jclouds.elasticstack.domain.ServerStatus;
 import org.jclouds.elasticstack.domain.WellKnownImage;
 import org.jclouds.elasticstack.reference.ElasticStackConstants;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -162,11 +163,11 @@ public class ElasticStackComputeServiceAdapter implements
     */
    @Override
    public Iterable<DriveInfo> listImages() {
-      Iterable<DriveInfo> drives = transformParallel(preinstalledImages.keySet(),
+      Iterable<? extends DriveInfo> drives = transformParallel(preinstalledImages.keySet(),
-            new Function<String, Future<DriveInfo>>() {
+            new Function<String, Future<? extends DriveInfo>>() {
 
                @Override
-               public Future<DriveInfo> apply(String input) {
+               public Future<? extends DriveInfo> apply(String input) {
                   try {
                      return Futures.immediateFuture(cache.getUnchecked(input));
                   } catch (CacheLoader.InvalidCacheLoadException e) {
@@ -183,7 +184,7 @@ public class ElasticStackComputeServiceAdapter implements
                }
 
             }, executor, null, logger, "drives");
-      return filter(drives, notNull());
+      return Iterables2.concreteCopy(filter(drives, notNull()));
    }
 
    @SuppressWarnings("unchecked")

apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java

@@ -27,12 +27,12 @@ import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.getLast;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Maps.transformValues;
-import static com.google.common.collect.Maps.uniqueIndex;
 import static org.jclouds.Constants.PROPERTY_API_VERSION;
 import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
 import static org.jclouds.rest.config.BinderUtils.bindClientAndAsyncClient;
 import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_DEFAULT_FENCEMODE;
 import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_TIMEOUT_TASK_COMPLETED;
+import static org.jclouds.util.Maps2.uniqueIndex;
 
 import java.net.URI;
 import java.util.Map;
@@ -118,6 +118,7 @@ import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.collect.Lists;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
@@ -285,26 +286,27 @@ public class VCloudRestClientModule extends RestClientModule<VCloudClient, VClou
 
    @Singleton
    public static class OrgCatalogSupplier implements
-            Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.Catalog>>> {
+            Supplier<Map<String, Map<String, Catalog>>> {
       protected final Supplier<Map<String, Org>> orgSupplier;
-      protected final Function<Org, Iterable<org.jclouds.vcloud.domain.Catalog>> allCatalogsInOrg;
+      protected final Function<Org, Iterable<Catalog>> allCatalogsInOrg;
 
       @Inject
       protected OrgCatalogSupplier(Supplier<Map<String, Org>> orgSupplier,
-               Function<Org, Iterable<org.jclouds.vcloud.domain.Catalog>> allCatalogsInOrg) {
+               Function<Org, Iterable<Catalog>> allCatalogsInOrg) {
          this.orgSupplier = orgSupplier;
          this.allCatalogsInOrg = allCatalogsInOrg;
       }
 
       @Override
-      public Map<String, Map<String, org.jclouds.vcloud.domain.Catalog>> get() {
+      public Map<String, Map<String, Catalog>> get() {
          return transformValues(
                   transformValues(orgSupplier.get(), allCatalogsInOrg),
-                  new Function<Iterable<org.jclouds.vcloud.domain.Catalog>, Map<String, org.jclouds.vcloud.domain.Catalog>>() {
+                  new Function<Iterable<? extends Catalog>, 
+                  Map<String, Catalog>>() {
 
                      @Override
-                     public Map<String, org.jclouds.vcloud.domain.Catalog> apply(
+                     public Map<String, Catalog> apply(
-                              Iterable<org.jclouds.vcloud.domain.Catalog> from) {
+                              Iterable<? extends Catalog> from) {
                         return uniqueIndex(from, name);
                      }
 
@@ -336,37 +338,37 @@ public class VCloudRestClientModule extends RestClientModule<VCloudClient, VClou
 
    @Provides
    @Singleton
-   protected Supplier<Map<URI, org.jclouds.vcloud.domain.VDC>> provideURIToVDC(
+   protected Supplier<Map<URI, VDC>> provideURIToVDC(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, AtomicReference<AuthorizationException> authException,
             URItoVDC supplier) {
-      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<URI, org.jclouds.vcloud.domain.VDC>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<URI, VDC>>(
                authException, seconds, supplier);
    }
 
    @Singleton
-   public static class URItoVDC implements Supplier<Map<URI, org.jclouds.vcloud.domain.VDC>> {
+   public static class URItoVDC implements Supplier<Map<URI, VDC>> {
-      private final Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.VDC>>> orgVDCMap;
+      private final Supplier<Map<String, Map<String, VDC>>> orgVDCMap;
 
       @Inject
-      URItoVDC(Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.VDC>>> orgVDCMap) {
+      URItoVDC(Supplier<Map<String, Map<String, VDC>>> orgVDCMap) {
          this.orgVDCMap = orgVDCMap;
       }
 
       @Override
-      public Map<URI, org.jclouds.vcloud.domain.VDC> get() {
+      public Map<URI, VDC> get() {
          return uniqueIndex(concat(transform(orgVDCMap.get().values(),
-                  new Function<Map<String, org.jclouds.vcloud.domain.VDC>, Iterable<org.jclouds.vcloud.domain.VDC>>() {
+                  new Function<Map<String, VDC>, Iterable<VDC>>() {
 
                      @Override
-                     public Iterable<org.jclouds.vcloud.domain.VDC> apply(
+                     public Iterable<VDC> apply(
-                              Map<String, org.jclouds.vcloud.domain.VDC> from) {
+                              Map<String, VDC> from) {
                         return from.values();
                      }
 
-                  })), new Function<org.jclouds.vcloud.domain.VDC, URI>() {
+                  })), new Function<VDC, URI>() {
 
             @Override
-            public URI apply(org.jclouds.vcloud.domain.VDC from) {
+            public URI apply(VDC from) {
                return from.getHref();
             }
 
@@ -445,43 +447,43 @@ public class VCloudRestClientModule extends RestClientModule<VCloudClient, VClou
 
    @Provides
    @Singleton
-   protected Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.Catalog>>> provideOrgCatalogItemMapSupplierCache(
+   protected Supplier<Map<String, Map<String, Catalog>>> provideOrgCatalogItemMapSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, AtomicReference<AuthorizationException> authException,
             OrgCatalogSupplier supplier) {
-      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, org.jclouds.vcloud.domain.Catalog>>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, Catalog>>>(
                authException, seconds, supplier);
    }
 
    @Provides
    @Singleton
-   protected Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.VDC>>> provideOrgVDCSupplierCache(
+   protected Supplier<Map<String, Map<String, VDC>>> provideOrgVDCSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, AtomicReference<AuthorizationException> authException,
             OrgVDCSupplier supplier) {
-      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, org.jclouds.vcloud.domain.VDC>>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, VDC>>>(
                authException, seconds, supplier);
    }
 
    @Singleton
-   public static class OrgVDCSupplier implements Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.VDC>>> {
+   public static class OrgVDCSupplier implements Supplier<Map<String, Map<String, VDC>>> {
       protected final Supplier<Map<String, Org>> orgSupplier;
-      private final Function<Org, Iterable<org.jclouds.vcloud.domain.VDC>> allVDCsInOrg;
+      private final Function<Org, Iterable<VDC>> allVDCsInOrg;
 
       @Inject
       protected OrgVDCSupplier(Supplier<Map<String, Org>> orgSupplier,
-               Function<Org, Iterable<org.jclouds.vcloud.domain.VDC>> allVDCsInOrg) {
+               Function<Org, Iterable<VDC>> allVDCsInOrg) {
          this.orgSupplier = orgSupplier;
          this.allVDCsInOrg = allVDCsInOrg;
       }
 
       @Override
-      public Map<String, Map<String, org.jclouds.vcloud.domain.VDC>> get() {
+      public Map<String, Map<String, VDC>> get() {
          return transformValues(transformValues(orgSupplier.get(), allVDCsInOrg),
-                  new Function<Iterable<org.jclouds.vcloud.domain.VDC>, Map<String, org.jclouds.vcloud.domain.VDC>>() {
+                  new Function<Iterable<? extends VDC>, Map<String, VDC>>() {
 
                      @Override
-                     public Map<String, org.jclouds.vcloud.domain.VDC> apply(
+                     public Map<String, VDC> apply(
-                              Iterable<org.jclouds.vcloud.domain.VDC> from) {
+                              Iterable<? extends VDC> from) {
-                        return uniqueIndex(from, name);
+                        return uniqueIndex(Lists.newArrayList(from), name);
                      }
 
                   });
@@ -490,33 +492,33 @@ public class VCloudRestClientModule extends RestClientModule<VCloudClient, VClou
 
    @Singleton
    public static class OrgCatalogItemSupplier implements
-            Supplier<Map<String, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>>> {
+            Supplier<Map<String, Map<String, Map<String, CatalogItem>>>> {
-      protected final Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.Catalog>>> catalogSupplier;
+      protected final Supplier<Map<String, Map<String, Catalog>>> catalogSupplier;
-      protected final Function<org.jclouds.vcloud.domain.Catalog, Iterable<CatalogItem>> allCatalogItemsInCatalog;
+      protected final Function<Catalog, Iterable<CatalogItem>> allCatalogItemsInCatalog;
 
       @Inject
       protected OrgCatalogItemSupplier(
-               Supplier<Map<String, Map<String, org.jclouds.vcloud.domain.Catalog>>> catalogSupplier,
+               Supplier<Map<String, Map<String, Catalog>>> catalogSupplier,
-               Function<org.jclouds.vcloud.domain.Catalog, Iterable<CatalogItem>> allCatalogItemsInCatalog) {
+               Function<Catalog, Iterable<CatalogItem>> allCatalogItemsInCatalog) {
          this.catalogSupplier = catalogSupplier;
          this.allCatalogItemsInCatalog = allCatalogItemsInCatalog;
       }
 
       @Override
-      public Map<String, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>> get() {
+      public Map<String, Map<String, Map<String, CatalogItem>>> get() {
          return transformValues(
                   catalogSupplier.get(),
-                  new Function<Map<String, org.jclouds.vcloud.domain.Catalog>, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>>() {
+                  new Function<Map<String, Catalog>, Map<String, Map<String, CatalogItem>>>() {
 
                      @Override
                      public Map<String, Map<String, CatalogItem>> apply(
-                              Map<String, org.jclouds.vcloud.domain.Catalog> from) {
+                              Map<String, Catalog> from) {
                         return transformValues(
                                  from,
-                                 new Function<org.jclouds.vcloud.domain.Catalog, Map<String, org.jclouds.vcloud.domain.CatalogItem>>() {
+                                 new Function<Catalog, Map<String, CatalogItem>>() {
 
                                     @Override
-                                    public Map<String, CatalogItem> apply(org.jclouds.vcloud.domain.Catalog from) {
+                                    public Map<String, CatalogItem> apply(Catalog from) {
                                        return uniqueIndex(filter(allCatalogItemsInCatalog.apply(from), notNull()), name);
                                     }
                                  });
@@ -528,10 +530,10 @@ public class VCloudRestClientModule extends RestClientModule<VCloudClient, VClou
 
    @Provides
    @Singleton
-   protected Supplier<Map<String, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>>> provideOrgCatalogItemSupplierCache(
+   protected Supplier<Map<String, Map<String, Map<String, CatalogItem>>>> provideOrgCatalogItemSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, AtomicReference<AuthorizationException> authException,
             OrgCatalogItemSupplier supplier) {
-      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, Map<String, CatalogItem>>>>(
                authException, seconds, supplier);
    }
 

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInCatalog.java

@@ -31,6 +31,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.Catalog;
@@ -60,14 +61,14 @@ public class AllCatalogItemsInCatalog implements Function<Catalog, Iterable<Cata
    @Override
    public Iterable<CatalogItem> apply(Catalog from) {
 
-      Iterable<CatalogItem> catalogItems = transformParallel(filter(from.values(), new Predicate<ReferenceType>() {
+      Iterable<? extends CatalogItem> catalogItems = transformParallel(filter(from.values(), new Predicate<ReferenceType>() {
 
          @Override
          public boolean apply(ReferenceType input) {
             return input.getType().equals(VCloudMediaType.CATALOGITEM_XML);
          }
 
-      }), new Function<ReferenceType, Future<CatalogItem>>() {
+      }), new Function<ReferenceType, Future<? extends CatalogItem>>() {
 
          @Override
          public Future<CatalogItem> apply(ReferenceType from) {
@@ -75,7 +76,7 @@ public class AllCatalogItemsInCatalog implements Function<Catalog, Iterable<Cata
          }
 
       }, executor, null, logger, "catalogItems in " + from.getHref());
-      return catalogItems;
+      return Iterables2.concreteCopy(catalogItems);
    }
 
 }

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogItemsInOrg.java

@@ -48,9 +48,9 @@ public class AllCatalogItemsInOrg implements Function<Org, Iterable<CatalogItem>
    @Override
    public Iterable<CatalogItem> apply(Org from) {
       return Iterables.concat(Iterables.transform(allCatalogsInOrg.apply(from),
-               new Function<Catalog, Iterable<CatalogItem>>() {
+               new Function<Catalog, Iterable<? extends CatalogItem>>() {
                   @Override
-                  public Iterable<CatalogItem> apply(Catalog from) {
+                  public Iterable<? extends CatalogItem> apply(Catalog from) {
                      return allCatalogItemsInCatalog.apply(from);
                   }
 

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllCatalogsInOrg.java

@@ -30,6 +30,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.domain.Catalog;
 import org.jclouds.vcloud.domain.Org;
@@ -56,14 +57,14 @@ public class AllCatalogsInOrg implements Function<Org, Iterable<Catalog>> {
 
    @Override
    public Iterable<Catalog> apply(final Org org) {
-      Iterable<Catalog> catalogs = transformParallel(org.getCatalogs().values(),
+      Iterable<? extends Catalog> catalogs = transformParallel(org.getCatalogs().values(),
-            new Function<ReferenceType, Future<Catalog>>() {
+            new Function<ReferenceType, Future<? extends Catalog>>() {
                @Override
                public Future<Catalog> apply(ReferenceType from) {
-                  return (Future<Catalog>) aclient.getCatalogClient().getCatalog(from.getHref());
+                  return aclient.getCatalogClient().getCatalog(from.getHref());
                }
 
             }, executor, null, logger, "catalogs in " + org.getName());
-      return catalogs;
+      return Iterables2.concreteCopy(catalogs);
    }
 }

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/AllVDCsInOrg.java

@@ -30,6 +30,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.domain.Org;
 import org.jclouds.vcloud.domain.ReferenceType;
@@ -41,7 +42,7 @@ import com.google.common.base.Function;
  * @author Adrian Cole
  */
 @Singleton
-public class AllVDCsInOrg implements Function<Org, Iterable<org.jclouds.vcloud.domain.VDC>> {
+public class AllVDCsInOrg implements Function<Org, Iterable<VDC>> {
    @Resource
    public Logger logger = Logger.NULL;
 
@@ -58,14 +59,14 @@ public class AllVDCsInOrg implements Function<Org, Iterable<org.jclouds.vcloud.d
    public Iterable<VDC> apply(final Org org) {
 
       Iterable<VDC> catalogItems = transformParallel(org.getVDCs().values(),
-            new Function<ReferenceType, Future<org.jclouds.vcloud.domain.VDC>>() {
+            new Function<ReferenceType, Future<? extends VDC>>() {
                @Override
-               public Future<VDC> apply(ReferenceType from) {
+               public Future<? extends VDC> apply(ReferenceType from) {
                   return  aclient.getVDCClient().getVDC(from.getHref());
                }
 
             }, executor, null, logger, "vdcs in org " + org.getName());
-      return catalogItems;
+      return Iterables2.concreteCopy(catalogItems);
    }
 
 }

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgsForLocations.java

@@ -35,6 +35,7 @@ import org.jclouds.Constants;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.LocationScope;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.domain.Org;
 
@@ -46,7 +47,7 @@ import com.google.common.collect.Sets;
  * @author Adrian Cole
  */
 @Singleton
-public class OrgsForLocations implements Function<Iterable<Location>, Iterable< Org>> {
+public class OrgsForLocations implements Function<Iterable<Location>, Iterable<Org>> {
    @Resource
    public Logger logger = Logger.NULL;
    private final VCloudAsyncClient aclient;
@@ -65,7 +66,7 @@ public class OrgsForLocations implements Function<Iterable<Location>, Iterable<
    @Override
    public Iterable<Org> apply(Iterable<Location> from) {
 
-      return transformParallel(Sets.newLinkedHashSet(transform(filter(from, new Predicate<Location>() {
+      return Iterables2.concreteCopy(transformParallel(Sets.newLinkedHashSet(transform(filter(from, new Predicate<Location>() {
 
          @Override
          public boolean apply(Location input) {
@@ -79,14 +80,14 @@ public class OrgsForLocations implements Function<Iterable<Location>, Iterable<
             return URI.create(from.getParent().getId());
          }
 
-      })), new Function<URI, Future<Org>>() {
+      })), new Function<URI, Future<? extends Org>>() {
 
          @Override
          public Future<Org> apply(URI from) {
             return aclient.getOrgClient().getOrg(from);
          }
 
-      }, executor, null, logger, "organizations for uris");
+      }, executor, null, logger, "organizations for uris"));
    }
 
 }

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgsForNames.java

@@ -30,6 +30,7 @@ import javax.inject.Singleton;
 
 import org.jclouds.Constants;
 import org.jclouds.logging.Logger;
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.domain.Org;
 
@@ -53,14 +54,14 @@ public class OrgsForNames implements Function<Iterable<String>, Iterable<Org>> {
 
    @Override
    public Iterable<Org> apply(Iterable<String> from) {
-      return transformParallel(from, new Function<String, Future<Org>>() {
+      return Iterables2.concreteCopy(transformParallel(from, new Function<String, Future<? extends Org>>() {
 
          @Override
          public Future<Org> apply(String from) {
             return aclient.getOrgClient().findOrgNamed(from);
          }
 
-      }, executor, null, logger, "organizations for names");
+      }, executor, null, logger, "organizations for names"));
    }
 
 }

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesForCatalogItems.java

@@ -36,6 +36,7 @@ import org.jclouds.concurrent.ExceptionParsingListenableFuture;
 import org.jclouds.concurrent.Futures;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.AuthorizationException;
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.CatalogItem;
@@ -78,14 +79,14 @@ public class VAppTemplatesForCatalogItems implements Function<Iterable<CatalogIt
 
    @Override
    public Iterable<VAppTemplate> apply(Iterable<CatalogItem> from) {
-      return transformParallel(filter(from, new Predicate<CatalogItem>() {
+      return Iterables2.concreteCopy(transformParallel(filter(from, new Predicate<CatalogItem>() {
 
          @Override
          public boolean apply(CatalogItem input) {
             return input.getEntity().getType().equals(VCloudMediaType.VAPPTEMPLATE_XML);
          }
 
-      }), new Function<CatalogItem, Future<VAppTemplate>>() {
+      }), new Function<CatalogItem, Future<? extends VAppTemplate>>() {
 
          @Override
          public Future<VAppTemplate> apply(CatalogItem from) {
@@ -94,7 +95,7 @@ public class VAppTemplatesForCatalogItems implements Function<Iterable<CatalogIt
                      returnNullOnAuthorizationException);
          }
 
-      }, executor, null, logger, "vappTemplates in");
+      }, executor, null, logger, "vappTemplates in"));
    }
 
 }

apis/vcloud/src/main/java/org/jclouds/vcloud/functions/VAppTemplatesInOrg.java

@@ -25,6 +25,7 @@ import static com.google.common.collect.Iterables.filter;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.jclouds.util.Iterables2;
 import org.jclouds.vcloud.domain.CatalogItem;
 import org.jclouds.vcloud.domain.Org;
 import org.jclouds.vcloud.domain.Status;
@@ -53,7 +54,7 @@ public class VAppTemplatesInOrg implements Function<Org, Iterable<VAppTemplate>>
    @Override
    public Iterable<VAppTemplate> apply(Org from) {
       Iterable<CatalogItem> catalogs = allCatalogItemsInOrg.apply(from);
-      Iterable<VAppTemplate> vAppTemplates = vAppTemplatesForCatalogItems.apply(catalogs);
+      Iterable<VAppTemplate> vAppTemplates = Iterables2.concreteCopy(vAppTemplatesForCatalogItems.apply(catalogs));
       return filter(vAppTemplates, and(notNull(), new Predicate<VAppTemplate>(){
 
          //TODO: test this

apis/vcloud/src/main/java/org/jclouds/vcloud/suppliers/VAppTemplatesSupplier.java

@@ -69,8 +69,8 @@ public class VAppTemplatesSupplier implements Supplier<Set<VAppTemplate>> {
    @Override
    public Set<VAppTemplate> get() {
       Iterable<Org> orgs = checkNotNull(orgMap.get().values(), "orgs");
-      Iterable<Iterable<VAppTemplate>> images = transformParallel(orgs,
+      Iterable<? extends Iterable<VAppTemplate>> images = transformParallel(orgs,
-               new Function<Org, Future<Iterable<VAppTemplate>>>() {
+               new Function<Org, Future<? extends Iterable<VAppTemplate>>>() {
 
                   @Override
                   public Future<Iterable<VAppTemplate>> apply(final Org from) {

apis/vcloud/src/test/java/org/jclouds/vcloud/internal/BaseVCloudAsyncClientTest.java

@@ -42,6 +42,7 @@ import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.VCloudVersionsClient;
 import org.jclouds.vcloud.config.VCloudRestClientModule;
 import org.jclouds.vcloud.domain.AllocationModel;
+import org.jclouds.vcloud.domain.CatalogItem;
 import org.jclouds.vcloud.domain.Org;
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Task;
@@ -253,11 +254,11 @@ public abstract class BaseVCloudAsyncClientTest<T> extends BaseAsyncClientTest<T
          }
 
          @Override
-         public Map<String, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>> get() {
+         public Map<String, Map<String, Map<String, CatalogItem>>> get() {
-            return ImmutableMap.<String, Map<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>>> of(
+            return ImmutableMap.<String, Map<String, Map<String, CatalogItem>>> of(
                   ORG_REF.getName(), ImmutableMap
-                        .<String, Map<String, org.jclouds.vcloud.domain.CatalogItem>> of(CATALOG_REF
+                        .<String, Map<String, CatalogItem>> of(CATALOG_REF
-                              .getName(), ImmutableMap.<String, org.jclouds.vcloud.domain.CatalogItem> of(
+                              .getName(), ImmutableMap.<String, CatalogItem> of(
                               "template",
                               new CatalogItemImpl("template", URI
                                     .create("https://vcenterprise.bluelock.com/api/v1.0/catalogItem/2"), "description",

blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java

@@ -42,6 +42,7 @@ import org.jclouds.logging.Logger;
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 
 /**
@@ -83,21 +84,21 @@ public class FetchBlobMetadata implements Function<PageSet<? extends StorageMeta
    public PageSet<? extends StorageMetadata> apply(PageSet<? extends StorageMetadata> in) {
       checkState(container != null, "container name should be initialized");
 
-      Iterable<BlobMetadata> returnv = transformParallel(Iterables.filter(in, new Predicate<StorageMetadata>() {
+      Iterable<BlobMetadata> returnv = Lists.newArrayList(transformParallel(Iterables.filter(in, new Predicate<StorageMetadata>() {
 
          @Override
          public boolean apply(StorageMetadata input) {
             return input.getType() == StorageType.BLOB;
          }
 
-      }), new Function<StorageMetadata, Future<BlobMetadata>>() {
+      }), new Function<StorageMetadata, Future<? extends BlobMetadata>>() {
 
          @Override
          public Future<BlobMetadata> apply(StorageMetadata from) {
             return ablobstore.blobMetadata(container, from.getName());
          }
 
-      }, userExecutor, maxTime, logger, String.format("getting metadata from containerName: %s", container));
+      }, userExecutor, maxTime, logger, String.format("getting metadata from containerName: %s", container)));
 
       return new PageSetImpl<BlobMetadata>(returnv, in.getNextMarker());
    }

blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/GetAllBlobsInListAndRetryOnFailure.java

@@ -75,7 +75,7 @@ public class GetAllBlobsInListAndRetryOnFailure implements GetBlobsInListStrateg
 
    public Iterable<Blob> execute(final String container, ListContainerOptions options) {
       Iterable<? extends BlobMetadata> list = getAllBlobMetadata.execute(container, options);
-      return transformParallel(list, new Function<BlobMetadata, Future<Blob>>() {
+      return transformParallel(list, new Function<BlobMetadata, Future<? extends Blob>>() {
 
          @Override
          public Future<Blob> apply(BlobMetadata from) {

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VCloudHardwareSupplier.java

@@ -69,8 +69,8 @@ public class VCloudHardwareSupplier implements Supplier<Set<? extends Hardware>>
    @Override
    public Set<? extends Hardware> get() {
       Iterable<? extends Org> orgs = checkNotNull(orgMap.get().values(), "orgs");
-      Iterable<Iterable<? extends Hardware>> sizes = transformParallel(orgs,
+      Iterable<? extends Iterable<? extends Hardware>> sizes = transformParallel(orgs,
-               new Function<Org, Future<Iterable<? extends Hardware>>>() {
+               new Function<Org, Future<? extends Iterable<? extends Hardware>>>() {
 
                   @Override
                   public Future<Iterable<? extends Hardware>> apply(final Org from) {

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/suppliers/VCloudImageSupplier.java

@@ -69,8 +69,8 @@ public class VCloudImageSupplier implements Supplier<Set<? extends Image>> {
    @Override
    public Set<? extends Image> get() {
       Iterable<? extends Org> orgs = checkNotNull(orgMap.get().values(), "orgs");
-      Iterable<Iterable<? extends Image>> images = transformParallel(orgs,
+      Iterable<? extends Iterable<? extends Image>> images = transformParallel(orgs,
-               new Function<Org, Future<Iterable<? extends Image>>>() {
+               new Function<Org, Future<? extends Iterable<? extends Image>>>() {
 
                   @Override
                   public Future<Iterable<? extends Image>> apply(final Org from) {

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogItemsInCatalog.java

@@ -61,14 +61,14 @@ public class AllCatalogItemsInCatalog implements Function<Catalog, Iterable<? ex
    @Override
    public Iterable<? extends CatalogItem> apply(Catalog from) {
 
-      Iterable<CatalogItem> catalogItems = transformParallel(filter(from.values(), new Predicate<ReferenceType>() {
+      Iterable<? extends CatalogItem> catalogItems = transformParallel(filter(from.values(), new Predicate<ReferenceType>() {
 
          @Override
          public boolean apply(ReferenceType input) {
             return input.getType().equals(TerremarkVCloudMediaType.CATALOGITEM_XML);
          }
 
-      }), new Function<ReferenceType, Future<CatalogItem>>() {
+      }), new Function<ReferenceType, Future<? extends CatalogItem>>() {
 
          @SuppressWarnings("unchecked")
          @Override

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllCatalogsInOrg.java

@@ -56,8 +56,8 @@ public class AllCatalogsInOrg implements Function<Org, Iterable<? extends Catalo
 
    @Override
    public Iterable<? extends Catalog> apply(final Org org) {
-      Iterable<Catalog> catalogs = transformParallel(org.getCatalogs().values(),
+      Iterable<? extends Catalog> catalogs = transformParallel(org.getCatalogs().values(),
-            new Function<ReferenceType, Future<Catalog>>() {
+            new Function<ReferenceType, Future<? extends Catalog>>() {
                @SuppressWarnings("unchecked")
                @Override
                public Future<Catalog> apply(ReferenceType from) {

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/AllVDCsInOrg.java

@@ -56,12 +56,11 @@ public class AllVDCsInOrg implements Function<Org, Iterable<? extends org.jcloud
    @Override
    public Iterable<? extends org.jclouds.trmk.vcloud_0_8.domain.VDC> apply(final Org org) {
 
-      Iterable<org.jclouds.trmk.vcloud_0_8.domain.VDC> catalogItems = transformParallel(org.getVDCs().values(),
+      Iterable<? extends org.jclouds.trmk.vcloud_0_8.domain.VDC> catalogItems = transformParallel(org.getVDCs().values(),
-            new Function<ReferenceType, Future<org.jclouds.trmk.vcloud_0_8.domain.VDC>>() {
+            new Function<ReferenceType, Future<? extends org.jclouds.trmk.vcloud_0_8.domain.VDC>>() {
-               @SuppressWarnings("unchecked")
                @Override
-               public Future<org.jclouds.trmk.vcloud_0_8.domain.VDC> apply(ReferenceType from) {
+               public Future<? extends org.jclouds.trmk.vcloud_0_8.domain.VDC> apply(ReferenceType from) {
-                  return (Future<org.jclouds.trmk.vcloud_0_8.domain.VDC>) aclient.getVDC(from.getHref());
+                  return aclient.getVDC(from.getHref());
                }
 
             }, executor, null, logger, "vdcs in org " + org.getName());

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/OrgsForLocations.java

@@ -79,12 +79,10 @@ public class OrgsForLocations implements Function<Iterable<? extends Location>,
             return URI.create(from.getParent().getId());
          }
 
-      })), new Function<URI, Future<Org>>() {
+      })), new Function<URI, Future<? extends Org>>() {
-
-         @SuppressWarnings("unchecked")
          @Override
-         public Future<Org> apply(URI from) {
+         public Future<? extends Org> apply(URI from) {
-            return (Future<Org>) aclient.getOrg(from);
+            return aclient.getOrg(from);
          }
 
       }, executor, null, logger, "organizations for uris");

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/OrgsForNames.java

@@ -53,12 +53,10 @@ public class OrgsForNames implements Function<Iterable<String>, Iterable<? exten
 
    @Override
    public Iterable<? extends Org> apply(Iterable<String> from) {
-      return transformParallel(from, new Function<String, Future<Org>>() {
+      return transformParallel(from, new Function<String, Future<? extends Org>>() {
-
-         @SuppressWarnings("unchecked")
          @Override
-         public Future<Org> apply(String from) {
+         public Future<? extends Org> apply(String from) {
-            return (Future<Org>) aclient.findOrgNamed(from);
+            return aclient.findOrgNamed(from);
          }
 
       }, executor, null, logger, "organizations for names");

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/VAppTemplatesForCatalogItems.java

@@ -68,12 +68,10 @@ public class VAppTemplatesForCatalogItems implements
             return input.getEntity().getType().equals(TerremarkVCloudMediaType.VAPPTEMPLATE_XML);
          }
 
-      }), new Function<CatalogItem, Future<VAppTemplate>>() {
+      }), new Function<CatalogItem, Future<? extends VAppTemplate>>() {
-
-         @SuppressWarnings("unchecked")
          @Override
-         public Future<VAppTemplate> apply(CatalogItem from) {
+         public Future<? extends VAppTemplate> apply(CatalogItem from) {
-            return (Future<VAppTemplate>) aclient.getVAppTemplate(from.getEntity().getHref());
+            return aclient.getVAppTemplate(from.getEntity().getHref());
          }
 
       }, executor, null, logger, "vappTemplates in");

common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/functions/VAppTemplatesForResourceEntities.java

@@ -69,12 +69,10 @@ public class VAppTemplatesForResourceEntities implements
             return input.getType().equals(TerremarkVCloudMediaType.VAPPTEMPLATE_XML);
          }
 
-      }), new Function<ReferenceType, Future<VAppTemplate>>() {
+      }), new Function<ReferenceType, Future<? extends VAppTemplate>>() {
-
-         @SuppressWarnings("unchecked")
          @Override
-         public Future<VAppTemplate> apply(ReferenceType from) {
+         public Future<? extends VAppTemplate> apply(ReferenceType from) {
-            return (Future<VAppTemplate>) aclient.getVAppTemplate(from.getHref());
+            return aclient.getVAppTemplate(from.getHref());
          }
 
       }, executor, null, logger, "vappTemplates in");

compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java

@@ -238,7 +238,7 @@ public class BaseComputeService implements ComputeService {
    public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> destroying nodes matching(%s)", filter);
       Set<NodeMetadata> set = newLinkedHashSet(filter(transformParallel(nodesMatchingFilterAndNotTerminated(filter),
-            new Function<NodeMetadata, Future<NodeMetadata>>() {
+            new Function<NodeMetadata, Future<? extends NodeMetadata>>() {
 
                // TODO make an async interface instead of re-wrapping
                @Override
@@ -403,7 +403,7 @@ public class BaseComputeService implements ComputeService {
    public void rebootNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> rebooting nodes matching(%s)", filter);
       transformParallel(nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter),
-            new Function<NodeMetadata, Future<Void>>() {
+            new Function<NodeMetadata, Future<? extends Void>>() {
                // TODO use native async
                @Override
                public Future<Void> apply(NodeMetadata from) {
@@ -434,7 +434,7 @@ public class BaseComputeService implements ComputeService {
    public void resumeNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> resuming nodes matching(%s)", filter);
       transformParallel(nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter),
-            new Function<NodeMetadata, Future<Void>>() {
+            new Function<NodeMetadata, Future<? extends Void>>() {
                // TODO use native async
                @Override
                public Future<Void> apply(NodeMetadata from) {
@@ -465,7 +465,7 @@ public class BaseComputeService implements ComputeService {
    public void suspendNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> suspending nodes matching(%s)", filter);
       transformParallel(nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter),
-            new Function<NodeMetadata, Future<Void>>() {
+            new Function<NodeMetadata, Future<? extends Void>>() {
                // TODO use native async
                @Override
                public Future<Void> apply(NodeMetadata from) {
@@ -649,7 +649,7 @@ public class BaseComputeService implements ComputeService {
    }
 
    private final class TransformNodesIntoInitializedScriptRunners implements
-         Function<NodeMetadata, Future<RunScriptOnNode>> {
+         Function<NodeMetadata, Future<? extends RunScriptOnNode>> {
       private final Map<NodeMetadata, Exception> badNodes;
       private final Statement script;
       private final RunScriptOptions options;

core/src/main/java/org/jclouds/concurrent/FutureIterables.java

@@ -58,50 +58,51 @@ import com.google.inject.Inject;
 public class FutureIterables {
    @Resource
    private static Logger logger = Logger.CONSOLE;
-
+   
    @Inject(optional = true)
    @Named(Constants.PROPERTY_MAX_RETRIES)
    private static int maxRetries = 5;
-
+   
    @Inject(optional = true)
    @Named(Constants.PROPERTY_RETRY_DELAY_START)
    private static long delayStart = 50L;
-
+   
    @Inject(optional = true)
    private static BackoffLimitedRetryHandler retryHandler = BackoffLimitedRetryHandler.INSTANCE;
-
+   
    public static <F, T> Iterable<T> transformParallel(final Iterable<F> fromIterable,
-            final Function<? super F, Future<T>> function) {
+         final Function<? super F, Future<? extends T>> function) {
       return transformParallel(fromIterable, function, org.jclouds.concurrent.MoreExecutors.sameThreadExecutor(), null);
    }
-
+   
    public static <F, T> Iterable<T> transformParallel(final Iterable<F> fromIterable,
-            final Function<? super F, Future<T>> function, ExecutorService exec, @Nullable Long maxTime) {
+         final Function<? super F, Future<? extends T>> function, ExecutorService exec, @Nullable Long maxTime) {
       return transformParallel(fromIterable, function, exec, maxTime, logger, "transforming");
    }
-
+   
    public static <F, T> Iterable<T> transformParallel(final Iterable<F> fromIterable,
-            final Function<? super F, Future<T>> function, ExecutorService exec, @Nullable Long maxTime, Logger logger,
+         final Function<? super F, Future<? extends T>> function, ExecutorService exec, @Nullable Long maxTime, Logger logger,
-            String logPrefix) {
+               String logPrefix) {
       return transformParallel(fromIterable, function, exec, maxTime, logger, logPrefix, retryHandler, maxRetries);
    }
-
+   
    @SuppressWarnings("unchecked")
    public static <F, T> Iterable<T> transformParallel(Iterable<F> fromIterable,
-            Function<? super F, Future<T>> function, ExecutorService exec, @Nullable Long maxTime, Logger logger,
+         Function<? super F, Future<? extends T>> function, ExecutorService exec, @Nullable Long maxTime, Logger logger,
-            String logPrefix, BackoffLimitedRetryHandler retryHandler, int maxRetries) {
+               String logPrefix, BackoffLimitedRetryHandler retryHandler, int maxRetries) {
       Map<F, Exception> exceptions = newHashMap();
-      Map<F, Future<T>> responses = newHashMap();
+      Map<F, Future<? extends T>> responses = newHashMap();
       for (int i = 0; i < maxRetries; i++) {
-
+         
          for (F from : fromIterable) {
-            responses.put(from, function.apply(from));
+            Future<? extends T> to = function.apply(from);
+            responses.put(from, to);
          }
          exceptions = awaitCompletion(responses, exec, maxTime, logger, logPrefix);
          if (exceptions.size() > 0 && !any(exceptions.values(), containsThrowable(AuthorizationException.class))) {
             fromIterable = exceptions.keySet();
             retryHandler.imposeBackoffExponentialDelay(delayStart, 2, i + 1, maxRetries,
-                     String.format("error %s: %s: %s", logPrefix, fromIterable, exceptions));
+                  String.format("error %s: %s: %s", logPrefix, fromIterable, exceptions));
          } else {
             break;
          }
@@ -109,13 +110,13 @@ public class FutureIterables {
       //make sure we propagate any authorization exception so that we don't lock out accounts
       if (exceptions.size() > 0)
          return propagateAuthorizationOrOriginalException(new TransformParallelException((Map) responses, exceptions,
-                  logPrefix));
+               logPrefix));
-
+      
       return unwrap(responses.values());
    }
-
+   
    public static <T> Map<T, Exception> awaitCompletion(Map<T, ? extends Future<?>> responses, ExecutorService exec,
-            @Nullable Long maxTime, final Logger logger, final String logPrefix) {
+         @Nullable Long maxTime, final Logger logger, final String logPrefix) {
       final ConcurrentMap<T, Exception> errorMap = newConcurrentMap();
       if (responses.size() == 0)
          return errorMap;
@@ -126,7 +127,7 @@ public class FutureIterables {
       final long start = System.currentTimeMillis();
       for (final java.util.Map.Entry<T, ? extends Future<?>> future : responses.entrySet()) {
          Futures.makeListenable(future.getValue(), exec).addListener(new Runnable() {
-
+            
             @Override
             public void run() {
                try {
@@ -168,11 +169,11 @@ public class FutureIterables {
       }
       return errorMap;
    }
-
+   
-   public static <T> Iterable<T> unwrap(Iterable<Future<T>> values) {
+   public static <T> Iterable<T> unwrap(Iterable<Future<? extends T>> values) {
-      return transform(values, new Function<Future<T>, T>() {
+      return transform(values, new Function<Future<? extends T>, T>() {
          @Override
-         public T apply(Future<T> from) {
+         public T apply(Future<? extends T> from) {
             try {
                return from.get();
             } catch (InterruptedException e) {
@@ -189,20 +190,20 @@ public class FutureIterables {
          }
       });
    }
-
+   
    private static void logException(Logger logger, String logPrefix, int total, int complete, int errors, long start,
-            Exception e) {
+         Exception e) {
       String message = message(logPrefix, total, complete, errors, start);
       logger.error(e, message);
    }
-
+   
    private static String message(String prefix, int size, int complete, int errors, long start) {
       return String.format("%s, completed: %d/%d, errors: %d, rate: %dms/op", prefix, complete, size, errors,
-               (long) ((System.currentTimeMillis() - start) / ((double) size)));
+            (long) ((System.currentTimeMillis() - start) / ((double) size)));
    }
-
+   
    protected static boolean timeOut(long start, Long maxTime) {
       return maxTime != null ? System.currentTimeMillis() < start + maxTime : false;
    }
-
+   
 }

core/src/main/java/org/jclouds/util/Iterables2.java

@@ -0,0 +1,40 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.util;
+
+import com.google.common.collect.ImmutableSortedSet;
+
+/**
+ * General utilities used in jclouds code for {@link Iterable Iterables}.
+ * 
+ * @author danikov
+ */
+public class Iterables2 {
+
+   /**
+    * Copies the contents of a wildcarded {@link Iterable} into a concrete {@link Iterable} of the left bound
+    * 
+    * @param unboundedValues wildcarded source {@link Iterable}
+    * @return concrete-typed copy of the source
+    */
+   public static <T> Iterable<T> concreteCopy(Iterable<? extends T> unboundedValues) {
+      return ImmutableSortedSet.copyOf(unboundedValues);
+   }
+   
+}

core/src/main/java/org/jclouds/util/Maps2.java

@@ -154,5 +154,15 @@ public class Maps2 {
        }
        return result;
    }
+   
+   /**
+    * Covariant compatible version
+    * 
+    * @see {@link Maps#uniqueIndex(Iterable, Function)}
+    */
+   public static <K, V> ImmutableMap<K, V> uniqueIndex(
+         Iterable<? extends V> values, Function<? super V, ? extends K> keyFunction) {
+      return uniqueIndex(values, keyFunction);
+   }
 
 }

core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java

@@ -43,7 +43,7 @@ public class FutureIterablesTest {
       final AtomicInteger counter = new AtomicInteger();
 
       try {
-         transformParallel(ImmutableSet.of("hello", "goodbye"), new Function<String, Future<String>>() {
+         transformParallel(ImmutableSet.of("hello", "goodbye"), new Function<String, Future<? extends String>>() {
 
             @Override
             public Future<String> apply(String input) {
@@ -63,7 +63,7 @@ public class FutureIterablesTest {
       final AtomicInteger counter = new AtomicInteger();
 
       try {
-         transformParallel(ImmutableSet.of("hello", "goodbye"), new Function<String, Future<String>>() {
+         transformParallel(ImmutableSet.of("hello", "goodbye"), new Function<String, Future<? extends String>>() {
 
             @Override
             public Future<String> apply(String input) {

labs/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBListLoadBalancersStrategy.java

@@ -74,14 +74,14 @@ public class ELBListLoadBalancersStrategy implements ListLoadBalancersStrategy {
    }
 
    @Override
-   public Iterable<? extends LoadBalancerMetadata> listLoadBalancers() {
+   public Iterable<LoadBalancerMetadata> listLoadBalancers() {
       Iterable<? extends LoadBalancer> loadBalancers;
       Set<String> regions = this.regions.get();
       if (regions.size() > 0)
-         loadBalancers = concat(transformParallel(regions, new Function<String, Future<Set<? extends LoadBalancer>>>() {
+         loadBalancers = concat(transformParallel(regions, new Function<String, Future<? extends Set<? extends LoadBalancer>>>() {
 
             @Override
-            public ListenableFuture<Set<? extends LoadBalancer>> apply(String from) {
+            public ListenableFuture<? extends Set<? extends LoadBalancer>> apply(String from) {
                return aclient.describeLoadBalancersInRegion(from);
             }
 

labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java

@@ -62,6 +62,7 @@ import org.jclouds.glesys.options.DestroyServerOptions;
 import org.jclouds.location.predicates.LocationPredicates;
 import org.jclouds.logging.Logger;
 import org.jclouds.predicates.RetryablePredicate;
+import org.jclouds.util.Iterables2;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -196,13 +197,13 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter<Server
 
    @Override
    public Iterable<ServerDetails> listNodes() {
-      return transformParallel(client.getServerClient().listServers(), new Function<Server, Future<ServerDetails>>() {
+      return Iterables2.concreteCopy(transformParallel(client.getServerClient().listServers(), new Function<Server, Future<? extends ServerDetails>>() {
          @Override
          public Future<ServerDetails> apply(Server from) {
             return aclient.getServerClient().getServerDetails(from.getId());
          }
 
-      }, userThreads, null, logger, "server details");
+      }, userThreads, null, logger, "server details"));
    }
 
    @Override

providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ListNodesStrategy.java

@@ -69,12 +69,10 @@ public class AWSEC2ListNodesStrategy extends EC2ListNodesStrategy {
    @Override
    protected Iterable<? extends RunningInstance> pollRunningInstances() {
       Iterable<? extends AWSRunningInstance> spots = filter(transform(concat(transformParallel(regions.get(),
-               new Function<String, Future<Set<SpotInstanceRequest>>>() {
+               new Function<String, Future<? extends Set<SpotInstanceRequest>>>() {
-
-                  @SuppressWarnings("unchecked")
                   @Override
-                  public Future<Set<SpotInstanceRequest>> apply(String from) {
+                  public Future<? extends Set<SpotInstanceRequest>> apply(String from) {
-                     return (Future<Set<SpotInstanceRequest>>) client.getSpotInstanceServices()
+                     return client.getSpotInstanceServices()
                               .describeSpotInstanceRequestsInRegion(from);
                   }