From 02f56b0218515f7c614098e889e24410d8387f7c Mon Sep 17 00:00:00 2001 From: zpencer Date: Thu, 14 Dec 2017 14:20:30 -0800 Subject: [PATCH] core,services: move BinaryLog class to grpc-services (#3867) --- core/src/main/java/io/grpc/internal/ClientCallImpl.java | 2 -- core/src/main/java/io/grpc/internal/ServerCallImpl.java | 2 -- .../src/main/java/io/grpc/services}/BinaryLog.java | 2 +- .../src/test/java/io/grpc/services}/BinaryLogTest.java | 4 ++-- 4 files changed, 3 insertions(+), 7 deletions(-) rename {core/src/main/java/io/grpc/internal => services/src/main/java/io/grpc/services}/BinaryLog.java (99%) rename {core/src/test/java/io/grpc/internal => services/src/test/java/io/grpc/services}/BinaryLogTest.java (99%) diff --git a/core/src/main/java/io/grpc/internal/ClientCallImpl.java b/core/src/main/java/io/grpc/internal/ClientCallImpl.java index 9e22e64050..5c03f2a7a3 100644 --- a/core/src/main/java/io/grpc/internal/ClientCallImpl.java +++ b/core/src/main/java/io/grpc/internal/ClientCallImpl.java @@ -83,7 +83,6 @@ final class ClientCallImpl extends ClientCall { private boolean fullStreamDecompression; private DecompressorRegistry decompressorRegistry = DecompressorRegistry.getDefaultInstance(); private CompressorRegistry compressorRegistry = CompressorRegistry.getDefaultInstance(); - private final BinaryLog binlog; ClientCallImpl( MethodDescriptor method, Executor executor, CallOptions callOptions, @@ -105,7 +104,6 @@ final class ClientCallImpl extends ClientCall { this.callOptions = callOptions; this.clientTransportProvider = clientTransportProvider; this.deadlineCancellationExecutor = deadlineCancellationExecutor; - this.binlog = BinaryLog.getLog(method.getFullMethodName()); } private final class ContextCancellationListener implements CancellationListener { diff --git a/core/src/main/java/io/grpc/internal/ServerCallImpl.java b/core/src/main/java/io/grpc/internal/ServerCallImpl.java index 8e75742ebe..a0ffba891e 100644 --- a/core/src/main/java/io/grpc/internal/ServerCallImpl.java +++ b/core/src/main/java/io/grpc/internal/ServerCallImpl.java @@ -54,7 +54,6 @@ final class ServerCallImpl extends ServerCall { private final byte[] messageAcceptEncoding; private final DecompressorRegistry decompressorRegistry; private final CompressorRegistry compressorRegistry; - private final BinaryLog binlog; // state private volatile boolean cancelled; @@ -72,7 +71,6 @@ final class ServerCallImpl extends ServerCall { this.messageAcceptEncoding = inboundHeaders.get(MESSAGE_ACCEPT_ENCODING_KEY); this.decompressorRegistry = decompressorRegistry; this.compressorRegistry = compressorRegistry; - binlog = BinaryLog.getLog(method.getFullMethodName()); } @Override diff --git a/core/src/main/java/io/grpc/internal/BinaryLog.java b/services/src/main/java/io/grpc/services/BinaryLog.java similarity index 99% rename from core/src/main/java/io/grpc/internal/BinaryLog.java rename to services/src/main/java/io/grpc/services/BinaryLog.java index 5f3db9508d..ef1c61095f 100644 --- a/core/src/main/java/io/grpc/internal/BinaryLog.java +++ b/services/src/main/java/io/grpc/services/BinaryLog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.grpc.internal; +package io.grpc.services; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; diff --git a/core/src/test/java/io/grpc/internal/BinaryLogTest.java b/services/src/test/java/io/grpc/services/BinaryLogTest.java similarity index 99% rename from core/src/test/java/io/grpc/internal/BinaryLogTest.java rename to services/src/test/java/io/grpc/services/BinaryLogTest.java index 8b6cdbd02b..6be9cf6b3b 100644 --- a/core/src/test/java/io/grpc/internal/BinaryLogTest.java +++ b/services/src/test/java/io/grpc/services/BinaryLogTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.grpc.internal; +package io.grpc.services; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import io.grpc.internal.BinaryLog.FactoryImpl; +import io.grpc.services.BinaryLog.FactoryImpl; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4;