move s2a implementation to internal package.

grpc · Sep 20, 2024 · cb87c16 · cb87c16
1 parent 782a44a
commit cb87c16
Show file tree

Hide file tree

Showing 32 changed files with 84 additions and 84 deletions.
diff --git a/...o/grpc/s2a/handshaker/S2AServiceGrpc.java → ...a/internal/handshaker/S2AServiceGrpc.java b/...o/grpc/s2a/handshaker/S2AServiceGrpc.java → ...a/internal/handshaker/S2AServiceGrpc.java
@@ -1,4 +1,4 @@
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static io.grpc.MethodDescriptor.generateFullMethodName;
 
@@ -15,29 +15,29 @@ private S2AServiceGrpc() {}
   public static final java.lang.String SERVICE_NAME = "grpc.gcp.s2a.S2AService";
 
   // Static method descriptors that strictly reflect the proto.
-  private static volatile io.grpc.MethodDescriptor<io.grpc.s2a.handshaker.SessionReq,
-      io.grpc.s2a.handshaker.SessionResp> getSetUpSessionMethod;
+  private static volatile io.grpc.MethodDescriptor<io.grpc.s2a.internal.handshaker.SessionReq,
+      io.grpc.s2a.internal.handshaker.SessionResp> getSetUpSessionMethod;
 
   @io.grpc.stub.annotations.RpcMethod(
       fullMethodName = SERVICE_NAME + '/' + "SetUpSession",
-      requestType = io.grpc.s2a.handshaker.SessionReq.class,
-      responseType = io.grpc.s2a.handshaker.SessionResp.class,
+      requestType = io.grpc.s2a.internal.handshaker.SessionReq.class,
+      responseType = io.grpc.s2a.internal.handshaker.SessionResp.class,
       methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
-  public static io.grpc.MethodDescriptor<io.grpc.s2a.handshaker.SessionReq,
-      io.grpc.s2a.handshaker.SessionResp> getSetUpSessionMethod() {
-    io.grpc.MethodDescriptor<io.grpc.s2a.handshaker.SessionReq, io.grpc.s2a.handshaker.SessionResp> getSetUpSessionMethod;
+  public static io.grpc.MethodDescriptor<io.grpc.s2a.internal.handshaker.SessionReq,
+      io.grpc.s2a.internal.handshaker.SessionResp> getSetUpSessionMethod() {
+    io.grpc.MethodDescriptor<io.grpc.s2a.internal.handshaker.SessionReq, io.grpc.s2a.internal.handshaker.SessionResp> getSetUpSessionMethod;
     if ((getSetUpSessionMethod = S2AServiceGrpc.getSetUpSessionMethod) == null) {
       synchronized (S2AServiceGrpc.class) {
         if ((getSetUpSessionMethod = S2AServiceGrpc.getSetUpSessionMethod) == null) {
           S2AServiceGrpc.getSetUpSessionMethod = getSetUpSessionMethod =
-              io.grpc.MethodDescriptor.<io.grpc.s2a.handshaker.SessionReq, io.grpc.s2a.handshaker.SessionResp>newBuilder()
+              io.grpc.MethodDescriptor.<io.grpc.s2a.internal.handshaker.SessionReq, io.grpc.s2a.internal.handshaker.SessionResp>newBuilder()
               .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SetUpSession"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.s2a.handshaker.SessionReq.getDefaultInstance()))
+                  io.grpc.s2a.internal.handshaker.SessionReq.getDefaultInstance()))
               .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  io.grpc.s2a.handshaker.SessionResp.getDefaultInstance()))
+                  io.grpc.s2a.internal.handshaker.SessionResp.getDefaultInstance()))
               .setSchemaDescriptor(new S2AServiceMethodDescriptorSupplier("SetUpSession"))
               .build();
         }
@@ -100,8 +100,8 @@ public interface AsyncService {
      * operations from the TLS handshake.
      * </pre>
      */
-    default io.grpc.stub.StreamObserver<io.grpc.s2a.handshaker.SessionReq> setUpSession(
-        io.grpc.stub.StreamObserver<io.grpc.s2a.handshaker.SessionResp> responseObserver) {
+    default io.grpc.stub.StreamObserver<io.grpc.s2a.internal.handshaker.SessionReq> setUpSession(
+        io.grpc.stub.StreamObserver<io.grpc.s2a.internal.handshaker.SessionResp> responseObserver) {
       return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getSetUpSessionMethod(), responseObserver);
     }
   }
@@ -139,8 +139,8 @@ protected S2AServiceStub build(
      * operations from the TLS handshake.
      * </pre>
      */
-    public io.grpc.stub.StreamObserver<io.grpc.s2a.handshaker.SessionReq> setUpSession(
-        io.grpc.stub.StreamObserver<io.grpc.s2a.handshaker.SessionResp> responseObserver) {
+    public io.grpc.stub.StreamObserver<io.grpc.s2a.internal.handshaker.SessionReq> setUpSession(
+        io.grpc.stub.StreamObserver<io.grpc.s2a.internal.handshaker.SessionResp> responseObserver) {
       return io.grpc.stub.ClientCalls.asyncBidiStreamingCall(
           getChannel().newCall(getSetUpSessionMethod(), getCallOptions()), responseObserver);
     }
@@ -211,7 +211,7 @@ public io.grpc.stub.StreamObserver<Req> invoke(
       switch (methodId) {
         case METHODID_SET_UP_SESSION:
           return (io.grpc.stub.StreamObserver<Req>) serviceImpl.setUpSession(
-              (io.grpc.stub.StreamObserver<io.grpc.s2a.handshaker.SessionResp>) responseObserver);
+              (io.grpc.stub.StreamObserver<io.grpc.s2a.internal.handshaker.SessionResp>) responseObserver);
         default:
           throw new AssertionError();
       }
@@ -224,8 +224,8 @@ public static final io.grpc.ServerServiceDefinition bindService(AsyncService ser
           getSetUpSessionMethod(),
           io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
             new MethodHandlers<
-              io.grpc.s2a.handshaker.SessionReq,
-              io.grpc.s2a.handshaker.SessionResp>(
+              io.grpc.s2a.internal.handshaker.SessionReq,
+              io.grpc.s2a.internal.handshaker.SessionResp>(
                 service, METHODID_SET_UP_SESSION)))
         .build();
   }
@@ -236,7 +236,7 @@ private static abstract class S2AServiceBaseDescriptorSupplier
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return io.grpc.s2a.handshaker.S2AProto.getDescriptor();
+      return io.grpc.s2a.internal.handshaker.S2AProto.getDescriptor();
     }
 
     @java.lang.Override

diff --git a/s2a/src/main/java/io/grpc/s2a/S2AChannelCredentials.java b/s2a/src/main/java/io/grpc/s2a/S2AChannelCredentials.java
@@ -28,9 +28,9 @@
 import io.grpc.internal.SharedResourcePool;
 import io.grpc.netty.InternalNettyChannelCredentials;
 import io.grpc.netty.InternalProtocolNegotiator;
-import io.grpc.s2a.channel.S2AHandshakerServiceChannel;
-import io.grpc.s2a.handshaker.S2AIdentity;
-import io.grpc.s2a.handshaker.S2AProtocolNegotiatorFactory;
+import io.grpc.s2a.internal.channel.S2AHandshakerServiceChannel;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.S2AProtocolNegotiatorFactory;
 import java.util.Optional;
 import javax.annotation.concurrent.NotThreadSafe;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/...a/io/grpc/s2a/channel/S2AChannelPool.java → .../s2a/internal/channel/S2AChannelPool.java b/...a/io/grpc/s2a/channel/S2AChannelPool.java → .../s2a/internal/channel/S2AChannelPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.channel;
+package io.grpc.s2a.internal.channel;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.grpc.Channel;

diff --git a/.../grpc/s2a/channel/S2AGrpcChannelPool.java → .../internal/channel/S2AGrpcChannelPool.java b/.../grpc/s2a/channel/S2AGrpcChannelPool.java → .../internal/channel/S2AGrpcChannelPool.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.channel;
+package io.grpc.s2a.internal.channel;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

diff --git a/.../channel/S2AHandshakerServiceChannel.java → .../channel/S2AHandshakerServiceChannel.java b/.../channel/S2AHandshakerServiceChannel.java → .../channel/S2AHandshakerServiceChannel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.channel;
+package io.grpc.s2a.internal.channel;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.concurrent.TimeUnit.SECONDS;

diff --git a/...handshaker/ConnectionClosedException.java → ...handshaker/ConnectionClosedException.java b/...handshaker/ConnectionClosedException.java → ...handshaker/ConnectionClosedException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import java.io.IOException;
 

diff --git a/...ndshaker/GetAuthenticationMechanisms.java → ...ndshaker/GetAuthenticationMechanisms.java b/...ndshaker/GetAuthenticationMechanisms.java → ...ndshaker/GetAuthenticationMechanisms.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import com.google.errorprone.annotations.Immutable;
-import io.grpc.s2a.handshaker.S2AIdentity;
-import io.grpc.s2a.handshaker.tokenmanager.AccessTokenManager;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.tokenmanager.AccessTokenManager;
 import java.util.Optional;
 
 /** Retrieves the authentication mechanism for a given local identity. */

diff --git a/...ava/io/grpc/s2a/handshaker/ProtoUtil.java → ...pc/s2a/internal/handshaker/ProtoUtil.java b/...ava/io/grpc/s2a/handshaker/ProtoUtil.java → ...pc/s2a/internal/handshaker/ProtoUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import com.google.common.collect.ImmutableSet;
 

diff --git a/...2a/handshaker/S2AConnectionException.java → ...al/handshaker/S2AConnectionException.java b/...2a/handshaker/S2AConnectionException.java → ...al/handshaker/S2AConnectionException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 /** Exception that denotes a runtime error that was encountered when talking to the S2A server. */
 @SuppressWarnings("serial") // This class is never serialized.

diff --git a/...a/io/grpc/s2a/handshaker/S2AIdentity.java → .../s2a/internal/handshaker/S2AIdentity.java b/...a/io/grpc/s2a/handshaker/S2AIdentity.java → .../s2a/internal/handshaker/S2AIdentity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

diff --git a/...c/s2a/handshaker/S2APrivateKeyMethod.java → ...ernal/handshaker/S2APrivateKeyMethod.java b/...c/s2a/handshaker/S2APrivateKeyMethod.java → ...ernal/handshaker/S2APrivateKeyMethod.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.protobuf.ByteString;
-import io.grpc.s2a.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
 import io.netty.handler.ssl.OpenSslPrivateKeyMethod;
 import java.io.IOException;
 import java.util.Optional;

diff --git a/...dshaker/S2AProtocolNegotiatorFactory.java → ...dshaker/S2AProtocolNegotiatorFactory.java b/...dshaker/S2AProtocolNegotiatorFactory.java → ...dshaker/S2AProtocolNegotiatorFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -35,9 +35,9 @@
 import io.grpc.netty.InternalProtocolNegotiator.ProtocolNegotiator;
 import io.grpc.netty.InternalProtocolNegotiators;
 import io.grpc.netty.InternalProtocolNegotiators.ProtocolNegotiationHandler;
-import io.grpc.s2a.channel.S2AChannelPool;
-import io.grpc.s2a.channel.S2AGrpcChannelPool;
-import io.grpc.s2a.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.channel.S2AChannelPool;
+import io.grpc.s2a.internal.channel.S2AGrpcChannelPool;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;

diff --git a/.../java/io/grpc/s2a/handshaker/S2AStub.java → ...grpc/s2a/internal/handshaker/S2AStub.java b/.../java/io/grpc/s2a/handshaker/S2AStub.java → ...grpc/s2a/internal/handshaker/S2AStub.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

diff --git a/.../grpc/s2a/handshaker/S2ATrustManager.java → .../internal/handshaker/S2ATrustManager.java b/.../grpc/s2a/handshaker/S2ATrustManager.java → .../internal/handshaker/S2ATrustManager.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.ByteString;
-import io.grpc.s2a.handshaker.S2AIdentity;
-import io.grpc.s2a.handshaker.ValidatePeerCertificateChainReq.VerificationMode;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.ValidatePeerCertificateChainReq.VerificationMode;
 import java.io.IOException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;

diff --git a/...rpc/s2a/handshaker/SslContextFactory.java → ...nternal/handshaker/SslContextFactory.java b/...rpc/s2a/handshaker/SslContextFactory.java → ...nternal/handshaker/SslContextFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.collect.ImmutableSet;
 import io.grpc.netty.GrpcSslContexts;
-import io.grpc.s2a.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
 import io.netty.handler.ssl.OpenSslContextOption;
 import io.netty.handler.ssl.OpenSslSessionContext;
 import io.netty.handler.ssl.OpenSslX509KeyManagerFactory;

diff --git a/...aker/tokenmanager/AccessTokenManager.java → ...aker/tokenmanager/AccessTokenManager.java b/...aker/tokenmanager/AccessTokenManager.java → ...aker/tokenmanager/AccessTokenManager.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker.tokenmanager;
+package io.grpc.s2a.internal.handshaker.tokenmanager;
 
-import io.grpc.s2a.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
 import java.lang.reflect.Method;
 import java.util.Optional;
 import javax.annotation.concurrent.ThreadSafe;

diff --git a/...aker/tokenmanager/SingleTokenFetcher.java → ...aker/tokenmanager/SingleTokenFetcher.java b/...aker/tokenmanager/SingleTokenFetcher.java → ...aker/tokenmanager/SingleTokenFetcher.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker.tokenmanager;
+package io.grpc.s2a.internal.handshaker.tokenmanager;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.grpc.s2a.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
 import java.util.Optional;
 
 /** Fetches a single access token via an environment variable. */

diff --git a/...handshaker/tokenmanager/TokenFetcher.java → ...handshaker/tokenmanager/TokenFetcher.java b/...handshaker/tokenmanager/TokenFetcher.java → ...handshaker/tokenmanager/TokenFetcher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker.tokenmanager;
+package io.grpc.s2a.internal.handshaker.tokenmanager;
 
-import io.grpc.s2a.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
 
 /** Fetches tokens used to authenticate to S2A. */
 interface TokenFetcher {

diff --git a/...c/s2a/channel/S2AGrpcChannelPoolTest.java → ...ernal/channel/S2AGrpcChannelPoolTest.java b/...c/s2a/channel/S2AGrpcChannelPoolTest.java → ...ernal/channel/S2AGrpcChannelPoolTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.channel;
+package io.grpc.s2a.internal.channel;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;

diff --git a/...nnel/S2AHandshakerServiceChannelTest.java → ...nnel/S2AHandshakerServiceChannelTest.java b/...nnel/S2AHandshakerServiceChannelTest.java → ...nnel/S2AHandshakerServiceChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.channel;
+package io.grpc.s2a.internal.channel;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;

diff --git a/...io/grpc/s2a/handshaker/FakeS2AServer.java → ...2a/internal/handshaker/FakeS2AServer.java b/...io/grpc/s2a/handshaker/FakeS2AServer.java → ...2a/internal/handshaker/FakeS2AServer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import io.grpc.stub.StreamObserver;
 import java.security.NoSuchAlgorithmException;

diff --git a/...rpc/s2a/handshaker/FakeS2AServerTest.java → ...nternal/handshaker/FakeS2AServerTest.java b/...rpc/s2a/handshaker/FakeS2AServerTest.java → ...nternal/handshaker/FakeS2AServerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -27,7 +27,7 @@
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.benchmarks.Utils;
-import io.grpc.s2a.handshaker.ValidatePeerCertificateChainReq.VerificationMode;
+import io.grpc.s2a.internal.handshaker.ValidatePeerCertificateChainReq.VerificationMode;
 import io.grpc.stub.StreamObserver;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;

diff --git a/...va/io/grpc/s2a/handshaker/FakeWriter.java → ...c/s2a/internal/handshaker/FakeWriter.java b/...va/io/grpc/s2a/handshaker/FakeWriter.java → ...c/s2a/internal/handshaker/FakeWriter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
-import static io.grpc.s2a.handshaker.TLSVersion.TLS_VERSION_1_2;
-import static io.grpc.s2a.handshaker.TLSVersion.TLS_VERSION_1_3;
+import static io.grpc.s2a.internal.handshaker.TLSVersion.TLS_VERSION_1_2;
+import static io.grpc.s2a.internal.handshaker.TLSVersion.TLS_VERSION_1_3;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;

diff --git a/...aker/GetAuthenticationMechanismsTest.java → ...aker/GetAuthenticationMechanismsTest.java b/...aker/GetAuthenticationMechanismsTest.java → ...aker/GetAuthenticationMechanismsTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.grpc.s2a.handshaker;
+package io.grpc.s2a.internal.handshaker;
 
 import com.google.common.truth.Expect;
-import io.grpc.s2a.handshaker.S2AIdentity;
-import io.grpc.s2a.handshaker.tokenmanager.SingleTokenFetcher;
+import io.grpc.s2a.internal.handshaker.S2AIdentity;
+import io.grpc.s2a.internal.handshaker.tokenmanager.SingleTokenFetcher;
 import java.util.Optional;
 import org.junit.BeforeClass;
 import org.junit.Rule;