mirror of https://github.com/grpc/grpc-java.git
Remove dependency on guava Lists for initializing list.
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=83808289
This commit is contained in:
parent
3a29c98d40
commit
828f941e99
|
|
@ -35,8 +35,8 @@ import com.google.common.base.MoreObjects;
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.google.common.base.Throwables;
|
import com.google.common.base.Throwables;
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
|
|
@ -194,7 +194,7 @@ public final class Status {
|
||||||
replaced.getCode().name() + " & " + code.name());
|
replaced.getCode().name() + " & " + code.name());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
STATUS_LIST = Lists.newArrayList(canonicalizer.values());
|
STATUS_LIST = new ArrayList<Status>(canonicalizer.values());
|
||||||
}
|
}
|
||||||
|
|
||||||
// A pseudo-enum of Status instances mapped 1:1 with values in Code. This simplifies construction
|
// A pseudo-enum of Status instances mapped 1:1 with values in Code. This simplifies construction
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@
|
||||||
|
|
||||||
package com.google.net.stubby.testing.integration;
|
package com.google.net.stubby.testing.integration;
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.collect.Queues;
|
import com.google.common.collect.Queues;
|
||||||
import com.google.net.stubby.stub.StreamObserver;
|
import com.google.net.stubby.stub.StreamObserver;
|
||||||
import com.google.net.stubby.testing.integration.Messages.Payload;
|
import com.google.net.stubby.testing.integration.Messages.Payload;
|
||||||
|
|
@ -183,7 +182,7 @@ public class TestServiceImpl implements TestServiceGrpc.TestService {
|
||||||
@Override
|
@Override
|
||||||
public StreamObserver<Messages.StreamingOutputCallRequest> halfDuplexCall(
|
public StreamObserver<Messages.StreamingOutputCallRequest> halfDuplexCall(
|
||||||
final StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
|
final StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
|
||||||
final Queue<Chunk> chunks = Lists.newLinkedList();
|
final Queue<Chunk> chunks = new LinkedList<Chunk>();
|
||||||
return new StreamObserver<StreamingOutputCallRequest>() {
|
return new StreamObserver<StreamingOutputCallRequest>() {
|
||||||
@Override
|
@Override
|
||||||
public void onValue(StreamingOutputCallRequest request) {
|
public void onValue(StreamingOutputCallRequest request) {
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@
|
||||||
package com.google.net.stubby.transport.okhttp;
|
package com.google.net.stubby.transport.okhttp;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.net.stubby.Metadata;
|
import com.google.net.stubby.Metadata;
|
||||||
import com.google.net.stubby.transport.HttpUtil;
|
import com.google.net.stubby.transport.HttpUtil;
|
||||||
import com.google.net.stubby.transport.TransportFrameUtil;
|
import com.google.net.stubby.transport.TransportFrameUtil;
|
||||||
|
|
@ -41,6 +40,7 @@ import com.squareup.okhttp.internal.spdy.Header;
|
||||||
|
|
||||||
import okio.ByteString;
|
import okio.ByteString;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -65,7 +65,7 @@ public class Headers {
|
||||||
Preconditions.checkNotNull(defaultPath, "defaultPath");
|
Preconditions.checkNotNull(defaultPath, "defaultPath");
|
||||||
Preconditions.checkNotNull(defaultAuthority, "defaultAuthority");
|
Preconditions.checkNotNull(defaultAuthority, "defaultAuthority");
|
||||||
|
|
||||||
List<Header> okhttpHeaders = Lists.newArrayListWithCapacity(6);
|
List<Header> okhttpHeaders = new ArrayList<Header>(6);
|
||||||
|
|
||||||
// Set GRPC-specific headers.
|
// Set GRPC-specific headers.
|
||||||
okhttpHeaders.add(SCHEME_HEADER);
|
okhttpHeaders.add(SCHEME_HEADER);
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
import com.google.common.util.concurrent.ListenableFuture;
|
||||||
import com.google.common.util.concurrent.Service;
|
import com.google.common.util.concurrent.Service;
|
||||||
import com.google.common.util.concurrent.Service.State;
|
import com.google.common.util.concurrent.Service.State;
|
||||||
|
|
@ -183,7 +182,7 @@ public class OkHttpClientTransportTest {
|
||||||
clientTransport.newStream(method, new Metadata.Headers(), listener);
|
clientTransport.newStream(method, new Metadata.Headers(), listener);
|
||||||
assertTrue(streams.containsKey(3));
|
assertTrue(streams.containsKey(3));
|
||||||
// Empty headers block without correct content type or status
|
// Empty headers block without correct content type or status
|
||||||
frameHandler.headers(false, false, 3, 0, Lists.<Header>newArrayList(),
|
frameHandler.headers(false, false, 3, 0, new ArrayList<Header>(),
|
||||||
HeadersMode.HTTP_20_HEADERS);
|
HeadersMode.HTTP_20_HEADERS);
|
||||||
// Now wait to receive 1000 bytes of data so we can have a better error message before
|
// Now wait to receive 1000 bytes of data so we can have a better error message before
|
||||||
// cancelling the streaam.
|
// cancelling the streaam.
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,10 @@
|
||||||
|
|
||||||
package com.google.net.stubby.stub;
|
package com.google.net.stubby.stub;
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
import com.google.common.util.concurrent.ListenableFuture;
|
||||||
import com.google.common.util.concurrent.SettableFuture;
|
import com.google.common.util.concurrent.SettableFuture;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
|
@ -63,7 +63,7 @@ public class StreamRecorder<T> implements StreamObserver<T> {
|
||||||
private StreamRecorder() {
|
private StreamRecorder() {
|
||||||
firstValue = SettableFuture.create();
|
firstValue = SettableFuture.create();
|
||||||
latch = new CountDownLatch(1);
|
latch = new CountDownLatch(1);
|
||||||
results = Collections.synchronizedList(Lists.<T>newArrayList());
|
results = Collections.synchronizedList(new ArrayList<T>());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue