Remove whitespace only formatting done by wrong indendation settings in Intellij.

Author: kannanjgithub

examples/example-xds/xds-client.Dockerfile

@@ -452,14 +452,12 @@ public void onNext(SimpleResponse response) {
 
       private void handleRpcCompleted(long requestId, RpcType rpcType, String hostname,
           Set<XdsStatsWatcher> watchers) {
-        logger.info("RPC completed");
         statsAccumulator.recordRpcFinished(rpcType, Status.OK);
         notifyWatchers(watchers, rpcType, requestId, hostname);
       }
 
       private void handleRpcError(long requestId, RpcType rpcType, Status status,
           Set<XdsStatsWatcher> watchers) {
-        logger.info("RPC error with status " + status);
         statsAccumulator.recordRpcFinished(rpcType, status);
         notifyWatchers(watchers, rpcType, requestId, null);
       }

examples/example-xds/xds-server.Dockerfile

@@ -25,7 +25,6 @@
 import io.netty.channel.ChannelHandler;
 import io.netty.handler.ssl.SslContext;
 import io.netty.util.AsciiString;
-
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import java.util.concurrent.Executor;
@@ -45,10 +44,11 @@ private InternalProtocolNegotiators() {}
    * @param executorPool             a dedicated {@link Executor} pool for time-consuming TLS tasks
    */
   public static InternalProtocolNegotiator.ProtocolNegotiator tls(SslContext sslContext,
-                                                                  ObjectPool<? extends Executor> executorPool,
-                                                                  Optional<Runnable> handshakeCompleteRunnable,
-                                                                  TrustManager extendedX509TrustManager,
-                                                                  String sni, boolean isXdsTarget) {
+          ObjectPool<? extends Executor> executorPool,
+          Optional<Runnable> handshakeCompleteRunnable,
+          TrustManager extendedX509TrustManager,
+          String sni,
+          boolean isXdsTarget) {
     final io.grpc.netty.ProtocolNegotiator negotiator = ProtocolNegotiators.tls(sslContext,
         executorPool, handshakeCompleteRunnable, (X509TrustManager) extendedX509TrustManager, sni,
         isXdsTarget);
@@ -163,7 +163,7 @@ public void close() {
    * Internal version of {@link WaitUntilActiveHandler}.
    */
   public static ChannelHandler waitUntilActiveHandler(ChannelHandler next,
-                                                      ChannelLogger negotiationLogger) {
+      ChannelLogger negotiationLogger) {
     return new WaitUntilActiveHandler(next, negotiationLogger);
   }
 
@@ -185,12 +185,12 @@ public static class ProtocolNegotiationHandler
       extends ProtocolNegotiators.ProtocolNegotiationHandler {
 
     protected ProtocolNegotiationHandler(ChannelHandler next, String negotiatorName,
-                                         ChannelLogger negotiationLogger) {
+       ChannelLogger negotiationLogger) {
       super(next, negotiatorName, negotiationLogger);
     }
 
     protected ProtocolNegotiationHandler(ChannelHandler next, ChannelLogger negotiationLogger) {
       super(next, negotiationLogger);
     }
   }
-}
+}

interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java

@@ -132,7 +132,7 @@ public static FromChannelCredentialsResult from(ChannelCredentials creds) {
           trustManagers = tlsCreds.getTrustManagers();
         } else if (tlsCreds.getRootCertificates() != null) {
           trustManagers = Arrays.asList(CertificateUtils.createTrustManager(
-              new ByteArrayInputStream(tlsCreds.getRootCertificates())));
+                new ByteArrayInputStream(tlsCreds.getRootCertificates())));
         } else { // else use system default
           TrustManagerFactory tmf = TrustManagerFactory.getInstance(
               TrustManagerFactory.getDefaultAlgorithm());
@@ -265,7 +265,7 @@ public static final class FromChannelCredentialsResult {
     public final String error;
 
     private FromChannelCredentialsResult(ProtocolNegotiator.ClientFactory negotiator,
-                                         CallCredentials creds, String error) {
+       CallCredentials creds, String error) {
       this.negotiator = negotiator;
       this.callCredentials = creds;
       this.error = error;
@@ -379,7 +379,7 @@ public ProtocolNegotiator newNegotiator(ObjectPool<? extends Executor> offloadEx
    * @param executorPool a dedicated {@link Executor} pool for time-consuming TLS tasks
    */
   public static ProtocolNegotiator serverTls(final SslContext sslContext,
-                                             final ObjectPool<? extends Executor> executorPool) {
+      final ObjectPool<? extends Executor> executorPool) {
     Preconditions.checkNotNull(sslContext, "sslContext");
     final Executor executor;
     if (executorPool != null) {
@@ -428,8 +428,8 @@ static final class ServerTlsHandler extends ChannelInboundHandlerAdapter {
     private ProtocolNegotiationEvent pne = ProtocolNegotiationEvent.DEFAULT;
 
     ServerTlsHandler(ChannelHandler next,
-                     SslContext sslContext,
-                     final ObjectPool<? extends Executor> executorPool) {
+       SslContext sslContext,
+       final ObjectPool<? extends Executor> executorPool) {
       this.sslContext = Preconditions.checkNotNull(sslContext, "sslContext");
       this.next = Preconditions.checkNotNull(next, "next");
       if (executorPool != null) {
@@ -486,9 +486,8 @@ private void fireProtocolNegotiationEvent(ChannelHandlerContext ctx, SSLSession
    * Returns a {@link ProtocolNegotiator} that does HTTP CONNECT proxy negotiation.
    */
   public static ProtocolNegotiator httpProxy(final SocketAddress proxyAddress,
-                                             final @Nullable String proxyUsername,
-                                             final @Nullable String proxyPassword,
-                                             final ProtocolNegotiator negotiator) {
+     final @Nullable String proxyUsername, final @Nullable String proxyPassword,
+     final ProtocolNegotiator negotiator) {
     Preconditions.checkNotNull(negotiator, "negotiator");
     Preconditions.checkNotNull(proxyAddress, "proxyAddress");
     final AsciiString scheme = negotiator.scheme();
@@ -565,10 +564,8 @@ protected void userEventTriggered0(ChannelHandlerContext ctx, Object evt) throws
   static final class ClientTlsProtocolNegotiator implements ProtocolNegotiator {
 
     public ClientTlsProtocolNegotiator(SslContext sslContext,
-                                       ObjectPool<? extends Executor> executorPool,
-                                       Optional<Runnable> handshakeCompleteRunnable,
-                                       X509TrustManager x509ExtendedTrustManager,
-                                       String sni, boolean isXdsTarget) {
+       ObjectPool<? extends Executor> executorPool, Optional<Runnable> handshakeCompleteRunnable,
+       X509TrustManager x509ExtendedTrustManager, String sni, boolean isXdsTarget) {
       this.sslContext = Preconditions.checkNotNull(sslContext, "sslContext");
       this.executorPool = executorPool;
       if (this.executorPool != null) {
@@ -628,10 +625,10 @@ static final class ClientTlsHandler extends ProtocolNegotiationHandler {
     private SSLEngine sslEngine;
 
     ClientTlsHandler(ChannelHandler next, SslContext sslContext, String sniHostPort,
-                     Executor executor, ChannelLogger negotiationLogger,
-                     Optional<Runnable> handshakeCompleteRunnable,
-                     ClientTlsProtocolNegotiator clientTlsProtocolNegotiator,
-                     X509TrustManager x509ExtendedTrustManager) {
+       Executor executor, ChannelLogger negotiationLogger,
+       Optional<Runnable> handshakeCompleteRunnable,
+       ClientTlsProtocolNegotiator clientTlsProtocolNegotiator,
+       X509TrustManager x509ExtendedTrustManager) {
       super(next, negotiationLogger);
       this.sslContext = Preconditions.checkNotNull(sslContext, "sslContext");
       if (!Strings.isNullOrEmpty(sniHostPort)) {
@@ -753,8 +750,8 @@ static HostPort parseAuthority(String authority) {
    * @param executorPool a dedicated {@link Executor} pool for time-consuming TLS tasks
    */
   public static ProtocolNegotiator tls(SslContext sslContext,
-                                       ObjectPool<? extends Executor> executorPool, Optional<Runnable> handshakeCompleteRunnable,
-                                       X509TrustManager x509ExtendedTrustManager, String sni, boolean isXdsTarget) {
+     ObjectPool<? extends Executor> executorPool, Optional<Runnable> handshakeCompleteRunnable,
+     X509TrustManager x509ExtendedTrustManager, String sni, boolean isXdsTarget) {
     return new ClientTlsProtocolNegotiator(sslContext, executorPool, handshakeCompleteRunnable,
         x509ExtendedTrustManager, sni, isXdsTarget);
   }
@@ -938,7 +935,7 @@ private static RuntimeException unavailableException(String msg) {
 
   @VisibleForTesting
   static void logSslEngineDetails(Level level, ChannelHandlerContext ctx, String msg,
-                                  @Nullable Throwable t) {
+      @Nullable Throwable t) {
     if (!log.isLoggable(level)) {
       return;
     }
@@ -1064,8 +1061,8 @@ static final class PlaintextHandler extends ProtocolNegotiationHandler {
     protected void protocolNegotiationEventTriggered(ChannelHandlerContext ctx) {
       ProtocolNegotiationEvent existingPne = getProtocolNegotiationEvent();
       Attributes attrs = existingPne.getAttributes().toBuilder()
-          .set(GrpcAttributes.ATTR_AUTHORITY_VERIFIER, (authority) -> Status.OK)
-          .build();
+            .set(GrpcAttributes.ATTR_AUTHORITY_VERIFIER, (authority) -> Status.OK)
+            .build();
       replaceProtocolNegotiationEvent(existingPne.withAttributes(attrs));
       fireProtocolNegotiationEvent(ctx);
     }
@@ -1127,7 +1124,7 @@ static class ProtocolNegotiationHandler extends ChannelDuplexHandler {
     private final ChannelLogger negotiationLogger;
 
     protected ProtocolNegotiationHandler(ChannelHandler next, String negotiatorName,
-                                         ChannelLogger negotiationLogger) {
+        ChannelLogger negotiationLogger) {
       this.next = Preconditions.checkNotNull(next, "next");
       this.negotiatorName = negotiatorName;
       this.negotiationLogger = Preconditions.checkNotNull(negotiationLogger, "negotiationLogger");

netty/src/main/java/io/grpc/netty/InternalProtocolNegotiators.java

@@ -138,7 +138,7 @@ public static DownstreamTlsContext fromEnvoyProtoDownstreamTlsContext(
         io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext
             downstreamTlsContext) {
       return new DownstreamTlsContext(downstreamTlsContext.getCommonTlsContext(),
-          downstreamTlsContext.hasRequireClientCertificate());
+        downstreamTlsContext.hasRequireClientCertificate());
     }
 
     public boolean isRequireClientCertificate() {
@@ -224,10 +224,10 @@ abstract static class FilterChainMatch {
     abstract String transportProtocol();
 
     public static FilterChainMatch create(int destinationPort,
-                                          ImmutableList<CidrRange> prefixRanges,
-                                          ImmutableList<String> applicationProtocols, ImmutableList<CidrRange> sourcePrefixRanges,
-                                          ConnectionSourceType connectionSourceType, ImmutableList<Integer> sourcePorts,
-                                          ImmutableList<String> serverNames, String transportProtocol) {
+        ImmutableList<CidrRange> prefixRanges,
+        ImmutableList<String> applicationProtocols, ImmutableList<CidrRange> sourcePrefixRanges,
+        ConnectionSourceType connectionSourceType, ImmutableList<Integer> sourcePorts,
+        ImmutableList<String> serverNames, String transportProtocol) {
       return new AutoValue_EnvoyServerProtoData_FilterChainMatch(
           destinationPort, prefixRanges, applicationProtocols, sourcePrefixRanges,
           connectionSourceType, sourcePorts, serverNames, transportProtocol);
@@ -439,4 +439,4 @@ static FailurePercentageEjection create(
           enforcementPercentage, minimumHosts, requestVolume);
     }
   }
-}
+}

netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java

@@ -196,7 +196,6 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
   @VisibleForTesting
   static final class ClientSecurityHandler
       extends InternalProtocolNegotiators.ProtocolNegotiationHandler {
-
     private final GrpcHttp2ConnectionHandler grpcHandler;
     private final SslContextProviderSupplier sslContextProviderSupplier;
     private final String sni;
@@ -321,10 +320,10 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
       if (evt instanceof ProtocolNegotiationEvent) {
         ProtocolNegotiationEvent pne = (ProtocolNegotiationEvent)evt;
         SslContextProviderSupplier sslContextProviderSupplier = InternalProtocolNegotiationEvent
-            .getAttributes(pne).get(ATTR_SERVER_SSL_CONTEXT_PROVIDER_SUPPLIER);
+                .getAttributes(pne).get(ATTR_SERVER_SSL_CONTEXT_PROVIDER_SUPPLIER);
         if (sslContextProviderSupplier == null) {
           logger.log(Level.FINE, "No sslContextProviderSupplier found in filterChainMatch "
-                  + "for connection from {0} to {1}",
+              + "for connection from {0} to {1}",
               new Object[]{ctx.channel().remoteAddress(), ctx.channel().localAddress()});
           if (fallbackProtocolNegotiator == null) {
             ctx.fireExceptionCaught(new CertStoreException("No certificate source found!"));
@@ -406,7 +405,7 @@ public void onException(Throwable throwable) {
               ctx.fireExceptionCaught(throwable);
             }
           },
-              null);
+      null);
     }
   }
 }

xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java

@@ -49,13 +49,14 @@ final class CertProviderClientSslContextProvider extends CertProviderSslContextP
   private final String sniForSanMatching;
 
   CertProviderClientSslContextProvider(
-          Node node,
-          @Nullable Map<String, CertificateProviderInfo> certProviders,
-          CommonTlsContext.CertificateProviderInstance certInstance,
-          CommonTlsContext.CertificateProviderInstance rootCertInstance,
-          CertificateValidationContext staticCertValidationContext,
-          UpstreamTlsContext upstreamTlsContext,
-          String sniForSanMatching, CertificateProviderStore certificateProviderStore) {
+      Node node,
+      @Nullable Map<String, CertificateProviderInfo> certProviders,
+      CommonTlsContext.CertificateProviderInstance certInstance,
+      CommonTlsContext.CertificateProviderInstance rootCertInstance,
+      CertificateValidationContext staticCertValidationContext,
+      UpstreamTlsContext upstreamTlsContext,
+      String sniForSanMatching,
+      CertificateProviderStore certificateProviderStore) {
     super(
         node,
         certProviders,

xds/src/main/java/io/grpc/xds/internal/security/SecurityProtocolNegotiators.java

@@ -69,7 +69,7 @@ public XdsTrustManagerFactory(
   }
 
   public XdsTrustManagerFactory(Map<String, List<X509Certificate>> spiffeTrustMap,
-                                CertificateValidationContext staticCertificateValidationContext, String sniForSanMatching) throws CertStoreException {
+      CertificateValidationContext staticCertificateValidationContext, String sniForSanMatching) throws CertStoreException {
     this(spiffeTrustMap, staticCertificateValidationContext, true, sniForSanMatching);
   }
 
@@ -125,14 +125,14 @@ private static X509Certificate[] getTrustedCaFromCertContext(
 
   @VisibleForTesting
   static XdsX509TrustManager createX509TrustManager(
-          X509Certificate[] certs, CertificateValidationContext certContext, String sniForSanMatching) throws CertStoreException {
+      X509Certificate[] certs, CertificateValidationContext certContext, String sniForSanMatching) throws CertStoreException {
     return new XdsX509TrustManager(certContext, createTrustManager(certs), sniForSanMatching);
   }
 
   @VisibleForTesting
   static XdsX509TrustManager createX509TrustManager(
-          Map<String, List<X509Certificate>> spiffeTrustMapFile,
-          CertificateValidationContext certContext, String sniForSanMatching) throws CertStoreException {
+      Map<String, List<X509Certificate>> spiffeTrustMapFile,
+      CertificateValidationContext certContext, String sniForSanMatching) throws CertStoreException {
     checkNotNull(spiffeTrustMapFile, "spiffeTrustMapFile");
     Map<String, X509ExtendedTrustManager> delegates = new HashMap<>();
     for (Map.Entry<String, List<X509Certificate>> entry:spiffeTrustMapFile.entrySet()) {

xds/src/main/java/io/grpc/xds/internal/security/certprovider/CertProviderClientSslContextProvider.java

@@ -79,7 +79,7 @@ final class XdsX509TrustManager extends X509ExtendedTrustManager implements X509
   }
 
   XdsX509TrustManager(@Nullable CertificateValidationContext certContext,
-                      Map<String, X509ExtendedTrustManager> spiffeTrustMapDelegates, @Nullable String sniForSanMatching) {
+      Map<String, X509ExtendedTrustManager> spiffeTrustMapDelegates, @Nullable String sniForSanMatching) {
     checkNotNull(spiffeTrustMapDelegates, "spiffeTrustMapDelegates");
     this.spiffeTrustMapDelegates = ImmutableMap.copyOf(spiffeTrustMapDelegates);
     this.certContext = certContext;