diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java index 10989febfa..b40ac86755 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.Iterables.all; import static com.google.common.collect.Iterables.transform; import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING; +import static org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverridingCredentials.overrideDefaultCredentialsWithOptionsIfPresent; import static org.jclouds.ec2.compute.util.EC2ComputeUtils.getZoneFromLocationOrNull; import java.util.Map; @@ -39,7 +40,6 @@ import org.jclouds.compute.config.CustomizationResponse; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; -import static org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverridingCredentials.*; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java index 24376d88cb..c1ef8e2967 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java @@ -18,6 +18,7 @@ */ package org.jclouds.ec2.xml; +import static com.google.common.collect.Iterables.get; import static org.testng.Assert.assertEquals; import java.io.InputStream; @@ -41,7 +42,6 @@ import org.testng.annotations.Test; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSet; -import static com.google.common.collect.Iterables.*; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java index 17a542df1d..0c011fea83 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/internal/BaseAuthenticator.java @@ -19,13 +19,15 @@ package org.jclouds.openstack.keystone.v2_0.functions.internal; import static com.google.common.base.Preconditions.checkState; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.REQUIRES_TENANT; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.TENANT_ID; +import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.TENANT_NAME; import javax.annotation.PostConstruct; import javax.annotation.Resource; import org.jclouds.domain.Credentials; import org.jclouds.logging.Logger; -import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.*; import org.jclouds.openstack.keystone.v2_0.domain.Access; import com.google.common.base.Function; diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java index f51e7caa15..e0241d652d 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/ParallelMultipartUploadStrategy.java @@ -25,7 +25,16 @@ import javax.inject.Named; import java.util.Map; import java.util.Queue; import java.util.SortedMap; -import java.util.concurrent.*; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java index ad85ab9544..caa2173e27 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/functions/VAppToNodeMetadata.java @@ -20,6 +20,7 @@ package org.jclouds.vcloud.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Predicates.not; +import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.Iterables.filter; import static org.jclouds.compute.util.ComputeServiceUtils.addMetadataAndParseTagsFromCommaDelimitedValue; import static org.jclouds.vcloud.compute.util.VCloudComputeUtils.getCredentialsFrom; @@ -45,7 +46,6 @@ import org.jclouds.vcloud.domain.VApp; import com.google.common.base.Function; import com.google.common.base.Splitter; -import static com.google.common.base.Strings.*; /** * @author Adrian Cole diff --git a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java index 5c585f16e5..a895eb56ea 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java +++ b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java @@ -22,7 +22,8 @@ import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.not; import static com.google.common.base.Throwables.getStackTraceAsString; import static com.google.common.collect.Iterables.filter; -import static com.google.common.collect.Maps.*; +import static com.google.common.collect.Maps.filterKeys; +import static com.google.common.collect.Maps.filterValues; import static org.jclouds.scriptbuilder.domain.Statements.pipeHttpResponseToBash; import java.net.URI; diff --git a/core/src/main/java/org/jclouds/ContextBuilder.java b/core/src/main/java/org/jclouds/ContextBuilder.java index 5227623428..16d9dbba7c 100644 --- a/core/src/main/java/org/jclouds/ContextBuilder.java +++ b/core/src/main/java/org/jclouds/ContextBuilder.java @@ -30,7 +30,14 @@ import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Lists.newArrayList; -import static org.jclouds.Constants.*; +import static org.jclouds.Constants.PROPERTY_API; +import static org.jclouds.Constants.PROPERTY_API_VERSION; +import static org.jclouds.Constants.PROPERTY_BUILD_VERSION; +import static org.jclouds.Constants.PROPERTY_CREDENTIAL; +import static org.jclouds.Constants.PROPERTY_ENDPOINT; +import static org.jclouds.Constants.PROPERTY_IDENTITY; +import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; +import static org.jclouds.Constants.PROPERTY_PROVIDER; import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalException; import java.util.List; diff --git a/core/src/main/java/org/jclouds/annotations/Name.java b/core/src/main/java/org/jclouds/annotations/Name.java index a622ad20a7..cebfab7984 100644 --- a/core/src/main/java/org/jclouds/annotations/Name.java +++ b/core/src/main/java/org/jclouds/annotations/Name.java @@ -22,7 +22,10 @@ import javax.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/labs/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java b/labs/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java index 3857ab4146..b7c3af6769 100644 --- a/labs/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java +++ b/labs/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java @@ -18,7 +18,8 @@ */ package org.jclouds.elb.domain; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgsForLocations.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgsForLocations.java index 334c9c5ba8..a6d9f99f24 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgsForLocations.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgsForLocations.java @@ -18,6 +18,8 @@ */ package org.jclouds.vcloud.director.v1_5.functions; +import static com.google.common.collect.FluentIterable.from; + import javax.inject.Inject; import javax.inject.Singleton; @@ -27,7 +29,6 @@ import org.jclouds.vcloud.director.v1_5.domain.org.Org; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi; import com.google.common.base.Function; -import static com.google.common.collect.FluentIterable.*; /** * @author danikov, Adrian Cole diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java index dba7d41b05..a3049cae36 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java @@ -36,7 +36,16 @@ import java.util.concurrent.TimeUnit; import org.jclouds.compute.internal.BaseComputeServiceContextLiveTest; import org.jclouds.domain.Credentials; import org.jclouds.domain.LoginCredentials; -import org.jclouds.gogrid.domain.*; +import org.jclouds.gogrid.domain.Ip; +import org.jclouds.gogrid.domain.IpPortPair; +import org.jclouds.gogrid.domain.Job; +import org.jclouds.gogrid.domain.LoadBalancer; +import org.jclouds.gogrid.domain.LoadBalancerPersistenceType; +import org.jclouds.gogrid.domain.LoadBalancerType; +import org.jclouds.gogrid.domain.PowerCommand; +import org.jclouds.gogrid.domain.Server; +import org.jclouds.gogrid.domain.ServerImage; +import org.jclouds.gogrid.domain.ServerImageType; import org.jclouds.gogrid.options.AddLoadBalancerOptions; import org.jclouds.gogrid.options.AddServerOptions; import org.jclouds.gogrid.options.GetImageListOptions; diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml index e85c2ec089..9891069849 100644 --- a/resources/checkstyle.xml +++ b/resources/checkstyle.xml @@ -8,6 +8,7 @@ +