Repository: jclouds Updated Branches: refs/heads/master eb6f16e2f -> 6360023f0
Remove unnecessary static imports Found via error-prone. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6360023f Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6360023f Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6360023f Branch: refs/heads/master Commit: 6360023f09300541717f7a6e7ce1f945e78a384f Parents: eb6f16e Author: Andrew Gaul <[email protected]> Authored: Fri Jan 29 09:04:51 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Fri Jan 29 09:14:55 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/atmos/AtmosClient.java | 10 +++++----- .../jclouds/oauth/v2/AuthorizationApiLiveTest.java | 2 +- .../nova/v2_0/predicates/ServerPredicates.java | 2 +- .../openstack/swift/v1/features/ContainerApi.java | 2 +- .../rackspace/clouddns/v1/features/DomainApi.java | 3 +-- apis/s3/src/main/java/org/jclouds/s3/S3Client.java | 2 +- .../org/jclouds/aws/filters/FormSignerV4LiveTest.java | 4 ++-- project/pom.xml | 1 + .../java/org/jclouds/azureblob/AzureBlobClient.java | 14 +++++++------- .../compute/functions/Resources.java | 2 +- .../googlecomputeengine/features/InstanceApi.java | 4 ++-- .../googlecomputeengine/features/OperationApi.java | 2 +- .../googlecomputeengine/parse/ParseImageTest.java | 2 +- .../parse/ParseInstanceSerialOutputTest.java | 2 +- .../parse/ParseMachineTypeTest.java | 2 +- .../softlayer/config/SoftLayerParserModule.java | 4 ++-- .../org/jclouds/softlayer/features/DatacenterApi.java | 4 ++-- .../jclouds/softlayer/features/VirtualGuestApi.java | 7 +++---- .../VirtualGuestBlockDeviceTemplateGroupApi.java | 4 ++-- .../softlayer/features/VirtualGuestApiLiveTest.java | 2 +- 20 files changed, 37 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java index b4bd698..cda7b3c 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java @@ -17,11 +17,6 @@ package org.jclouds.atmos; import static com.google.common.net.HttpHeaders.EXPECT; -import static org.jclouds.Fallbacks.FalseOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; -import static org.jclouds.blobstore.BlobStoreFallbacks.NullOnKeyAlreadyExists; -import static org.jclouds.blobstore.BlobStoreFallbacks.ThrowContainerNotFoundOn404; -import static org.jclouds.blobstore.BlobStoreFallbacks.ThrowKeyNotFoundOn404; import java.io.Closeable; import java.net.URI; @@ -38,6 +33,8 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.FalseOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.atmos.binders.BindMetadataToHeaders; import org.jclouds.atmos.domain.AtmosObject; import org.jclouds.atmos.domain.BoundedSet; @@ -55,6 +52,9 @@ import org.jclouds.atmos.functions.ParseUserMetadataFromHeaders; import org.jclouds.atmos.functions.ReturnTrueIfGroupACLIsOtherRead; import org.jclouds.atmos.options.ListOptions; import org.jclouds.atmos.options.PutOptions; +import org.jclouds.blobstore.BlobStoreFallbacks.NullOnKeyAlreadyExists; +import org.jclouds.blobstore.BlobStoreFallbacks.ThrowContainerNotFoundOn404; +import org.jclouds.blobstore.BlobStoreFallbacks.ThrowKeyNotFoundOn404; import org.jclouds.http.options.GetOptions; import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.BinderParam; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiLiveTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiLiveTest.java index 5002307..c78277f 100644 --- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiLiveTest.java +++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiLiveTest.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.oauth.v2.OAuthTestUtils.setCredential; import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE; import static org.jclouds.oauth.v2.config.OAuthProperties.JWS_ALG; -import static org.jclouds.oauth.v2.config.OAuthScopes.SingleScope; import static org.jclouds.providers.AnonymousProviderMetadata.forApiOnEndpoint; import static org.testng.Assert.assertNotNull; @@ -29,6 +28,7 @@ import java.util.Properties; import org.jclouds.apis.BaseApiLiveTest; import org.jclouds.oauth.v2.config.OAuthModule; import org.jclouds.oauth.v2.config.OAuthScopes; +import org.jclouds.oauth.v2.config.OAuthScopes.SingleScope; import org.jclouds.oauth.v2.domain.Claims; import org.jclouds.oauth.v2.domain.Token; import org.jclouds.providers.ProviderMetadata; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java index 21c5936..00da77f 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java @@ -18,12 +18,12 @@ package org.jclouds.openstack.nova.v2_0.predicates; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jclouds.openstack.nova.v2_0.domain.Server.Status; import static org.jclouds.openstack.nova.v2_0.domain.Server.Status.ACTIVE; import static org.jclouds.openstack.nova.v2_0.domain.Server.Status.SHUTOFF; import static org.jclouds.util.Predicates2.retry; import org.jclouds.openstack.nova.v2_0.domain.Server; +import org.jclouds.openstack.nova.v2_0.domain.Server.Status; import org.jclouds.openstack.nova.v2_0.features.ServerApi; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java index 4cbac0d..54164d9 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java @@ -17,7 +17,6 @@ package org.jclouds.openstack.swift.v1.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.openstack.swift.v1.SwiftFallbacks.TrueOn404FalseOn409; import java.util.Map; @@ -36,6 +35,7 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; +import org.jclouds.openstack.swift.v1.SwiftFallbacks.TrueOn404FalseOn409; import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders.BindContainerMetadataToHeaders; import org.jclouds.openstack.swift.v1.binders.BindMetadataToHeaders.BindRemoveContainerMetadataToHeaders; import org.jclouds.openstack.swift.v1.domain.Container; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java ---------------------------------------------------------------------- diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java index a4278e1..7634e01 100644 --- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java +++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java @@ -37,6 +37,7 @@ import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.collect.PagedIterable; import org.jclouds.javax.annotation.Nullable; +import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.v2_0.options.PaginationOptions; @@ -70,8 +71,6 @@ import org.jclouds.rest.annotations.Transform; import org.jclouds.rest.annotations.WrapWith; import org.jclouds.rest.binders.BindToJsonPayload; -import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404; - @Endpoint(CloudDNS.class) @RequestFilters(AuthenticateRequest.class) public interface DomainApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/s3/src/main/java/org/jclouds/s3/S3Client.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java index 5cd85a8..fe3caea 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java @@ -18,7 +18,6 @@ package org.jclouds.s3; import static com.google.common.net.HttpHeaders.EXPECT; import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; -import static org.jclouds.s3.S3Fallbacks.TrueOn404OrNotFoundFalseOnIllegalState; import java.io.Closeable; import java.util.Map; @@ -59,6 +58,7 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; import org.jclouds.rest.annotations.VirtualHost; import org.jclouds.rest.annotations.XMLResponseParser; +import org.jclouds.s3.S3Fallbacks.TrueOn404OrNotFoundFalseOnIllegalState; import org.jclouds.s3.binders.BindACLToXMLPayload; import org.jclouds.s3.binders.BindAsHostPrefixIfConfigured; import org.jclouds.s3.binders.BindBucketLoggingToXmlPayload; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java index bd697bd..0cc56ef 100644 --- a/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java +++ b/apis/sts/src/test/java/org/jclouds/aws/filters/FormSignerV4LiveTest.java @@ -17,8 +17,6 @@ package org.jclouds.aws.filters; import static java.util.concurrent.TimeUnit.MINUTES; -import static org.jclouds.aws.filters.FormSignerV4.ServiceAndRegion; -import static org.jclouds.aws.filters.FormSignerV4.ServiceAndRegion.AWSServiceAndRegion; import static org.jclouds.sts.options.SessionCredentialsOptions.Builder.durationSeconds; import static org.testng.Assert.assertEquals; @@ -30,6 +28,8 @@ import javax.inject.Provider; import org.jclouds.apis.BaseApiLiveTest; import org.jclouds.aws.domain.SessionCredentials; +import org.jclouds.aws.filters.FormSignerV4.ServiceAndRegion; +import org.jclouds.aws.filters.FormSignerV4.ServiceAndRegion.AWSServiceAndRegion; import org.jclouds.domain.Credentials; import org.jclouds.http.HttpRequest; import org.jclouds.rest.ApiContext; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 2b12e42..0459c55 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -757,6 +757,7 @@ <compilerArg>-Xep:NullablePrimitive:ERROR</compilerArg> <compilerArg>-Xep:StringEquality:ERROR</compilerArg> <compilerArg>-Xep:TypeParameterUnusedInFormals:OFF</compilerArg> + <compilerArg>-Xep:UnnecessaryStaticImport:ERROR</compilerArg> </compilerArgs> </configuration> <dependencies> http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java index b2fa4f5..a50cf8e 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobClient.java @@ -17,13 +17,6 @@ package org.jclouds.azureblob; import static com.google.common.net.HttpHeaders.EXPECT; -import static org.jclouds.Fallbacks.TrueOnNotFoundOr404; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; -import static org.jclouds.azureblob.AzureBlobFallbacks.FalseIfContainerAlreadyExists; -import static org.jclouds.blobstore.BlobStoreFallbacks.FalseOnContainerNotFound; -import static org.jclouds.blobstore.BlobStoreFallbacks.FalseOnKeyNotFound; -import static org.jclouds.blobstore.BlobStoreFallbacks.NullOnContainerNotFound; -import static org.jclouds.blobstore.BlobStoreFallbacks.NullOnKeyNotFound; import java.io.Closeable; import java.net.URI; @@ -39,10 +32,13 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; +import org.jclouds.Fallbacks.TrueOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.azure.storage.domain.BoundedSet; import org.jclouds.azure.storage.filters.SharedKeyLiteAuthentication; import org.jclouds.azure.storage.options.ListOptions; import org.jclouds.azure.storage.reference.AzureStorageHeaders; +import org.jclouds.azureblob.AzureBlobFallbacks.FalseIfContainerAlreadyExists; import org.jclouds.azureblob.binders.BindAzureBlobMetadataToRequest; import org.jclouds.azureblob.binders.BindAzureBlobMetadataToMultipartRequest; import org.jclouds.azureblob.binders.BindAzureBlocksToRequest; @@ -68,6 +64,10 @@ import org.jclouds.azureblob.predicates.validators.ContainerNameValidator; import org.jclouds.azureblob.xml.AccountNameEnumerationResultsHandler; import org.jclouds.azureblob.xml.BlobBlocksResultsHandler; import org.jclouds.azureblob.xml.ContainerNameEnumerationResultsHandler; +import org.jclouds.blobstore.BlobStoreFallbacks.FalseOnContainerNotFound; +import org.jclouds.blobstore.BlobStoreFallbacks.FalseOnKeyNotFound; +import org.jclouds.blobstore.BlobStoreFallbacks.NullOnContainerNotFound; +import org.jclouds.blobstore.BlobStoreFallbacks.NullOnKeyNotFound; import org.jclouds.blobstore.binders.BindMapToHeadersWithPrefix; import org.jclouds.http.functions.ParseETagHeader; import org.jclouds.http.options.GetOptions; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java index 97c4a3e..3fa832e 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java @@ -17,7 +17,6 @@ package org.jclouds.googlecomputeengine.compute.functions; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import javax.inject.Named; import javax.ws.rs.Consumes; @@ -27,6 +26,7 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import java.net.URI; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.googlecomputeengine.domain.Disk; import org.jclouds.googlecomputeengine.domain.Image; import org.jclouds.googlecomputeengine.domain.Instance; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java index a884558..e0429e0 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java @@ -17,8 +17,6 @@ package org.jclouds.googlecomputeengine.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.googlecomputeengine.domain.Instance.NetworkInterface.AccessConfig; -import static org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput; import java.util.Iterator; @@ -38,7 +36,9 @@ import org.jclouds.googlecloud.domain.ListPage; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; import org.jclouds.googlecomputeengine.domain.AttachDisk; import org.jclouds.googlecomputeengine.domain.Instance; +import org.jclouds.googlecomputeengine.domain.Instance.NetworkInterface.AccessConfig; import org.jclouds.googlecomputeengine.domain.Instance.Scheduling; +import org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput; import org.jclouds.googlecomputeengine.domain.Metadata; import org.jclouds.googlecomputeengine.domain.NewInstance; import org.jclouds.googlecomputeengine.domain.Operation; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java index c6ceb2d..2ec289e 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java @@ -17,7 +17,6 @@ package org.jclouds.googlecomputeengine.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; import java.net.URI; import java.util.Iterator; @@ -32,6 +31,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.googlecloud.config.CurrentProject; import org.jclouds.googlecloud.domain.ListPage; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java index 6306df2..761ae0c 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseImageTest.java @@ -17,7 +17,6 @@ package org.jclouds.googlecomputeengine.parse; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.googlecomputeengine.domain.Image.RawDisk; import java.net.URI; @@ -26,6 +25,7 @@ import javax.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.Deprecated; import org.jclouds.googlecomputeengine.domain.Deprecated.State; import org.jclouds.googlecomputeengine.domain.Image; +import org.jclouds.googlecomputeengine.domain.Image.RawDisk; import org.jclouds.googlecomputeengine.domain.Image.Status; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java index 5b8eca5..448f34b 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseInstanceSerialOutputTest.java @@ -17,12 +17,12 @@ package org.jclouds.googlecomputeengine.parse; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput; import java.net.URI; import javax.ws.rs.Consumes; +import org.jclouds.googlecomputeengine.domain.Instance.SerialPortOutput; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java index 893dcab..942cf1c 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java @@ -17,13 +17,13 @@ package org.jclouds.googlecomputeengine.parse; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.jclouds.googlecomputeengine.domain.MachineType.ScratchDisk; import java.net.URI; import javax.ws.rs.Consumes; import org.jclouds.googlecomputeengine.domain.MachineType; +import org.jclouds.googlecomputeengine.domain.MachineType.ScratchDisk; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java index 6940624..2cb6630 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java @@ -16,8 +16,8 @@ */ package org.jclouds.softlayer.config; -import static org.jclouds.json.config.GsonModule.DateAdapter; -import static org.jclouds.json.config.GsonModule.Iso8601DateAdapter; +import org.jclouds.json.config.GsonModule.DateAdapter; +import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import com.google.inject.AbstractModule; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java index e46f943..646b8e5 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.softlayer.features; -import static org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.Set; import javax.ws.rs.Consumes; @@ -26,6 +24,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.QueryParams; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java index daf626b..2d5ecf3 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java @@ -16,10 +16,6 @@ */ package org.jclouds.softlayer.features; -import static org.jclouds.Fallbacks.FalseOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; -import static org.jclouds.Fallbacks.VoidOnNotFoundOr404; - import java.util.Set; import javax.inject.Named; @@ -32,6 +28,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.FalseOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java index 7b0dd9d..ee2c0ac 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java @@ -16,8 +16,6 @@ */ package org.jclouds.softlayer.features; -import static org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; -import static org.jclouds.Fallbacks.NullOnNotFoundOr404; import java.util.Set; import javax.inject.Named; @@ -27,6 +25,8 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.QueryParams; http://git-wip-us.apache.org/repos/asf/jclouds/blob/6360023f/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java index 37cf750..c35474b 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java @@ -17,7 +17,6 @@ package org.jclouds.softlayer.features; import static com.google.common.base.Preconditions.checkState; -import static org.jclouds.softlayer.compute.strategy.SoftLayerComputeServiceAdapter.VirtualGuestHasLoginDetailsPresent; import static org.jclouds.util.Predicates2.retry; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -27,6 +26,7 @@ import java.util.Properties; import java.util.Set; import org.jclouds.softlayer.SoftLayerApi; +import org.jclouds.softlayer.compute.strategy.SoftLayerComputeServiceAdapter.VirtualGuestHasLoginDetailsPresent; import org.jclouds.softlayer.domain.ContainerVirtualGuestConfiguration; import org.jclouds.softlayer.domain.Datacenter; import org.jclouds.softlayer.domain.OperatingSystem;
