mirror of https://github.com/apache/jclouds.git
Fix GuiceAssistedInjectScoping error-prone warning
This commit is contained in:
parent
8cd2b92a0e
commit
489850d7db
|
@ -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);
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue