From 8785cc5c7c23f1ef3c369b0c5423a9e1780f6caa Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Tue, 12 Apr 2016 16:31:54 -0700 Subject: [PATCH 1/2] reorder imports --- .../com/google/cloud/bigquery/BigQuery.java | 6 ++--- .../cloud/bigquery/BigQueryException.java | 2 +- .../google/cloud/bigquery/BigQueryImpl.java | 14 +++++------ .../cloud/bigquery/BigQueryOptions.java | 2 +- .../com/google/cloud/bigquery/Option.java | 2 +- .../cloud/bigquery/QueryJobConfiguration.java | 4 ++-- .../google/cloud/bigquery/QueryResult.java | 2 +- .../java/com/google/cloud/bigquery/Table.java | 2 +- .../bigquery/WriteChannelConfiguration.java | 4 ++-- .../bigquery/spi/DefaultBigQueryRpc.java | 5 ++-- .../cloud/bigquery/BigQueryImplTest.java | 10 ++++---- .../bigquery/CopyJobConfigurationTest.java | 2 +- .../google/cloud/bigquery/DatasetTest.java | 4 ++-- .../google/cloud/bigquery/JobInfoTest.java | 4 ++-- .../cloud/bigquery/JobStatisticsTest.java | 2 +- .../bigquery/LoadJobConfigurationTest.java | 2 +- .../bigquery/QueryJobConfigurationTest.java | 4 ++-- .../google/cloud/bigquery/QueryStageTest.java | 2 +- .../cloud/bigquery/SerializationTest.java | 4 ++-- .../com/google/cloud/bigquery/TableTest.java | 6 ++--- .../WriteChannelConfigurationTest.java | 2 +- .../cloud/bigquery/it/ITBigQueryTest.java | 4 ++-- .../com/google/cloud/BaseWriteChannel.java | 1 + .../java/com/google/cloud/ServiceOptions.java | 2 +- .../google/cloud/FieldSelectorHelperTest.java | 2 +- .../com/google/cloud/RetryHelperTest.java | 4 ++-- .../com/google/cloud/SerializationTest.java | 2 +- .../cloud/datastore/DatastoreException.java | 2 +- .../google/cloud/datastore/DatastoreImpl.java | 12 +++++----- .../cloud/datastore/DatastoreOptions.java | 4 ++-- .../com/google/cloud/datastore/GqlQuery.java | 2 +- .../com/google/cloud/datastore/NullValue.java | 1 - .../cloud/datastore/QueryResultsImpl.java | 2 +- .../cloud/datastore/StructuredQuery.java | 2 +- .../cloud/datastore/spi/DatastoreRpc.java | 2 +- .../datastore/spi/DefaultDatastoreRpc.java | 4 ++-- .../testing/LocalDatastoreHelper.java | 2 +- .../cloud/datastore/DatastoreHelperTest.java | 2 +- .../google/cloud/datastore/DatastoreTest.java | 14 +++++------ .../cloud/datastore/StructuredQueryTest.java | 2 +- .../main/java/com/google/cloud/dns/Dns.java | 2 +- .../com/google/cloud/dns/DnsException.java | 2 +- .../java/com/google/cloud/dns/DnsImpl.java | 12 +++++----- .../java/com/google/cloud/dns/DnsOptions.java | 2 +- .../java/com/google/cloud/dns/Option.java | 2 +- .../java/com/google/cloud/dns/spi/DnsRpc.java | 2 +- .../cloud/dns/testing/LocalDnsHelper.java | 2 +- .../com/google/cloud/dns/DnsImplTest.java | 6 ++--- .../google/cloud/dns/SerializationTest.java | 2 +- .../java/com/google/cloud/dns/ZoneTest.java | 2 +- .../com/google/cloud/dns/it/ITDnsTest.java | 2 +- .../cloud/dns/testing/LocalDnsHelperTest.java | 6 ++--- .../examples/bigquery/BigQueryExample.java | 2 +- .../google/cloud/examples/dns/DnsExample.java | 4 ++-- .../ResourceManagerExample.java | 2 +- .../google/cloud/resourcemanager/Option.java | 2 +- .../google/cloud/resourcemanager/Policy.java | 4 ++-- .../resourcemanager/ResourceManager.java | 2 +- .../ResourceManagerException.java | 2 +- .../resourcemanager/ResourceManagerImpl.java | 12 +++++----- .../ResourceManagerOptions.java | 2 +- .../spi/DefaultResourceManagerRpc.java | 6 ++--- .../testing/LocalResourceManagerHelper.java | 4 ++-- .../cloud/resourcemanager/ProjectTest.java | 4 ++-- .../ResourceManagerImplTest.java | 4 ++-- .../resourcemanager/SerializationTest.java | 2 +- .../LocalResourceManagerHelperTest.java | 4 ++-- .../google/cloud/storage/BatchRequest.java | 4 ++-- .../java/com/google/cloud/storage/Blob.java | 4 ++-- .../google/cloud/storage/BlobReadChannel.java | 2 +- .../java/com/google/cloud/storage/Bucket.java | 10 ++++---- .../com/google/cloud/storage/BucketInfo.java | 2 +- .../com/google/cloud/storage/CopyWriter.java | 2 +- .../java/com/google/cloud/storage/Option.java | 2 +- .../com/google/cloud/storage/Storage.java | 6 ++--- .../cloud/storage/StorageException.java | 2 +- .../com/google/cloud/storage/StorageImpl.java | 24 +++++++++---------- .../google/cloud/storage/StorageOptions.java | 2 +- .../cloud/storage/spi/DefaultStorageRpc.java | 6 ++--- .../google/cloud/storage/spi/StorageRpc.java | 2 +- .../cloud/storage/BatchRequestTest.java | 2 +- .../cloud/storage/BatchResponseTest.java | 2 +- .../google/cloud/storage/BlobInfoTest.java | 4 ++-- .../cloud/storage/BlobReadChannelTest.java | 2 +- .../com/google/cloud/storage/BlobTest.java | 4 ++-- .../cloud/storage/BlobWriteChannelTest.java | 2 +- .../google/cloud/storage/BucketInfoTest.java | 2 +- .../com/google/cloud/storage/BucketTest.java | 2 +- .../google/cloud/storage/CopyRequestTest.java | 2 +- .../google/cloud/storage/CopyWriterTest.java | 2 +- .../com/google/cloud/storage/CorsTest.java | 2 +- .../cloud/storage/SerializationTest.java | 2 +- .../google/cloud/storage/StorageImplTest.java | 12 +++++----- .../cloud/storage/it/ITStorageTest.java | 10 ++++---- .../testing/RemoteStorageHelperTest.java | 2 +- 95 files changed, 184 insertions(+), 185 deletions(-) diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java index bbfd45fe999e..90ed343e0e34 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java @@ -18,14 +18,14 @@ import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; import com.google.cloud.Page; import com.google.cloud.Service; import com.google.cloud.bigquery.spi.BigQueryRpc; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import java.util.List; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java index 42223c827bcd..7f314a01b088 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java @@ -16,10 +16,10 @@ package com.google.cloud.bigquery; -import com.google.common.collect.ImmutableSet; import com.google.cloud.BaseServiceException; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.RetryHelper.RetryInterruptedException; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Objects; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java index e269d0599964..62a72647beff 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java @@ -16,19 +16,13 @@ package com.google.cloud.bigquery; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.cloud.RetryHelper.runWithRetries; +import static com.google.common.base.Preconditions.checkArgument; import com.google.api.services.bigquery.model.GetQueryResultsResponse; import com.google.api.services.bigquery.model.TableDataInsertAllRequest; import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows; import com.google.api.services.bigquery.model.TableRow; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.cloud.BaseService; import com.google.cloud.Page; import com.google.cloud.PageImpl; @@ -36,6 +30,12 @@ import com.google.cloud.RetryHelper; import com.google.cloud.bigquery.InsertAllRequest.RowToInsert; import com.google.cloud.bigquery.spi.BigQueryRpc; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import java.util.List; import java.util.Map; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java index b0cc56fa0298..1845755bae67 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java @@ -16,11 +16,11 @@ package com.google.cloud.bigquery; -import com.google.common.collect.ImmutableSet; import com.google.cloud.ServiceOptions; import com.google.cloud.bigquery.spi.BigQueryRpc; import com.google.cloud.bigquery.spi.BigQueryRpcFactory; import com.google.cloud.bigquery.spi.DefaultBigQueryRpc; +import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Option.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Option.java index d2edbbe7b4c5..75108d6dfec5 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Option.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Option.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.MoreObjects; import com.google.cloud.bigquery.spi.BigQueryRpc; +import com.google.common.base.MoreObjects; import java.io.Serializable; import java.util.Objects; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java index 1743b64d0576..4c5034a4a0c8 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java @@ -19,13 +19,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.services.bigquery.model.JobConfigurationQuery; +import com.google.cloud.bigquery.JobInfo.CreateDisposition; +import com.google.cloud.bigquery.JobInfo.WriteDisposition; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.cloud.bigquery.JobInfo.CreateDisposition; -import com.google.cloud.bigquery.JobInfo.WriteDisposition; import java.util.List; import java.util.Map; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java index fb4b15e8d3f0..74a9e5000b0e 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryResult.java @@ -16,9 +16,9 @@ package com.google.cloud.bigquery; +import com.google.cloud.PageImpl; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import com.google.cloud.PageImpl; import java.util.List; import java.util.Objects; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Table.java index cd151063fca5..8fc83b305458 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Table.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/Table.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.collect.ImmutableList; import com.google.cloud.Page; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java index bd5c29f830c1..b7bb9db277a3 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java @@ -19,10 +19,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.services.bigquery.model.JobConfigurationLoad; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableList; import com.google.cloud.bigquery.JobInfo.CreateDisposition; import com.google.cloud.bigquery.JobInfo.WriteDisposition; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableList; import java.io.Serializable; import java.util.List; diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/spi/DefaultBigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/spi/DefaultBigQueryRpc.java index 59cc7730107f..2f02f55c68e7 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/spi/DefaultBigQueryRpc.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/spi/DefaultBigQueryRpc.java @@ -56,13 +56,12 @@ import com.google.api.services.bigquery.model.TableList; import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.TableRow; +import com.google.cloud.bigquery.BigQueryException; +import com.google.cloud.bigquery.BigQueryOptions; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.cloud.bigquery.BigQueryException; -import com.google.cloud.bigquery.BigQueryOptions; - import java.io.IOException; import java.math.BigInteger; import java.util.List; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java index 7cb7b162fd10..4a29697a73dc 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java @@ -31,11 +31,6 @@ import com.google.api.services.bigquery.model.TableDataInsertAllRequest; import com.google.api.services.bigquery.model.TableDataInsertAllResponse; import com.google.api.services.bigquery.model.TableRow; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.cloud.Page; import com.google.cloud.RetryParams; import com.google.cloud.WriteChannel; @@ -43,6 +38,11 @@ import com.google.cloud.bigquery.spi.BigQueryRpc; import com.google.cloud.bigquery.spi.BigQueryRpc.Tuple; import com.google.cloud.bigquery.spi.BigQueryRpcFactory; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.easymock.Capture; import org.easymock.EasyMock; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java index 54d2370b1c57..7d676a9b1505 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.google.common.collect.ImmutableList; import com.google.cloud.bigquery.JobInfo.CreateDisposition; import com.google.cloud.bigquery.JobInfo.WriteDisposition; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java index 747c8ae4f0dc..7693e9900131 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java @@ -30,10 +30,10 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import com.google.cloud.Page; import com.google.cloud.PageImpl; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import org.junit.After; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java index 16fe980fe171..e6cd2987fbd7 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java @@ -21,13 +21,13 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.bigquery.JobInfo.CreateDisposition; import com.google.cloud.bigquery.JobInfo.WriteDisposition; import com.google.cloud.bigquery.JobStatistics.ExtractStatistics; import com.google.cloud.bigquery.JobStatistics.LoadStatistics; import com.google.cloud.bigquery.JobStatistics.QueryStatistics; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java index 0dc5fea0b1d7..9fbe43f3903f 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java @@ -18,11 +18,11 @@ import static org.junit.Assert.assertEquals; -import com.google.common.collect.ImmutableList; import com.google.cloud.bigquery.JobStatistics.ExtractStatistics; import com.google.cloud.bigquery.JobStatistics.LoadStatistics; import com.google.cloud.bigquery.JobStatistics.QueryStatistics; import com.google.cloud.bigquery.QueryStage.QueryStep; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java index d811f7d1b569..9980f85426d8 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java @@ -18,9 +18,9 @@ import static org.junit.Assert.assertEquals; -import com.google.common.collect.ImmutableList; import com.google.cloud.bigquery.JobInfo.CreateDisposition; import com.google.cloud.bigquery.JobInfo.WriteDisposition; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java index 6ad2facb3288..914a6db4d5eb 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.bigquery.JobInfo.CreateDisposition; import com.google.cloud.bigquery.JobInfo.WriteDisposition; import com.google.cloud.bigquery.QueryJobConfiguration.Priority; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java index 0270abe7efd1..670143190cf5 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import com.google.api.services.bigquery.model.ExplainQueryStep; -import com.google.common.collect.ImmutableList; import com.google.cloud.bigquery.QueryStage.QueryStep; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java index 9797a5a5139e..7aabcea120e9 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java @@ -16,12 +16,12 @@ package com.google.cloud.bigquery; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.AuthCredentials; import com.google.cloud.BaseSerializationTest; import com.google.cloud.Restorable; import com.google.cloud.bigquery.StandardTableDefinition.StreamingBuffer; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import java.io.Serializable; import java.nio.charset.StandardCharsets; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java index 58f187c1cedd..c74fc8e244bc 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java @@ -28,12 +28,12 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterators; import com.google.cloud.Page; import com.google.cloud.PageImpl; import com.google.cloud.bigquery.InsertAllRequest.RowToInsert; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterators; import org.junit.After; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java index 03ffbcaf38e3..ffe1e58dc19e 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.common.collect.ImmutableList; import com.google.cloud.bigquery.JobInfo.CreateDisposition; import com.google.cloud.bigquery.JobInfo.WriteDisposition; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 738245bc80f7..9e462a4d5142 100644 --- a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -23,8 +23,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.Page; import com.google.cloud.WriteChannel; import com.google.cloud.bigquery.BigQuery; @@ -68,6 +66,8 @@ import com.google.cloud.storage.BucketInfo; import com.google.cloud.storage.Storage; import com.google.cloud.storage.testing.RemoteStorageHelper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/gcloud-java-core/src/main/java/com/google/cloud/BaseWriteChannel.java b/gcloud-java-core/src/main/java/com/google/cloud/BaseWriteChannel.java index f803cd6bbacf..038ef8c362de 100644 --- a/gcloud-java-core/src/main/java/com/google/cloud/BaseWriteChannel.java +++ b/gcloud-java-core/src/main/java/com/google/cloud/BaseWriteChannel.java @@ -16,6 +16,7 @@ package com.google.cloud; +import com.google.cloud.BaseWriteChannel.BaseState; import com.google.common.base.MoreObjects; import java.io.IOException; diff --git a/gcloud-java-core/src/main/java/com/google/cloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/cloud/ServiceOptions.java index e08d0cd9d155..194f61b45c42 100644 --- a/gcloud-java-core/src/main/java/com/google/cloud/ServiceOptions.java +++ b/gcloud-java-core/src/main/java/com/google/cloud/ServiceOptions.java @@ -26,9 +26,9 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; import com.google.auth.http.HttpCredentialsAdapter; +import com.google.cloud.spi.ServiceRpcFactory; import com.google.common.collect.Iterables; import com.google.common.io.Files; -import com.google.cloud.spi.ServiceRpcFactory; import org.json.JSONException; import org.json.JSONObject; diff --git a/gcloud-java-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java b/gcloud-java-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java index 6cdc4bdfb924..9aa892c7b0b0 100644 --- a/gcloud-java-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java +++ b/gcloud-java-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; import com.google.cloud.FieldSelector.Helper; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-core/src/test/java/com/google/cloud/RetryHelperTest.java b/gcloud-java-core/src/test/java/com/google/cloud/RetryHelperTest.java index 7012813be2d0..3887cecd6a83 100644 --- a/gcloud-java-core/src/test/java/com/google/cloud/RetryHelperTest.java +++ b/gcloud-java-core/src/test/java/com/google/cloud/RetryHelperTest.java @@ -22,10 +22,10 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.base.Stopwatch; -import com.google.common.base.Ticker; import com.google.cloud.RetryHelper.NonRetriableException; import com.google.cloud.RetryHelper.RetriesExhaustedException; +import com.google.common.base.Stopwatch; +import com.google.common.base.Ticker; import org.junit.Test; diff --git a/gcloud-java-core/src/test/java/com/google/cloud/SerializationTest.java b/gcloud-java-core/src/test/java/com/google/cloud/SerializationTest.java index 72d622239f3c..75347b250227 100644 --- a/gcloud-java-core/src/test/java/com/google/cloud/SerializationTest.java +++ b/gcloud-java-core/src/test/java/com/google/cloud/SerializationTest.java @@ -16,8 +16,8 @@ package com.google.cloud; -import com.google.common.collect.ImmutableList; import com.google.cloud.ServiceAccountSigner.SigningException; +import com.google.common.collect.ImmutableList; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java index c097980aec29..419cffc7bf3e 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java @@ -16,10 +16,10 @@ package com.google.cloud.datastore; -import com.google.common.collect.ImmutableSet; import com.google.cloud.BaseServiceException; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.RetryHelper.RetryInterruptedException; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Set; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java index a05c4229f291..2aa0638bfa7c 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java @@ -16,6 +16,12 @@ package com.google.cloud.datastore; +import com.google.cloud.BaseService; +import com.google.cloud.RetryHelper; +import com.google.cloud.RetryHelper.RetryHelperException; +import com.google.cloud.RetryParams; +import com.google.cloud.datastore.ReadOption.EventualConsistency; +import com.google.cloud.datastore.spi.DatastoreRpc; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.AbstractIterator; @@ -23,12 +29,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.datastore.v1beta3.ReadOptions.ReadConsistency; -import com.google.cloud.BaseService; -import com.google.cloud.RetryHelper; -import com.google.cloud.RetryHelper.RetryHelperException; -import com.google.cloud.RetryParams; -import com.google.cloud.datastore.ReadOption.EventualConsistency; -import com.google.cloud.datastore.spi.DatastoreRpc; import com.google.protobuf.ByteString; import java.util.ArrayList; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java index a9466939060a..d456af51bde1 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java @@ -18,12 +18,12 @@ import static com.google.cloud.datastore.Validator.validateNamespace; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableSet; import com.google.cloud.ServiceOptions; import com.google.cloud.datastore.spi.DatastoreRpc; import com.google.cloud.datastore.spi.DatastoreRpcFactory; import com.google.cloud.datastore.spi.DefaultDatastoreRpc; +import com.google.common.base.MoreObjects; +import com.google.common.collect.ImmutableSet; import java.lang.reflect.Method; import java.util.Objects; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java index 7a34bf4b1f19..2af3559f6899 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java @@ -16,8 +16,8 @@ package com.google.cloud.datastore; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.cloud.datastore.Validator.validateNamespace; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java index 8b7ab9bfa49b..4721e572215f 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/NullValue.java @@ -17,7 +17,6 @@ package com.google.cloud.datastore; import static com.google.common.base.Preconditions.checkArgument; - import static com.google.datastore.v1beta3.Value.NULL_VALUE_FIELD_NUMBER; public final class NullValue extends Value { diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java index b46f9821cc52..f049ef9edde2 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java @@ -16,10 +16,10 @@ package com.google.cloud.datastore; +import com.google.cloud.datastore.Query.ResultType; import com.google.common.base.Preconditions; import com.google.common.collect.AbstractIterator; import com.google.datastore.v1beta3.QueryResultBatch.MoreResultsType; -import com.google.cloud.datastore.Query.ResultType; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java index 9028ba6e536f..442df20c8027 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java @@ -16,7 +16,6 @@ package com.google.cloud.datastore; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.cloud.datastore.BlobValue.of; import static com.google.cloud.datastore.BooleanValue.of; import static com.google.cloud.datastore.DateTimeValue.of; @@ -24,6 +23,7 @@ import static com.google.cloud.datastore.KeyValue.of; import static com.google.cloud.datastore.LongValue.of; import static com.google.cloud.datastore.StringValue.of; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java index dc3e9ce27249..d7d8aae673ba 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpc.java @@ -16,6 +16,7 @@ package com.google.cloud.datastore.spi; +import com.google.cloud.datastore.DatastoreException; import com.google.datastore.v1beta3.AllocateIdsRequest; import com.google.datastore.v1beta3.AllocateIdsResponse; import com.google.datastore.v1beta3.BeginTransactionRequest; @@ -28,7 +29,6 @@ import com.google.datastore.v1beta3.RollbackResponse; import com.google.datastore.v1beta3.RunQueryRequest; import com.google.datastore.v1beta3.RunQueryResponse; -import com.google.cloud.datastore.DatastoreException; /** * Provides access to the remote Datastore service. diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java index 04d8c4cc8dd4..255da4c6e229 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java @@ -16,6 +16,8 @@ package com.google.cloud.datastore.spi; +import com.google.cloud.datastore.DatastoreException; +import com.google.cloud.datastore.DatastoreOptions; import com.google.datastore.v1beta3.AllocateIdsRequest; import com.google.datastore.v1beta3.AllocateIdsResponse; import com.google.datastore.v1beta3.BeginTransactionRequest; @@ -28,8 +30,6 @@ import com.google.datastore.v1beta3.RollbackResponse; import com.google.datastore.v1beta3.RunQueryRequest; import com.google.datastore.v1beta3.RunQueryResponse; -import com.google.cloud.datastore.DatastoreException; -import com.google.cloud.datastore.DatastoreOptions; import java.io.IOException; import java.net.InetAddress; diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 9d04ddbf930e..4da7e0d27e75 100644 --- a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -19,10 +19,10 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Strings; import com.google.cloud.AuthCredentials; import com.google.cloud.RetryParams; import com.google.cloud.datastore.DatastoreOptions; +import com.google.common.base.Strings; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java index 7f32de7b947b..2538a75847bd 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java @@ -27,9 +27,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.cloud.datastore.Datastore.TransactionCallable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; -import com.google.cloud.datastore.Datastore.TransactionCallable; import org.easymock.EasyMock; import org.junit.Test; diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java index cd028067ca83..d73d6964e064 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java @@ -25,6 +25,13 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.cloud.RetryParams; +import com.google.cloud.datastore.Query.ResultType; +import com.google.cloud.datastore.StructuredQuery.OrderBy; +import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.cloud.datastore.spi.DatastoreRpc; +import com.google.cloud.datastore.spi.DatastoreRpcFactory; +import com.google.cloud.datastore.testing.LocalDatastoreHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; @@ -37,13 +44,6 @@ import com.google.datastore.v1beta3.ReadOptions.ReadConsistency; import com.google.datastore.v1beta3.RunQueryRequest; import com.google.datastore.v1beta3.RunQueryResponse; -import com.google.cloud.RetryParams; -import com.google.cloud.datastore.Query.ResultType; -import com.google.cloud.datastore.StructuredQuery.OrderBy; -import com.google.cloud.datastore.StructuredQuery.PropertyFilter; -import com.google.cloud.datastore.spi.DatastoreRpc; -import com.google.cloud.datastore.spi.DatastoreRpcFactory; -import com.google.cloud.datastore.testing.LocalDatastoreHelper; import com.google.protobuf.ByteString; import org.easymock.EasyMock; diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java index 7f5bbdd74e82..cc2ec78e06a1 100644 --- a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java +++ b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java @@ -20,12 +20,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; import com.google.cloud.datastore.Query.ResultType; import com.google.cloud.datastore.StructuredQuery.CompositeFilter; import com.google.cloud.datastore.StructuredQuery.Filter; import com.google.cloud.datastore.StructuredQuery.OrderBy; import com.google.cloud.datastore.StructuredQuery.PropertyFilter; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/Dns.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/Dns.java index f7c1aef0a02c..2aa080fb63d3 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/Dns.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/Dns.java @@ -16,12 +16,12 @@ package com.google.cloud.dns; -import com.google.common.collect.ImmutableList; import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; import com.google.cloud.Page; import com.google.cloud.Service; import com.google.cloud.dns.spi.DnsRpc; +import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsException.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsException.java index 8da76625cead..1e1e34b833a5 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsException.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsException.java @@ -16,10 +16,10 @@ package com.google.cloud.dns; -import com.google.common.collect.ImmutableSet; import com.google.cloud.BaseServiceException; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.RetryHelper.RetryInterruptedException; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Set; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java index 785face46173..cdb311adc823 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsImpl.java @@ -16,23 +16,23 @@ package com.google.cloud.dns; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.cloud.RetryHelper.runWithRetries; +import static com.google.common.base.Preconditions.checkArgument; import com.google.api.services.dns.model.Change; import com.google.api.services.dns.model.ManagedZone; import com.google.api.services.dns.model.Project; import com.google.api.services.dns.model.ResourceRecordSet; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import com.google.cloud.BaseService; import com.google.cloud.Page; import com.google.cloud.PageImpl; import com.google.cloud.RetryHelper; import com.google.cloud.dns.spi.DnsRpc; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import java.util.Map; import java.util.concurrent.Callable; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsOptions.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsOptions.java index 059f7b212044..6d37a7af5694 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsOptions.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsOptions.java @@ -16,11 +16,11 @@ package com.google.cloud.dns; -import com.google.common.collect.ImmutableSet; import com.google.cloud.ServiceOptions; import com.google.cloud.dns.spi.DefaultDnsRpc; import com.google.cloud.dns.spi.DnsRpc; import com.google.cloud.dns.spi.DnsRpcFactory; +import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/Option.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/Option.java index b0e23220549c..7a1f9955be05 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/Option.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/Option.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.MoreObjects; import com.google.cloud.dns.spi.DnsRpc; +import com.google.common.base.MoreObjects; import java.io.Serializable; import java.util.Objects; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DnsRpc.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DnsRpc.java index 57d6b45ba3a5..ba74f14f0527 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DnsRpc.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/spi/DnsRpc.java @@ -20,8 +20,8 @@ import com.google.api.services.dns.model.ManagedZone; import com.google.api.services.dns.model.Project; import com.google.api.services.dns.model.ResourceRecordSet; -import com.google.common.collect.ImmutableList; import com.google.cloud.dns.DnsException; +import com.google.common.collect.ImmutableList; import java.util.Map; diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/testing/LocalDnsHelper.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/testing/LocalDnsHelper.java index 46d116bdf640..1f35193409ee 100644 --- a/gcloud-java-dns/src/main/java/com/google/cloud/dns/testing/LocalDnsHelper.java +++ b/gcloud-java-dns/src/main/java/com/google/cloud/dns/testing/LocalDnsHelper.java @@ -27,6 +27,7 @@ import com.google.api.services.dns.model.Project; import com.google.api.services.dns.model.Quota; import com.google.api.services.dns.model.ResourceRecordSet; +import com.google.cloud.dns.DnsOptions; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -36,7 +37,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.ByteStreams; -import com.google.cloud.dns.DnsOptions; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java index fe3b08f8625b..457f5ed3adb3 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java @@ -22,14 +22,14 @@ import com.google.api.services.dns.model.Change; import com.google.api.services.dns.model.ManagedZone; import com.google.api.services.dns.model.ResourceRecordSet; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import com.google.cloud.Page; import com.google.cloud.RetryParams; import com.google.cloud.ServiceOptions; import com.google.cloud.dns.spi.DnsRpc; import com.google.cloud.dns.spi.DnsRpcFactory; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import org.easymock.Capture; import org.easymock.EasyMock; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/SerializationTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/SerializationTest.java index 32b1bbbd0667..e510850f62ab 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/SerializationTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/SerializationTest.java @@ -16,11 +16,11 @@ package com.google.cloud.dns; -import com.google.common.collect.ImmutableList; import com.google.cloud.AuthCredentials; import com.google.cloud.BaseSerializationTest; import com.google.cloud.Restorable; import com.google.cloud.RetryParams; +import com.google.common.collect.ImmutableList; import java.io.Serializable; import java.math.BigInteger; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/ZoneTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/ZoneTest.java index fc23316a899b..e1f6c8917647 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/ZoneTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/ZoneTest.java @@ -30,8 +30,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableList; import com.google.cloud.Page; +import com.google.common.collect.ImmutableList; import org.junit.After; import org.junit.Before; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java index 2d6ce2e45457..dd8eafa775cd 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableList; import com.google.cloud.Page; import com.google.cloud.dns.ChangeRequest; import com.google.cloud.dns.ChangeRequestInfo; @@ -34,6 +33,7 @@ import com.google.cloud.dns.RecordSet; import com.google.cloud.dns.Zone; import com.google.cloud.dns.ZoneInfo; +import com.google.common.collect.ImmutableList; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java index 2231d2f08974..fce958d3a126 100644 --- a/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java +++ b/gcloud-java-dns/src/test/java/com/google/cloud/dns/testing/LocalDnsHelperTest.java @@ -27,13 +27,13 @@ import com.google.api.services.dns.model.ManagedZone; import com.google.api.services.dns.model.Project; import com.google.api.services.dns.model.ResourceRecordSet; +import com.google.cloud.dns.DnsException; +import com.google.cloud.dns.spi.DefaultDnsRpc; +import com.google.cloud.dns.spi.DnsRpc; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import com.google.cloud.dns.DnsException; -import com.google.cloud.dns.spi.DefaultDnsRpc; -import com.google.cloud.dns.spi.DnsRpc; import org.junit.AfterClass; import org.junit.Before; diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java index b0a7680cf2b9..5b15bbd6ec71 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java @@ -16,7 +16,6 @@ package com.google.cloud.examples.bigquery; -import com.google.common.collect.ImmutableMap; import com.google.cloud.WriteChannel; import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQueryError; @@ -44,6 +43,7 @@ import com.google.cloud.bigquery.ViewDefinition; import com.google.cloud.bigquery.WriteChannelConfiguration; import com.google.cloud.bigquery.spi.BigQueryRpc.Tuple; +import com.google.common.collect.ImmutableMap; import java.nio.channels.FileChannel; import java.nio.file.Paths; diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java index 44ded7ae0dc0..88b4b984e4c5 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java @@ -16,8 +16,6 @@ package com.google.cloud.examples.dns; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; import com.google.cloud.dns.ChangeRequest; import com.google.cloud.dns.ChangeRequestInfo; import com.google.cloud.dns.Dns; @@ -26,6 +24,8 @@ import com.google.cloud.dns.RecordSet; import com.google.cloud.dns.Zone; import com.google.cloud.dns.ZoneInfo; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java index 9b9e7aaa8ac8..1d688c414575 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java @@ -16,11 +16,11 @@ package com.google.cloud.examples.resourcemanager; -import com.google.common.base.Joiner; import com.google.cloud.resourcemanager.Project; import com.google.cloud.resourcemanager.ProjectInfo; import com.google.cloud.resourcemanager.ResourceManager; import com.google.cloud.resourcemanager.ResourceManagerOptions; +import com.google.common.base.Joiner; import java.util.Arrays; import java.util.HashMap; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java index fb81d77a88ff..ae53ad7004b4 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.MoreObjects; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc; +import com.google.common.base.MoreObjects; import java.io.Serializable; import java.util.Objects; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Policy.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Policy.java index 6f150086a7e3..41238fd9b9aa 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Policy.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Policy.java @@ -16,12 +16,12 @@ package com.google.cloud.resourcemanager; +import com.google.cloud.IamPolicy; +import com.google.cloud.Identity; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.cloud.IamPolicy; -import com.google.cloud.Identity; import java.util.ArrayList; import java.util.HashMap; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java index 93425464872f..38925278a484 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java @@ -16,13 +16,13 @@ package com.google.cloud.resourcemanager; -import com.google.common.collect.ImmutableList; import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; import com.google.cloud.IamPolicy; import com.google.cloud.Page; import com.google.cloud.Service; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc; +import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java index 026845d0734c..1df014e450ee 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java @@ -16,10 +16,10 @@ package com.google.cloud.resourcemanager; -import com.google.common.collect.ImmutableSet; import com.google.cloud.BaseServiceException; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.RetryHelper.RetryInterruptedException; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Set; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java index 2ee4dc4e9e22..4054a4b2443a 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java @@ -16,14 +16,9 @@ package com.google.cloud.resourcemanager; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.cloud.RetryHelper.runWithRetries; +import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import com.google.cloud.BaseService; import com.google.cloud.Page; import com.google.cloud.PageImpl; @@ -31,6 +26,11 @@ import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Tuple; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import java.util.List; import java.util.Map; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java index 8f5c79e8bc3f..d37dfd298aa0 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java @@ -16,11 +16,11 @@ package com.google.cloud.resourcemanager; -import com.google.common.collect.ImmutableSet; import com.google.cloud.ServiceOptions; import com.google.cloud.resourcemanager.spi.DefaultResourceManagerRpc; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc; import com.google.cloud.resourcemanager.spi.ResourceManagerRpcFactory; +import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java index 536328b5aa60..427478baef5f 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/DefaultResourceManagerRpc.java @@ -1,10 +1,10 @@ package com.google.cloud.resourcemanager.spi; -import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Option.FIELDS; import static com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Option.FILTER; import static com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_SIZE; import static com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_TOKEN; +import static com.google.common.base.MoreObjects.firstNonNull; import static java.net.HttpURLConnection.HTTP_FORBIDDEN; import static java.net.HttpURLConnection.HTTP_NOT_FOUND; @@ -19,10 +19,10 @@ import com.google.api.services.cloudresourcemanager.model.SetIamPolicyRequest; import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsRequest; import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsResponse; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.cloud.resourcemanager.ResourceManagerException; import com.google.cloud.resourcemanager.ResourceManagerOptions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.List; diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java index 614a7ec63ecf..6c16372c0424 100644 --- a/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java +++ b/gcloud-java-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java @@ -11,14 +11,14 @@ import com.google.api.services.cloudresourcemanager.model.SetIamPolicyRequest; import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsRequest; import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsResponse; +import com.google.cloud.AuthCredentials; +import com.google.cloud.resourcemanager.ResourceManagerOptions; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteStreams; -import com.google.cloud.AuthCredentials; -import com.google.cloud.resourcemanager.ResourceManagerOptions; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java index 58920e5fec12..a40336ae665e 100644 --- a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java +++ b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java @@ -25,11 +25,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.Identity; import com.google.cloud.resourcemanager.Policy.ProjectRole; import com.google.cloud.resourcemanager.ProjectInfo.ResourceId; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.After; import org.junit.Before; diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java index 910478af0888..92bf6fd96223 100644 --- a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java +++ b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java @@ -25,8 +25,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.Identity; import com.google.cloud.Page; import com.google.cloud.resourcemanager.Policy.ProjectRole; @@ -37,6 +35,8 @@ import com.google.cloud.resourcemanager.spi.ResourceManagerRpc; import com.google.cloud.resourcemanager.spi.ResourceManagerRpcFactory; import com.google.cloud.resourcemanager.testing.LocalResourceManagerHelper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.easymock.EasyMock; import org.junit.AfterClass; diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java index b09f81b60997..52d8c9692a88 100644 --- a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java +++ b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java @@ -16,12 +16,12 @@ package com.google.cloud.resourcemanager; -import com.google.common.collect.ImmutableMap; import com.google.cloud.BaseSerializationTest; import com.google.cloud.Identity; import com.google.cloud.PageImpl; import com.google.cloud.Restorable; import com.google.cloud.resourcemanager.Policy.ProjectRole; +import com.google.common.collect.ImmutableMap; import java.io.Serializable; import java.util.Collections; diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java index 7a23383b3d89..cf65b4981bfc 100644 --- a/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java +++ b/gcloud-java-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java @@ -9,12 +9,12 @@ import static org.junit.Assert.fail; import com.google.api.services.cloudresourcemanager.model.Binding; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.resourcemanager.ResourceManagerException; import com.google.cloud.resourcemanager.spi.DefaultResourceManagerRpc; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc; import com.google.cloud.resourcemanager.spi.ResourceManagerRpc.Tuple; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.AfterClass; import org.junit.Before; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/BatchRequest.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/BatchRequest.java index f98160b91b18..05dfe8e2a1dc 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/BatchRequest.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/BatchRequest.java @@ -16,11 +16,11 @@ package com.google.cloud.storage; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import com.google.cloud.storage.Storage.BlobGetOption; import com.google.cloud.storage.Storage.BlobSourceOption; import com.google.cloud.storage.Storage.BlobTargetOption; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Blob.java index df5ab959ad30..1adea4f549bd 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Blob.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Blob.java @@ -16,12 +16,11 @@ package com.google.cloud.storage; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.cloud.storage.Blob.BlobSourceOption.toGetOptions; import static com.google.cloud.storage.Blob.BlobSourceOption.toSourceOptions; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.services.storage.model.StorageObject; -import com.google.common.base.Function; import com.google.cloud.AuthCredentials; import com.google.cloud.AuthCredentials.AppEngineAuthCredentials; import com.google.cloud.AuthCredentials.ServiceAccountAuthCredentials; @@ -35,6 +34,7 @@ import com.google.cloud.storage.Storage.SignUrlOption; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.Tuple; +import com.google.common.base.Function; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java index 1c15a9cd4e54..49ceb99a5792 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java @@ -19,12 +19,12 @@ import static com.google.cloud.RetryHelper.runWithRetries; import com.google.api.services.storage.model.StorageObject; -import com.google.common.base.MoreObjects; import com.google.cloud.ReadChannel; import com.google.cloud.RestorableState; import com.google.cloud.RetryHelper; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.Tuple; +import com.google.common.base.MoreObjects; import java.io.IOException; import java.io.Serializable; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Bucket.java index 04337e6a77b1..989ea87ec9d3 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -16,18 +16,18 @@ package com.google.cloud.storage; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.cloud.storage.Bucket.BucketSourceOption.toGetOptions; import static com.google.cloud.storage.Bucket.BucketSourceOption.toSourceOptions; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import com.google.cloud.Page; import com.google.cloud.storage.Storage.BlobGetOption; import com.google.cloud.storage.Storage.BucketTargetOption; import com.google.cloud.storage.spi.StorageRpc; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import java.io.IOException; import java.io.InputStream; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/BucketInfo.java index 88ff6095f762..1dcd110808a9 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/BucketInfo.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/BucketInfo.java @@ -30,10 +30,10 @@ import com.google.api.services.storage.model.Bucket.Website; import com.google.api.services.storage.model.BucketAccessControl; import com.google.api.services.storage.model.ObjectAccessControl; +import com.google.cloud.storage.Acl.Entity; import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import com.google.cloud.storage.Acl.Entity; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/CopyWriter.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/CopyWriter.java index 5d3289e71861..9e674052f877 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/CopyWriter.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/CopyWriter.java @@ -18,13 +18,13 @@ import static com.google.cloud.RetryHelper.runWithRetries; -import com.google.common.base.MoreObjects; import com.google.cloud.Restorable; import com.google.cloud.RestorableState; import com.google.cloud.RetryHelper; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.RewriteRequest; import com.google.cloud.storage.spi.StorageRpc.RewriteResponse; +import com.google.common.base.MoreObjects; import java.io.Serializable; import java.util.Map; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Option.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Option.java index ca1077d7c595..e15d53a2d591 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Option.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Option.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.MoreObjects; import com.google.cloud.storage.spi.StorageRpc; +import com.google.common.base.MoreObjects; import java.io.Serializable; import java.util.Objects; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Storage.java index e59e465095d6..e15a3ad0077c 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -19,9 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.cloud.AuthCredentials; import com.google.cloud.AuthCredentials.AppEngineAuthCredentials; import com.google.cloud.AuthCredentials.ServiceAccountAuthCredentials; @@ -35,6 +32,9 @@ import com.google.cloud.WriteChannel; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.Tuple; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import java.io.InputStream; import java.io.Serializable; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java index 2b1aa24e13af..d6333c5c24e3 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java @@ -17,10 +17,10 @@ package com.google.cloud.storage; import com.google.api.client.googleapis.json.GoogleJsonError; -import com.google.common.collect.ImmutableSet; import com.google.cloud.BaseServiceException; import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.RetryHelper.RetryInterruptedException; +import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Set; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageImpl.java index 6d0be9ed01fc..f4769905d8bc 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageImpl.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageImpl.java @@ -16,9 +16,6 @@ package com.google.cloud.storage; -import static com.google.common.base.MoreObjects.firstNonNull; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkState; import static com.google.cloud.RetryHelper.runWithRetries; import static com.google.cloud.storage.spi.StorageRpc.Option.DELIMITER; import static com.google.cloud.storage.spi.StorageRpc.Option.IF_GENERATION_MATCH; @@ -29,18 +26,12 @@ import static com.google.cloud.storage.spi.StorageRpc.Option.IF_SOURCE_GENERATION_NOT_MATCH; import static com.google.cloud.storage.spi.StorageRpc.Option.IF_SOURCE_METAGENERATION_MATCH; import static com.google.cloud.storage.spi.StorageRpc.Option.IF_SOURCE_METAGENERATION_NOT_MATCH; +import static com.google.common.base.MoreObjects.firstNonNull; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.api.services.storage.model.StorageObject; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.hash.Hashing; -import com.google.common.io.BaseEncoding; -import com.google.common.primitives.Ints; import com.google.cloud.BaseService; import com.google.cloud.Page; import com.google.cloud.PageImpl; @@ -51,6 +42,15 @@ import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.RewriteResponse; import com.google.cloud.storage.spi.StorageRpc.Tuple; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.hash.Hashing; +import com.google.common.io.BaseEncoding; +import com.google.common.primitives.Ints; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageOptions.java index 15e5791a6b91..5eeed5c88a69 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageOptions.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageOptions.java @@ -16,11 +16,11 @@ package com.google.cloud.storage; -import com.google.common.collect.ImmutableSet; import com.google.cloud.ServiceOptions; import com.google.cloud.storage.spi.DefaultStorageRpc; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpcFactory; +import com.google.common.collect.ImmutableSet; import java.util.Set; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/DefaultStorageRpc.java index 37c81ff6ff0b..4ef9afc45e4c 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/DefaultStorageRpc.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/DefaultStorageRpc.java @@ -14,7 +14,6 @@ package com.google.cloud.storage.spi; -import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.cloud.storage.spi.StorageRpc.Option.DELIMITER; import static com.google.cloud.storage.spi.StorageRpc.Option.FIELDS; import static com.google.cloud.storage.spi.StorageRpc.Option.IF_GENERATION_MATCH; @@ -31,6 +30,7 @@ import static com.google.cloud.storage.spi.StorageRpc.Option.PREDEFINED_DEFAULT_OBJECT_ACL; import static com.google.cloud.storage.spi.StorageRpc.Option.PREFIX; import static com.google.cloud.storage.spi.StorageRpc.Option.VERSIONS; +import static com.google.common.base.MoreObjects.firstNonNull; import static java.net.HttpURLConnection.HTTP_NOT_FOUND; import static javax.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE; @@ -58,13 +58,13 @@ import com.google.api.services.storage.model.ComposeRequest.SourceObjects.ObjectPreconditions; import com.google.api.services.storage.model.Objects; import com.google.api.services.storage.model.StorageObject; +import com.google.cloud.storage.StorageException; +import com.google.cloud.storage.StorageOptions; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.cloud.storage.StorageException; -import com.google.cloud.storage.StorageOptions; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/StorageRpc.java index 2f84f221e13d..13dddb7d6737 100644 --- a/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/StorageRpc.java +++ b/gcloud-java-storage/src/main/java/com/google/cloud/storage/spi/StorageRpc.java @@ -20,9 +20,9 @@ import com.google.api.services.storage.model.Bucket; import com.google.api.services.storage.model.StorageObject; +import com.google.cloud.storage.StorageException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.cloud.storage.StorageException; import java.io.InputStream; import java.util.List; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchRequestTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchRequestTest.java index fbea9283ed50..a47c7c140216 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchRequestTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchRequestTest.java @@ -22,10 +22,10 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import com.google.common.collect.Iterables; import com.google.cloud.storage.Storage.BlobGetOption; import com.google.cloud.storage.Storage.BlobSourceOption; import com.google.cloud.storage.Storage.BlobTargetOption; +import com.google.common.collect.Iterables; import org.junit.Test; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchResponseTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchResponseTest.java index 6344d4649fab..a9177489c2fd 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchResponseTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BatchResponseTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import com.google.common.collect.ImmutableList; import com.google.cloud.storage.BatchResponse.Result; +import com.google.common.collect.ImmutableList; import org.easymock.EasyMock; import org.junit.Before; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java index 4e2f27265ef9..03d28f8e988e 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java @@ -25,10 +25,10 @@ import static org.junit.Assert.assertTrue; import com.google.api.services.storage.model.StorageObject; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.storage.Acl.Project; import com.google.cloud.storage.Acl.User; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.junit.Test; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java index 89f888ec4147..a108e5f167ce 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java @@ -26,12 +26,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableMap; import com.google.cloud.ReadChannel; import com.google.cloud.RestorableState; import com.google.cloud.RetryParams; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpcFactory; +import com.google.common.collect.ImmutableMap; import org.junit.After; import org.junit.Before; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobTest.java index 5af12e8d411d..14cd6970fa87 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobTest.java @@ -33,12 +33,12 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.cloud.ReadChannel; import com.google.cloud.storage.Acl.Project; import com.google.cloud.storage.Acl.User; import com.google.cloud.storage.Storage.CopyRequest; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.easymock.Capture; import org.junit.After; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java index 549211930e3e..27d55d8b686c 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java @@ -30,12 +30,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableMap; import com.google.cloud.RestorableState; import com.google.cloud.RetryParams; import com.google.cloud.WriteChannel; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpcFactory; +import com.google.common.collect.ImmutableMap; import org.easymock.Capture; import org.easymock.CaptureType; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java index 59dd2ea632bc..bcb4259ad564 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue; import com.google.api.services.storage.model.Bucket.Lifecycle.Rule; -import com.google.common.collect.ImmutableList; import com.google.cloud.storage.Acl.Project; import com.google.cloud.storage.Acl.Role; import com.google.cloud.storage.Acl.User; @@ -32,6 +31,7 @@ import com.google.cloud.storage.BucketInfo.IsLiveDeleteRule; import com.google.cloud.storage.BucketInfo.NumNewerVersionsDeleteRule; import com.google.cloud.storage.BucketInfo.RawDeleteRule; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketTest.java index b0f3f7ac9d0c..0494dfcdf506 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/BucketTest.java @@ -30,7 +30,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; import com.google.cloud.Page; import com.google.cloud.PageImpl; import com.google.cloud.storage.Acl.Project; @@ -38,6 +37,7 @@ import com.google.cloud.storage.BatchResponse.Result; import com.google.cloud.storage.BucketInfo.AgeDeleteRule; import com.google.cloud.storage.BucketInfo.DeleteRule; +import com.google.common.collect.ImmutableList; import org.easymock.Capture; import org.junit.After; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java index d3e93d9b8f66..0649566864a1 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; import com.google.cloud.storage.Storage.BlobSourceOption; import com.google.cloud.storage.Storage.BlobTargetOption; +import com.google.common.collect.ImmutableList; import org.junit.Rule; import org.junit.Test; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java index 13467283c013..5f5b9102c195 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java @@ -24,13 +24,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableMap; import com.google.cloud.RestorableState; import com.google.cloud.RetryParams; import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.RewriteRequest; import com.google.cloud.storage.spi.StorageRpc.RewriteResponse; import com.google.cloud.storage.spi.StorageRpcFactory; +import com.google.common.collect.ImmutableMap; import org.easymock.EasyMock; import org.junit.After; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/CorsTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/CorsTest.java index e16ea98b30b0..b22547a34e54 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/CorsTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/CorsTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertEquals; -import com.google.common.collect.ImmutableList; import com.google.cloud.storage.Cors.Origin; +import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/SerializationTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/SerializationTest.java index 581a517a1ee6..a8d399e1b1e4 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/SerializationTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/SerializationTest.java @@ -16,7 +16,6 @@ package com.google.cloud.storage; -import com.google.common.collect.ImmutableMap; import com.google.cloud.AuthCredentials; import com.google.cloud.BaseSerializationTest; import com.google.cloud.PageImpl; @@ -24,6 +23,7 @@ import com.google.cloud.Restorable; import com.google.cloud.storage.Acl.Project.ProjectRole; import com.google.cloud.storage.spi.StorageRpc; +import com.google.common.collect.ImmutableMap; import java.io.Serializable; import java.util.Collections; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java index a122383080b8..208988a74668 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java @@ -25,12 +25,6 @@ import static org.junit.Assert.assertTrue; import com.google.api.services.storage.model.StorageObject; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import com.google.common.io.BaseEncoding; import com.google.cloud.AuthCredentials.ServiceAccountAuthCredentials; import com.google.cloud.Page; import com.google.cloud.ReadChannel; @@ -41,6 +35,12 @@ import com.google.cloud.storage.spi.StorageRpc; import com.google.cloud.storage.spi.StorageRpc.Tuple; import com.google.cloud.storage.spi.StorageRpcFactory; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; +import com.google.common.io.BaseEncoding; import org.easymock.Capture; import org.easymock.EasyMock; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index a505597b7b21..684653390d1b 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -25,11 +25,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; import com.google.cloud.Page; import com.google.cloud.ReadChannel; import com.google.cloud.RestorableState; @@ -48,6 +43,11 @@ import com.google.cloud.storage.Storage.BucketField; import com.google.cloud.storage.StorageException; import com.google.cloud.storage.testing.RemoteStorageHelper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java index b817ac2fc101..3c29ca223c23 100644 --- a/gcloud-java-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java +++ b/gcloud-java-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableList; import com.google.cloud.Page; import com.google.cloud.storage.Blob; import com.google.cloud.storage.BlobId; @@ -28,6 +27,7 @@ import com.google.cloud.storage.Storage.BlobListOption; import com.google.cloud.storage.StorageException; import com.google.cloud.storage.StorageOptions; +import com.google.common.collect.ImmutableList; import org.easymock.EasyMock; import org.junit.Before; From 81278d68431a33f65a973e108f7914b3511fd097 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Tue, 12 Apr 2016 16:34:46 -0700 Subject: [PATCH 2/2] fix remaining checkstyle issues --- .../src/main/java/com/google/cloud/bigquery/QueryStage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java index c88175279a3d..b9cfb804b1ac 100644 --- a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java +++ b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java @@ -373,8 +373,9 @@ public String toString() { @Override public int hashCode() { - return Objects.hash(computeRatioAvg, computeRatioMax, generatedId, name, readRatioAvg, readRatioMax, - recordsRead, recordsWritten, steps, waitRatioAvg, waitRatioMax, writeRatioAvg); + return Objects.hash(computeRatioAvg, computeRatioMax, generatedId, name, readRatioAvg, + readRatioMax, recordsRead, recordsWritten, steps, waitRatioAvg, waitRatioMax, + writeRatioAvg); } @Override