diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java index 04725642fd..51b4dbb4c5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java @@ -26,7 +26,9 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Predicates.and; import static com.google.common.collect.Iterables.filter; -import static org.jclouds.cloudstack.predicates.NetworkPredicates.*; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.defaultNetworkInZone; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.isIsolatedNetwork; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsStaticNAT; /** * Convert template options into DeployVirtualMachineOptions, when the target zone has advanced networking. diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java index f481fdf03a..100b2f410a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java @@ -23,8 +23,23 @@ import org.testng.collections.Maps; import java.util.Map; -import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.*; -import static org.testng.Assert.*; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.account; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.dataDiskSize; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.diskOfferingId; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.domainId; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.generateKeyPair; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.generateSecurityGroup; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.ipOnDefaultNetwork; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.ipsToNetworks; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.keyPair; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.networks; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.securityGroupId; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.securityGroupIds; +import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.setupStaticNat; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; /** * Tests possible uses of {@code CloudStackTemplateOptions} and diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java index 24d356e69f..1d837fe41f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java @@ -37,7 +37,9 @@ import java.util.Map; import java.util.Set; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Strings.emptyToNull; /** diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobNameTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobNameTest.java index 513a791ef7..594b41bb08 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobNameTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobNameTest.java @@ -18,8 +18,6 @@ package org.jclouds.blobstore.functions; import static org.testng.Assert.assertEquals; -import java.io.File; - import org.jclouds.ContextBuilder; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.Blob.Factory; diff --git a/compute/src/test/java/org/jclouds/compute/options/TemplateOptionsTest.java b/compute/src/test/java/org/jclouds/compute/options/TemplateOptionsTest.java index 6ee941ae8f..f48bc52738 100644 --- a/compute/src/test/java/org/jclouds/compute/options/TemplateOptionsTest.java +++ b/compute/src/test/java/org/jclouds/compute/options/TemplateOptionsTest.java @@ -22,7 +22,13 @@ import org.testng.annotations.Test; import java.io.IOException; import java.util.Set; -import static org.jclouds.compute.options.TemplateOptions.Builder.*; +import static org.jclouds.compute.options.TemplateOptions.Builder.authorizePublicKey; +import static org.jclouds.compute.options.TemplateOptions.Builder.blockOnPort; +import static org.jclouds.compute.options.TemplateOptions.Builder.blockUntilRunning; +import static org.jclouds.compute.options.TemplateOptions.Builder.inboundPorts; +import static org.jclouds.compute.options.TemplateOptions.Builder.installPrivateKey; +import static org.jclouds.compute.options.TemplateOptions.Builder.networks; +import static org.jclouds.compute.options.TemplateOptions.Builder.nodeNames; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java index 9c7640328b..1859f6c329 100644 --- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java @@ -46,7 +46,6 @@ import javax.net.ssl.SSLContext; import org.jclouds.Constants; import org.jclouds.JcloudsVersion; -import org.jclouds.http.HttpCommandExecutorService; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpUtils; diff --git a/core/src/test/java/org/jclouds/http/BackoffLimitedRetryJavaTest.java b/core/src/test/java/org/jclouds/http/BackoffLimitedRetryJavaTest.java index d46adecbbe..fb6cce9a32 100644 --- a/core/src/test/java/org/jclouds/http/BackoffLimitedRetryJavaTest.java +++ b/core/src/test/java/org/jclouds/http/BackoffLimitedRetryJavaTest.java @@ -24,7 +24,6 @@ import static org.testng.Assert.fail; import java.util.Properties; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; -import org.jclouds.http.handlers.BackoffLimitedRetryHandler; import org.testng.annotations.Test; import com.google.inject.Module; diff --git a/core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java b/core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java index dbd3fcfcc8..4b9ef1c032 100644 --- a/core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java +++ b/core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java @@ -212,8 +212,8 @@ public abstract class BaseHttpCommandExecutorServiceIntegrationTest extends Base public void testGetStringRedirect() throws Exception { MockWebServer redirectTarget = mockWebServer(new MockResponse().setBody(XML2)); redirectTarget.useHttps(sslContext.getSocketFactory(), false); - MockWebServer server = mockWebServer((new MockResponse().setResponseCode(302).setHeader("Location", - redirectTarget.getUrl("/").toString()))); + MockWebServer server = mockWebServer(new MockResponse().setResponseCode(302).setHeader("Location", + redirectTarget.getUrl("/").toString())); IntegrationTestClient client = client(server.getUrl("/").toString()); try { String result = client.download("redirect"); diff --git a/core/src/test/java/org/jclouds/http/BaseMockWebServerTest.java b/core/src/test/java/org/jclouds/http/BaseMockWebServerTest.java index 6340da2118..02e16d3f7a 100644 --- a/core/src/test/java/org/jclouds/http/BaseMockWebServerTest.java +++ b/core/src/test/java/org/jclouds/http/BaseMockWebServerTest.java @@ -29,7 +29,6 @@ import java.util.Properties; import javax.net.ssl.SSLContext; import org.jclouds.ContextBuilder; -import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.providers.AnonymousProviderMetadata; import org.testng.annotations.BeforeClass; diff --git a/core/src/test/java/org/jclouds/json/JsonTest.java b/core/src/test/java/org/jclouds/json/JsonTest.java index 1ced96c088..3dd5584c52 100644 --- a/core/src/test/java/org/jclouds/json/JsonTest.java +++ b/core/src/test/java/org/jclouds/json/JsonTest.java @@ -30,7 +30,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.gson.FieldAttributes; import com.google.inject.AbstractModule; import com.google.inject.Guice;