Repository: jclouds Updated Branches: refs/heads/master 8cd2b92a0 -> 489850d7d
Fix GuiceAssistedInjectScoping error-prone warning Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/489850d7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/489850d7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/489850d7 Branch: refs/heads/master Commit: 489850d7db58552a1181672111c035ebd116cc4d Parents: 8cd2b92 Author: Andrew Gaul <[email protected]> Authored: Tue Nov 5 16:25:42 2013 -0800 Committer: Andrew Gaul <[email protected]> Committed: Sun Oct 12 15:47:30 2014 -0700 ---------------------------------------------------------------------- .../cloudstack/functions/StaticNATVirtualMachineInNetwork.java | 2 -- .../v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java | 2 -- .../suppliers/RegionIdToAdminURIFromAccessForTypeAndVersion.java | 2 -- .../v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersion.java | 2 -- .../v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersion.java | 2 -- .../v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java | 2 -- .../cloudidentity/v1_1/suppliers/V1DefaultRegionIdSupplier.java | 2 -- .../functions/URIFromAuthenticationResponseForService.java | 2 -- .../v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java | 2 -- .../keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java | 2 -- .../LocationIdToURIFromConfigurationOrDefaultToProvider.java | 2 -- .../java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java | 2 -- 12 files changed, 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java index 87fc128..f5ad170 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; import org.jclouds.cloudstack.CloudStackApi; import org.jclouds.cloudstack.domain.Network; @@ -33,7 +32,6 @@ import org.jclouds.logging.Logger; import com.google.common.base.Function; import com.google.inject.assistedinject.Assisted; -@Singleton public class StaticNATVirtualMachineInNetwork implements Function<VirtualMachine, PublicIPAddress> { public interface Factory { StaticNATVirtualMachineInNetwork create(Network in); http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java index b03e285..063f4a6 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/LocationIdToURIFromAccessForTypeAndVersion.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.NoSuchElementException; import javax.annotation.Resource; -import javax.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; @@ -52,7 +51,6 @@ import com.google.common.collect.Multimap; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -@Singleton public class LocationIdToURIFromAccessForTypeAndVersion implements Supplier<Map<String, Supplier<URI>>> { public interface Factory { http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersion.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersion.java index debd179..bd794d2 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURIFromAccessForTypeAndVersion.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.keystone.v2_0.suppliers; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.domain.Access; @@ -27,7 +26,6 @@ import org.jclouds.openstack.keystone.v2_0.functions.EndpointToSupplierAdminURI; import com.google.common.base.Supplier; import com.google.inject.assistedinject.Assisted; -@Singleton public class RegionIdToAdminURIFromAccessForTypeAndVersion extends LocationIdToURIFromAccessForTypeAndVersion implements RegionIdToAdminURISupplier { @Inject http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersion.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersion.java index 4344684..aff2814 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToURIFromAccessForTypeAndVersion.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.keystone.v2_0.suppliers; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.RegionIdToURISupplier; @@ -28,7 +27,6 @@ import org.jclouds.openstack.keystone.v2_0.functions.EndpointToSupplierURI; import com.google.common.base.Supplier; import com.google.inject.assistedinject.Assisted; -@Singleton public class RegionIdToURIFromAccessForTypeAndVersion extends LocationIdToURIFromAccessForTypeAndVersion implements RegionIdToURISupplier { http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersion.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersion.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersion.java index 51a2a6c..41f936b 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersion.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/ZoneIdToURIFromAccessForTypeAndVersion.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.keystone.v2_0.suppliers; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.ZoneIdToURISupplier; @@ -28,7 +27,6 @@ import org.jclouds.openstack.keystone.v2_0.functions.EndpointToSupplierURI; import com.google.common.base.Supplier; import com.google.inject.assistedinject.Assisted; -@Singleton public class ZoneIdToURIFromAccessForTypeAndVersion extends LocationIdToURIFromAccessForTypeAndVersion implements ZoneIdToURISupplier { http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java index 15b655f..8263883 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.Map; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.RegionIdToURISupplier; @@ -34,7 +33,6 @@ import com.google.common.base.Supplier; import com.google.common.collect.Maps; import com.google.inject.assistedinject.Assisted; -@Singleton public class RegionIdToURIFromAuthForServiceSupplier implements RegionIdToURISupplier { private final Supplier<Auth> auth; http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/V1DefaultRegionIdSupplier.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/V1DefaultRegionIdSupplier.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/V1DefaultRegionIdSupplier.java index 5ea0c48..7e94f8a 100644 --- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/V1DefaultRegionIdSupplier.java +++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/suppliers/V1DefaultRegionIdSupplier.java @@ -21,7 +21,6 @@ import static com.google.common.collect.Iterables.tryFind; import java.util.NoSuchElementException; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.location.suppliers.ImplicitRegionIdSupplier; import org.jclouds.rackspace.cloudidentity.v1_1.domain.Auth; @@ -34,7 +33,6 @@ import com.google.common.base.Supplier; import com.google.common.collect.Iterables; import com.google.inject.assistedinject.Assisted; -@Singleton public class V1DefaultRegionIdSupplier implements ImplicitRegionIdSupplier { public interface Factory { http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java b/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java index 1ab2cf0..887c7ce 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/functions/URIFromAuthenticationResponseForService.java @@ -19,14 +19,12 @@ package org.jclouds.openstack.functions; import java.net.URI; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.openstack.domain.AuthenticationResponse; import com.google.common.base.Supplier; import com.google.inject.assistedinject.Assisted; -@Singleton public class URIFromAuthenticationResponseForService implements Supplier<URI> { public interface Factory { URIFromAuthenticationResponseForService create(String service); http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java index 2c2ac8e..61e8477 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/RegionIdToURIFromAuthForServiceSupplier.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.Map; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.suppliers.RegionIdToURISupplier; @@ -34,7 +33,6 @@ import com.google.common.base.Supplier; import com.google.common.collect.Maps; import com.google.inject.assistedinject.Assisted; -@Singleton public class RegionIdToURIFromAuthForServiceSupplier implements RegionIdToURISupplier { private final Supplier<Auth> auth; http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java ---------------------------------------------------------------------- diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java index a9e8b77..f448191 100644 --- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java +++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/suppliers/V1DefaultRegionIdSupplier.java @@ -21,7 +21,6 @@ import static com.google.common.collect.Iterables.tryFind; import java.util.NoSuchElementException; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.location.suppliers.ImplicitRegionIdSupplier; import org.jclouds.openstack.keystone.v1_1.domain.Auth; @@ -34,7 +33,6 @@ import com.google.common.base.Supplier; import com.google.common.collect.Iterables; import com.google.inject.assistedinject.Assisted; -@Singleton public class V1DefaultRegionIdSupplier implements ImplicitRegionIdSupplier { public interface Factory { http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java index 9aeab6e..9f2195a 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToURIFromConfigurationOrDefaultToProvider.java @@ -24,7 +24,6 @@ import java.util.Set; import javax.annotation.Resource; import javax.inject.Inject; -import javax.inject.Singleton; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.location.Provider; @@ -36,7 +35,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.inject.assistedinject.Assisted; -@Singleton public class LocationIdToURIFromConfigurationOrDefaultToProvider implements Supplier<Map<String, Supplier<URI>>> { @Resource http://git-wip-us.apache.org/repos/asf/jclouds/blob/489850d7/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java index b9046f3..49d25e2 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java @@ -26,7 +26,6 @@ import java.util.concurrent.Callable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.compute.reference.ComputeServiceConstants; @@ -42,7 +41,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.ImmutableMap.Builder; import com.google.inject.assistedinject.Assisted; -@Singleton public class CallForImages implements Callable<Iterable<Image>> { public interface Factory { CallForImages parseImagesFromRegionsUsingFilter(Iterable<String> regions, Multimap<String, String> filter);
