Skip to content

Commit 89bc2cd

Browse files
carl-mastrangelocarl-mastrangelo
authored
all: update to latest import ordering
1 parent 0428556 commit 89bc2cd

File tree

324 files changed

+491
-1146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+491
-1146
lines changed

‎auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import com.google.auth.Credentials;
3535
import com.google.common.base.Preconditions;
36-
3736
import io.grpc.CallOptions;
3837
import io.grpc.Channel;
3938
import io.grpc.ClientCall;
@@ -43,7 +42,6 @@
4342
import io.grpc.MethodDescriptor;
4443
import io.grpc.Status;
4544
import io.grpc.StatusException;
46-
4745
import java.io.IOException;
4846
import java.net.URI;
4947
import java.net.URISyntaxException;

‎auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,12 @@
3636
import com.google.auth.Credentials;
3737
import com.google.common.annotations.VisibleForTesting;
3838
import com.google.common.io.BaseEncoding;
39-
4039
import io.grpc.Attributes;
41-
import io.grpc.CallCredentials.MetadataApplier;
4240
import io.grpc.CallCredentials;
4341
import io.grpc.Metadata;
4442
import io.grpc.MethodDescriptor;
4543
import io.grpc.Status;
4644
import io.grpc.StatusException;
47-
4845
import java.lang.reflect.Constructor;
4946
import java.lang.reflect.Method;
5047
import java.net.URI;

‎auth/src/main/java/io/grpc/auth/MoreCallCredentials.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
package io.grpc.auth;
3333

3434
import com.google.auth.Credentials;
35-
3635
import io.grpc.CallCredentials;
3736
import io.grpc.ExperimentalApi;
3837

‎auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,17 @@
4848
import com.google.common.collect.ListMultimap;
4949
import com.google.common.collect.Multimaps;
5050
import com.google.common.util.concurrent.MoreExecutors;
51-
5251
import io.grpc.CallOptions;
5352
import io.grpc.Channel;
5453
import io.grpc.ClientCall;
5554
import io.grpc.Metadata;
5655
import io.grpc.MethodDescriptor;
5756
import io.grpc.MethodDescriptor.Marshaller;
5857
import io.grpc.Status;
59-
58+
import java.io.IOException;
59+
import java.net.URI;
60+
import java.util.Date;
61+
import java.util.concurrent.Executor;
6062
import org.junit.Assert;
6163
import org.junit.Before;
6264
import org.junit.Test;
@@ -67,11 +69,6 @@
6769
import org.mockito.Mockito;
6870
import org.mockito.MockitoAnnotations;
6971

70-
import java.io.IOException;
71-
import java.net.URI;
72-
import java.util.Date;
73-
import java.util.concurrent.Executor;
74-
7572
/**
7673
* Tests for {@link ClientAuthInterceptor}.
7774
*/

‎auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,22 @@
5151
import com.google.common.collect.LinkedListMultimap;
5252
import com.google.common.collect.ListMultimap;
5353
import com.google.common.collect.Multimaps;
54-
5554
import io.grpc.Attributes;
56-
import io.grpc.CallCredentials.MetadataApplier;
5755
import io.grpc.CallCredentials;
56+
import io.grpc.CallCredentials.MetadataApplier;
5857
import io.grpc.Metadata;
5958
import io.grpc.MethodDescriptor;
6059
import io.grpc.SecurityLevel;
6160
import io.grpc.Status;
62-
61+
import java.io.IOException;
62+
import java.net.URI;
63+
import java.security.KeyPair;
64+
import java.security.KeyPairGenerator;
65+
import java.util.ArrayList;
66+
import java.util.Arrays;
67+
import java.util.Date;
68+
import java.util.List;
69+
import java.util.concurrent.Executor;
6370
import org.junit.Before;
6471
import org.junit.Test;
6572
import org.junit.runner.RunWith;
@@ -71,16 +78,6 @@
7178
import org.mockito.invocation.InvocationOnMock;
7279
import org.mockito.stubbing.Answer;
7380

74-
import java.io.IOException;
75-
import java.net.URI;
76-
import java.security.KeyPair;
77-
import java.security.KeyPairGenerator;
78-
import java.util.ArrayList;
79-
import java.util.Arrays;
80-
import java.util.Date;
81-
import java.util.List;
82-
import java.util.concurrent.Executor;
83-
8481
/**
8582
* Tests for {@link GoogleAuthLibraryCallCredentials}.
8683
*/

‎benchmarks/src/jmh/java/io/grpc/DecompressorRegistryBenchmark.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333

3434
import static io.grpc.DecompressorRegistry.ACCEPT_ENCODING_JOINER;
3535

36+
import java.io.IOException;
37+
import java.io.InputStream;
38+
import java.util.UUID;
39+
import java.util.concurrent.TimeUnit;
3640
import org.openjdk.jmh.annotations.Benchmark;
3741
import org.openjdk.jmh.annotations.BenchmarkMode;
3842
import org.openjdk.jmh.annotations.Mode;
@@ -42,11 +46,6 @@
4246
import org.openjdk.jmh.annotations.Setup;
4347
import org.openjdk.jmh.annotations.State;
4448

45-
import java.io.IOException;
46-
import java.io.InputStream;
47-
import java.util.UUID;
48-
import java.util.concurrent.TimeUnit;
49-
5049
/**
5150
* Decomressor Registry encoding benchmark.
5251
*/

‎benchmarks/src/jmh/java/io/grpc/StatusBenchmark.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@
3131

3232
package io.grpc;
3333

34+
import java.nio.charset.Charset;
35+
import java.util.concurrent.TimeUnit;
3436
import org.openjdk.jmh.annotations.Benchmark;
3537
import org.openjdk.jmh.annotations.BenchmarkMode;
3638
import org.openjdk.jmh.annotations.Mode;
3739
import org.openjdk.jmh.annotations.OutputTimeUnit;
3840
import org.openjdk.jmh.annotations.Scope;
3941
import org.openjdk.jmh.annotations.State;
4042

41-
import java.nio.charset.Charset;
42-
import java.util.concurrent.TimeUnit;
43-
4443
/** StatusBenchmark. */
4544
@State(Scope.Benchmark)
4645
public class StatusBenchmark {

‎benchmarks/src/jmh/java/io/grpc/benchmarks/CallOptionsBenchmark.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232
package io.grpc.benchmarks;
3333

3434
import io.grpc.CallOptions;
35-
35+
import java.util.ArrayList;
36+
import java.util.Collections;
37+
import java.util.List;
38+
import java.util.Random;
39+
import java.util.concurrent.TimeUnit;
3640
import org.openjdk.jmh.annotations.Benchmark;
3741
import org.openjdk.jmh.annotations.BenchmarkMode;
3842
import org.openjdk.jmh.annotations.Mode;
@@ -42,12 +46,6 @@
4246
import org.openjdk.jmh.annotations.Setup;
4347
import org.openjdk.jmh.annotations.State;
4448

45-
import java.util.ArrayList;
46-
import java.util.Collections;
47-
import java.util.List;
48-
import java.util.Random;
49-
import java.util.concurrent.TimeUnit;
50-
5149
/**
5250
* Call options benchmark.
5351
*/

‎benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import static io.grpc.benchmarks.Utils.pickUnusedPort;
3535

3636
import com.google.protobuf.ByteString;
37-
3837
import io.grpc.ManagedChannel;
3938
import io.grpc.Server;
4039
import io.grpc.benchmarks.proto.BenchmarkServiceGrpc;
@@ -56,7 +55,8 @@
5655
import io.netty.channel.local.LocalAddress;
5756
import io.netty.channel.local.LocalChannel;
5857
import io.netty.channel.local.LocalServerChannel;
59-
58+
import java.net.InetSocketAddress;
59+
import java.util.concurrent.TimeUnit;
6060
import org.openjdk.jmh.annotations.Benchmark;
6161
import org.openjdk.jmh.annotations.BenchmarkMode;
6262
import org.openjdk.jmh.annotations.Mode;
@@ -67,9 +67,6 @@
6767
import org.openjdk.jmh.annotations.State;
6868
import org.openjdk.jmh.annotations.TearDown;
6969

70-
import java.net.InetSocketAddress;
71-
import java.util.concurrent.TimeUnit;
72-
7370
/** Some text. */
7471
@State(Scope.Benchmark)
7572
public class TransportBenchmark {

‎benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import io.netty.channel.local.LocalServerChannel;
5757
import io.netty.channel.nio.NioEventLoopGroup;
5858
import io.netty.util.concurrent.DefaultThreadFactory;
59-
6059
import java.net.InetAddress;
6160
import java.net.InetSocketAddress;
6261
import java.net.NetworkInterface;

0 commit comments

Comments
 (0)