From 828f941e99cfa3572945ab4ba40e5b4b3a17d231 Mon Sep 17 00:00:00 2001 From: simonma Date: Mon, 12 Jan 2015 18:08:15 -0800 Subject: [PATCH] Remove dependency on guava Lists for initializing list. ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=83808289 --- core/src/main/java/com/google/net/stubby/Status.java | 4 ++-- .../net/stubby/testing/integration/TestServiceImpl.java | 3 +-- .../java/com/google/net/stubby/transport/okhttp/Headers.java | 4 ++-- .../stubby/transport/okhttp/OkHttpClientTransportTest.java | 3 +-- .../main/java/com/google/net/stubby/stub/StreamRecorder.java | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/google/net/stubby/Status.java b/core/src/main/java/com/google/net/stubby/Status.java index 304753b0db..6ad880d3e0 100644 --- a/core/src/main/java/com/google/net/stubby/Status.java +++ b/core/src/main/java/com/google/net/stubby/Status.java @@ -35,8 +35,8 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.google.common.collect.Lists; +import java.util.ArrayList; import java.util.List; import java.util.TreeMap; @@ -194,7 +194,7 @@ public final class Status { replaced.getCode().name() + " & " + code.name()); } } - STATUS_LIST = Lists.newArrayList(canonicalizer.values()); + STATUS_LIST = new ArrayList(canonicalizer.values()); } // A pseudo-enum of Status instances mapped 1:1 with values in Code. This simplifies construction diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceImpl.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceImpl.java index e1823603d8..8c1f75ac9c 100644 --- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceImpl.java +++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceImpl.java @@ -31,7 +31,6 @@ package com.google.net.stubby.testing.integration; -import com.google.common.collect.Lists; import com.google.common.collect.Queues; import com.google.net.stubby.stub.StreamObserver; import com.google.net.stubby.testing.integration.Messages.Payload; @@ -183,7 +182,7 @@ public class TestServiceImpl implements TestServiceGrpc.TestService { @Override public StreamObserver halfDuplexCall( final StreamObserver responseObserver) { - final Queue chunks = Lists.newLinkedList(); + final Queue chunks = new LinkedList(); return new StreamObserver() { @Override public void onValue(StreamingOutputCallRequest request) { diff --git a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java index 48626a2f4d..84384d9a4e 100644 --- a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java @@ -32,7 +32,6 @@ package com.google.net.stubby.transport.okhttp; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.net.stubby.Metadata; import com.google.net.stubby.transport.HttpUtil; import com.google.net.stubby.transport.TransportFrameUtil; @@ -41,6 +40,7 @@ import com.squareup.okhttp.internal.spdy.Header; import okio.ByteString; +import java.util.ArrayList; import java.util.List; /** @@ -65,7 +65,7 @@ public class Headers { Preconditions.checkNotNull(defaultPath, "defaultPath"); Preconditions.checkNotNull(defaultAuthority, "defaultAuthority"); - List
okhttpHeaders = Lists.newArrayListWithCapacity(6); + List
okhttpHeaders = new ArrayList
(6); // Set GRPC-specific headers. okhttpHeaders.add(SCHEME_HEADER); diff --git a/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java index cdd842db80..89889e628e 100644 --- a/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java +++ b/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java @@ -45,7 +45,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; 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.Service; import com.google.common.util.concurrent.Service.State; @@ -183,7 +182,7 @@ public class OkHttpClientTransportTest { clientTransport.newStream(method, new Metadata.Headers(), listener); assertTrue(streams.containsKey(3)); // Empty headers block without correct content type or status - frameHandler.headers(false, false, 3, 0, Lists.
newArrayList(), + frameHandler.headers(false, false, 3, 0, new ArrayList
(), HeadersMode.HTTP_20_HEADERS); // Now wait to receive 1000 bytes of data so we can have a better error message before // cancelling the streaam. diff --git a/stub/src/main/java/com/google/net/stubby/stub/StreamRecorder.java b/stub/src/main/java/com/google/net/stubby/stub/StreamRecorder.java index 3d2160ab61..b8f7af8df3 100644 --- a/stub/src/main/java/com/google/net/stubby/stub/StreamRecorder.java +++ b/stub/src/main/java/com/google/net/stubby/stub/StreamRecorder.java @@ -31,10 +31,10 @@ 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.SettableFuture; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -63,7 +63,7 @@ public class StreamRecorder implements StreamObserver { private StreamRecorder() { firstValue = SettableFuture.create(); latch = new CountDownLatch(1); - results = Collections.synchronizedList(Lists.newArrayList()); + results = Collections.synchronizedList(new ArrayList()); } @Override