More checkstyle fixes.

Author: JonathanHenson

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java

@@ -235,7 +235,8 @@ AwsCrtAsyncHttpClient.Builder tcpKeepAliveConfiguration(Consumer<TcpKeepAliveCon
      * Factory that allows more advanced configuration of the AWS CRT HTTP implementation. Use {@link #builder()} to
      * configure and construct an immutable instance of the factory.
      */
-    private static final class DefaultAsyncBuilder extends AwsCrtClientBuilderBase<AwsCrtAsyncHttpClient.Builder> implements Builder {
+    private static final class DefaultAsyncBuilder
+        extends AwsCrtClientBuilderBase<AwsCrtAsyncHttpClient.Builder> implements Builder {
 
         @Override
         public SdkAsyncHttpClient build() {

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClient.java

@@ -22,6 +22,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.crt.http.HttpClientConnectionManager;
 import software.amazon.awssdk.crt.http.HttpException;
 import software.amazon.awssdk.http.ExecutableHttpRequest;
@@ -32,8 +33,8 @@
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.http.crt.internal.AwsCrtClientBuilderBase;
 import software.amazon.awssdk.http.crt.internal.AwsCrtHttpClientBase;
-import software.amazon.awssdk.http.crt.internal.CrtRequestExecutor;
 import software.amazon.awssdk.http.crt.internal.CrtRequestContext;
+import software.amazon.awssdk.http.crt.internal.CrtRequestExecutor;
 import software.amazon.awssdk.metrics.NoOpMetricCollector;
 import software.amazon.awssdk.utils.AttributeMap;
 
@@ -51,6 +52,7 @@
  *}
  *
  */
+@SdkPublicApi
 public final class AwsCrtHttpClient extends AwsCrtHttpClientBase implements SdkHttpClient {
 
     private AwsCrtHttpClient(DefaultBuilder builder, AttributeMap config) {
@@ -260,10 +262,11 @@ AwsCrtHttpClient.Builder tcpKeepAliveConfiguration(Consumer<TcpKeepAliveConfigur
     }
 
     /**
-     * Factory that allows more advanced configuration of the AWS CRT HTTP implementation. Use {@link #builder()} to
-     * configure and construct an immutable instance of the factory.
+     * Factory that allows more advanced configuration of the AWS CRT HTTP implementation.
+     * Use {@link #builder()} to configure and construct an immutable instance of the factory.
      */
-    private static final class DefaultBuilder extends AwsCrtClientBuilderBase<AwsCrtHttpClient.Builder> implements AwsCrtHttpClient.Builder {
+    private static final class DefaultBuilder
+        extends AwsCrtClientBuilderBase<AwsCrtHttpClient.Builder> implements AwsCrtHttpClient.Builder {
 
 
         @Override

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtHttpClientBase.java

@@ -54,6 +54,7 @@ public abstract class AwsCrtHttpClientBase implements SdkAutoCloseable {
     private static final String AWS_COMMON_RUNTIME = "AwsCommonRuntime";
     private static final long DEFAULT_STREAM_WINDOW_SIZE = 16L * 1024L * 1024L; // 16 MB
 
+    protected final long readBufferSize;
     private final Map<URI, HttpClientConnectionManager> connectionPools = new ConcurrentHashMap<>();
     private final LinkedList<CrtResource> ownedSubResources = new LinkedList<>();
     private final ClientBootstrap bootstrap;
@@ -62,7 +63,6 @@ public abstract class AwsCrtHttpClientBase implements SdkAutoCloseable {
     private final HttpProxyOptions proxyOptions;
     private final HttpMonitoringOptions monitoringOptions;
     private final long maxConnectionIdleInMilliseconds;
-    protected final long readBufferSize;
     private final int maxConnectionsPerEndpoint;
     private boolean isClosed = false;
 
@@ -84,7 +84,8 @@ protected AwsCrtHttpClientBase(AwsCrtClientBuilderBase builder, AttributeMap con
             this.bootstrap = registerOwnedResource(clientBootstrap);
             this.socketOptions = registerOwnedResource(clientSocketOptions);
             this.tlsContext = registerOwnedResource(clientTlsContext);
-            this.readBufferSize = builder.getReadBufferSizeInBytes() == null ? DEFAULT_STREAM_WINDOW_SIZE : builder.getReadBufferSizeInBytes();
+            this.readBufferSize = builder.getReadBufferSizeInBytes() == null ?
+                                  DEFAULT_STREAM_WINDOW_SIZE : builder.getReadBufferSizeInBytes();
             this.maxConnectionsPerEndpoint = config.get(SdkHttpConfigurationOption.MAX_CONNECTIONS);
             this.monitoringOptions = resolveHttpMonitoringOptions(builder.getConnectionHealthConfiguration()).orElse(null);
             this.maxConnectionIdleInMilliseconds = config.get(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT).toMillis();

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/CrtRequestExecutor.java

@@ -54,9 +54,10 @@
 
 @SdkInternalApi
 public final class CrtRequestExecutor {
-    private static final Logger log = Logger.loggerFor(CrtRequestExecutor.class);
     public static final int CRT_TLS_NEGOTIATION_ERROR_CODE = 1029;
 
+    private static final Logger log = Logger.loggerFor(CrtRequestExecutor.class);
+
     public CompletableFuture<SdkHttpFullResponse> execute(CrtRequestContext executionContext) {
         // go ahead and get a reference to the metricCollector since multiple futures will
         // need it regardless.

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/request/CrtRequestInputStreamAdapter.java

@@ -26,12 +26,12 @@
 
 @SdkInternalApi
 final class CrtRequestInputStreamAdapter implements HttpRequestBodyStream {
+    private static final int READ_BUFFER_SIZE = 16 * 1024;
+
     private final ContentStreamProvider provider;
     private InputStream providerStream;
     private final byte[] readBuffer = new byte[READ_BUFFER_SIZE];
 
-    private static final int READ_BUFFER_SIZE = 16 * 1024;
-
     CrtRequestInputStreamAdapter(ContentStreamProvider provider) {
         this.provider = provider;
     }