xds: security code refactoring: delete unused code and rename misc th…

…ings (#9583)
grpc · Oct 4, 2022 · 6b80efc · 6b80efc
1 parent b118e00
commit 6b80efc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 150 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/internal/security/SecurityProtocolNegotiators.java b/xds/src/main/java/io/grpc/xds/internal/security/SecurityProtocolNegotiators.java
@@ -208,10 +208,10 @@ protected void handlerAdded0(final ChannelHandlerContext ctx) {
           new SslContextProvider.Callback(ctx.executor()) {
 
             @Override
-            public void updateSecret(SslContext sslContext) {
+            public void updateSslContext(SslContext sslContext) {
               logger.log(
                   Level.FINEST,
-                  "ClientSdsHandler.updateSecret authority={0}, ctx.name={1}",
+                  "ClientSdsHandler.updateSslContext authority={0}, ctx.name={1}",
                   new Object[]{grpcHandler.getAuthority(), ctx.name()});
               ChannelHandler handler =
                   InternalProtocolNegotiators.tls(sslContext).newHandler(grpcHandler);
@@ -347,7 +347,7 @@ protected void handlerAdded0(final ChannelHandlerContext ctx) {
           new SslContextProvider.Callback(ctx.executor()) {
 
             @Override
-            public void updateSecret(SslContext sslContext) {
+            public void updateSslContext(SslContext sslContext) {
               ChannelHandler handler =
                   InternalProtocolNegotiators.serverTls(sslContext).newHandler(grpcHandler);
 

diff --git a/xds/src/main/java/io/grpc/xds/internal/security/SslContextProvider.java b/xds/src/main/java/io/grpc/xds/internal/security/SslContextProvider.java
@@ -57,7 +57,7 @@ protected Callback(Executor executor) {
     }
 
     /** Informs callee of new/updated SslContext. */
-    @VisibleForTesting public abstract void updateSecret(SslContext sslContext);
+    @VisibleForTesting public abstract void updateSslContext(SslContext sslContext);
 
     /** Informs callee of an exception that was generated. */
     @VisibleForTesting protected abstract void onException(Throwable throwable);
@@ -120,7 +120,7 @@ protected final void performCallback(
           public void run() {
             try {
               SslContext sslContext = sslContextGetter.get();
-              callback.updateSecret(sslContext);
+              callback.updateSslContext(sslContext);
             } catch (Throwable e) {
               callback.onException(e);
             }

diff --git a/xds/src/main/java/io/grpc/xds/internal/security/SslContextProviderSupplier.java b/xds/src/main/java/io/grpc/xds/internal/security/SslContextProviderSupplier.java
@@ -66,8 +66,8 @@ public synchronized void updateSslContext(final SslContextProvider.Callback call
           new SslContextProvider.Callback(callback.getExecutor()) {
 
             @Override
-            public void updateSecret(SslContext sslContext) {
-              callback.updateSecret(sslContext);
+            public void updateSslContext(SslContext sslContext) {
+              callback.updateSslContext(sslContext);
               releaseSslContextProvider(toRelease);
             }
 

diff --git a/xds/src/test/java/io/grpc/xds/XdsClientTestHelper.java b/xds/src/test/java/io/grpc/xds/XdsClientTestHelper.java
diff --git a/xds/src/test/java/io/grpc/xds/internal/security/CommonTlsContextTestsUtil.java b/xds/src/test/java/io/grpc/xds/internal/security/CommonTlsContextTestsUtil.java
@@ -424,7 +424,7 @@ public TestCallback(Executor executor) {
     }
 
     @Override
-    public void updateSecret(SslContext sslContext) {
+    public void updateSslContext(SslContext sslContext) {
       updatedSslContext = sslContext;
     }
 

diff --git a/xds/src/test/java/io/grpc/xds/internal/security/SecurityProtocolNegotiatorsTest.java b/xds/src/test/java/io/grpc/xds/internal/security/SecurityProtocolNegotiatorsTest.java
@@ -168,7 +168,7 @@ public void clientSdsHandler_addLast()
     sslContextProviderSupplier
         .updateSslContext(new SslContextProvider.Callback(MoreExecutors.directExecutor()) {
           @Override
-          public void updateSecret(SslContext sslContext) {
+          public void updateSslContext(SslContext sslContext) {
             future.set(sslContext);
           }
 
@@ -245,7 +245,7 @@ public SocketAddress remoteAddress() {
     sslContextProviderSupplier
         .updateSslContext(new SslContextProvider.Callback(MoreExecutors.directExecutor()) {
           @Override
-          public void updateSecret(SslContext sslContext) {
+          public void updateSslContext(SslContext sslContext) {
             future.set(sslContext);
           }
 
@@ -381,7 +381,7 @@ public void clientSdsProtocolNegotiatorNewHandler_fireProtocolNegotiationEvent()
     sslContextProviderSupplier
         .updateSslContext(new SslContextProvider.Callback(MoreExecutors.directExecutor()) {
           @Override
-          public void updateSecret(SslContext sslContext) {
+          public void updateSslContext(SslContext sslContext) {
             future.set(sslContext);
           }
 

diff --git a/xds/src/test/java/io/grpc/xds/internal/security/SslContextProviderSupplierTest.java b/xds/src/test/java/io/grpc/xds/internal/security/SslContextProviderSupplierTest.java
@@ -85,8 +85,8 @@ public void get_updateSecret() {
     SslContextProvider.Callback capturedCallback = callbackCaptor.getValue();
     assertThat(capturedCallback).isNotNull();
     SslContext mockSslContext = mock(SslContext.class);
-    capturedCallback.updateSecret(mockSslContext);
-    verify(mockCallback, times(1)).updateSecret(eq(mockSslContext));
+    capturedCallback.updateSslContext(mockSslContext);
+    verify(mockCallback, times(1)).updateSslContext(eq(mockSslContext));
     verify(mockTlsContextManager, times(1))
         .releaseClientSslContextProvider(eq(mockSslContextProvider));
     SslContextProvider.Callback mockCallback = mock(SslContextProvider.Callback.class);