Skip to content

Commit dc87509

Browse files
committed
Fix checkstyle errors and spotbug issue
1 parent bbbdcb1 commit dc87509

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

build-tools/src/main/java/software/amazon/awssdk/buildtools/findbugs/ToBuilderIsCorrect.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ private void validateBuilderConstructor(String buildableClassName, JavaClass bui
376376
}
377377

378378
// Find which fields we modified in those constructors
379-
Set<String> builderFieldsForBuilder = new HashSet<>(builderFields.get(builder));
379+
Set<String> builderFieldsForBuilder = new HashSet<>(builderFields.getOrDefault(builder, new ArrayList<>()));
380380
Map<String, List<String>> allConstructors = builderConstructorModifiedFields.get(builder);
381381

382382
allInvokedConstructors.forEach(constructorSignature -> {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
*
2828
*/
2929
@SdkPublicApi
30-
public final class ConnectionHealthConfiguration extends CrtConnectionHealthConfiguration implements ToCopyableBuilder<ConnectionHealthConfiguration.Builder, ConnectionHealthConfiguration> {
30+
public final class ConnectionHealthConfiguration extends CrtConnectionHealthConfiguration
31+
implements ToCopyableBuilder<ConnectionHealthConfiguration.Builder, ConnectionHealthConfiguration> {
3132

3233
private ConnectionHealthConfiguration(DefaultBuilder builder) {
3334
super(builder);
@@ -47,7 +48,8 @@ public Builder toBuilder() {
4748
*
4849
* <p>All implementations of this interface are mutable and not thread safe.</p>
4950
*/
50-
public interface Builder extends CrtConnectionHealthConfiguration.Builder, CopyableBuilder<Builder, ConnectionHealthConfiguration> {
51+
public interface Builder extends CrtConnectionHealthConfiguration.Builder,
52+
CopyableBuilder<Builder, ConnectionHealthConfiguration> {
5153

5254
@Override
5355
Builder minimumThroughputInBps(Long minimumThroughputInBps);
@@ -62,7 +64,8 @@ public interface Builder extends CrtConnectionHealthConfiguration.Builder, Copya
6264
/**
6365
* An SDK-internal implementation of {@link Builder}.
6466
*/
65-
private static final class DefaultBuilder extends CrtConnectionHealthConfiguration.DefaultBuilder<DefaultBuilder> implements Builder {
67+
private static final class DefaultBuilder extends
68+
CrtConnectionHealthConfiguration.DefaultBuilder<DefaultBuilder> implements Builder {
6669

6770
private DefaultBuilder() {
6871
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
* @see AwsCrtAsyncHttpClient.Builder#proxyConfiguration(ProxyConfiguration)
3030
*/
3131
@SdkPublicApi
32-
public final class ProxyConfiguration extends CrtProxyConfiguration implements ToCopyableBuilder<ProxyConfiguration.Builder, ProxyConfiguration> {
32+
public final class ProxyConfiguration extends CrtProxyConfiguration
33+
implements ToCopyableBuilder<ProxyConfiguration.Builder, ProxyConfiguration> {
3334

3435
private ProxyConfiguration(DefaultBuilder builder) {
3536
super(builder);

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919
import java.time.Duration;
2020
import software.amazon.awssdk.annotations.SdkInternalApi;
21-
import software.amazon.awssdk.crt.http.HttpMonitoringOptions;
22-
import software.amazon.awssdk.crt.http.HttpProxyOptions;
2321
import software.amazon.awssdk.crt.io.SocketOptions;
2422
import software.amazon.awssdk.crt.io.TlsCipherPreference;
25-
import software.amazon.awssdk.crt.io.TlsContext;
2623
import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
27-
import software.amazon.awssdk.http.crt.ConnectionHealthConfiguration;
28-
import software.amazon.awssdk.http.crt.ProxyConfiguration;
2924
import software.amazon.awssdk.http.crt.TcpKeepAliveConfiguration;
3025
import software.amazon.awssdk.utils.Logger;
3126
import software.amazon.awssdk.utils.NumericUtils;

0 commit comments

Comments
 (0)