aboutsummaryrefslogtreecommitdiff
path: root/okhttp
diff options
context:
space:
mode:
authorzpencer <spencerfang@google.com>2018-09-05 18:48:42 -0700
committerGitHub <noreply@github.com>2018-09-05 18:48:42 -0700
commit2fca42feb93f1bda1a80f6649d1e6304e9a67b08 (patch)
treefc016159bd41af9108ece6e5e5d1cdcb58ed9262 /okhttp
parent1b6adaff61eb47f9753997b464e1e3edef5346a4 (diff)
downloadgrpc-grpc-java-2fca42feb93f1bda1a80f6649d1e6304e9a67b08.tar.gz
all: prepend internal classes with Internal (#4826)
This is a safer way to hide the classes, because they will not appear in public targets for some build configurations.
Diffstat (limited to 'okhttp')
-rw-r--r--okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java6
-rw-r--r--okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
index a610ede2a..cf70d7e20 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
@@ -36,7 +36,7 @@ import io.grpc.CallOptions;
import io.grpc.Grpc;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.SocketStats;
-import io.grpc.LogId;
+import io.grpc.InternalLogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.MethodDescriptor.MethodType;
@@ -144,7 +144,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
private AsyncFrameWriter frameWriter;
private OutboundFlowController outboundFlow;
private final Object lock = new Object();
- private final LogId logId = LogId.allocate(getClass().getName());
+ private final InternalLogId logId = InternalLogId.allocate(getClass().getName());
@GuardedBy("lock")
private int nextStreamId;
@GuardedBy("lock")
@@ -629,7 +629,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
}
@Override
- public LogId getLogId() {
+ public InternalLogId getLogId() {
return logId;
}
diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java
index 130c03049..44212ca43 100644
--- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java
+++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java
@@ -55,9 +55,9 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.CallOptions;
-import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalChannelz.TransportStats;
+import io.grpc.InternalInstrumented;
import io.grpc.InternalStatus;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
@@ -2037,7 +2037,7 @@ public class OkHttpClientTransportTest {
}
}
- private static TransportStats getTransportStats(Instrumented<SocketStats> obj)
+ private static TransportStats getTransportStats(InternalInstrumented<SocketStats> obj)
throws ExecutionException, InterruptedException {
return obj.getStats().get().data;
}