Removing builder getters from codegen and child exception classes

RanVaknin · RanVaknin · commit 5899b24f19bc · 2025-02-13T21:36:35.000-08:00
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java
@@ -35,8 +35,7 @@ public static List<MethodSpec> builderInterfaceMethods(ClassName className) {
                 builderMethod(className, "statusCode", int.class),
                 builderMethod(className, "cause", Throwable.class),
                 builderMethod(className, "writableStackTrace", Boolean.class),
-                builderMethod(className, "numAttempts", Integer.class),
-                builderGetterMethodInterface("numAttempts", Integer.class));
+                builderMethod(className, "numAttempts", Integer.class));
 
     }
 
@@ -48,8 +47,7 @@ public static List<MethodSpec> builderImplMethods(ClassName className) {
                 builderImplMethods(className, "statusCode", int.class),
                 builderImplMethods(className, "cause", Throwable.class),
                 builderImplMethods(className, "writableStackTrace", Boolean.class),
-                builderImplMethods(className, "numAttempts", Integer.class),
-                builderImplGetterMethods("numAttempts", Integer.class));
+                builderImplMethods(className, "numAttempts", Integer.class));
     }
 
     private static MethodSpec builderMethod(ClassName className, String name, Class clazz) {
@@ -61,14 +59,6 @@ private static MethodSpec builderMethod(ClassName className, String name, Class
                 .build();
     }
 
-    private static MethodSpec builderGetterMethodInterface(String name, Class clazz) {
-        return MethodSpec.methodBuilder(name)
-                .addAnnotation(Override.class)
-                .returns(clazz)
-                .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
-                .build();
-    }
-
     private static MethodSpec builderImplMethods(ClassName className, String name, Class clazz) {
         return MethodSpec.methodBuilder(name)
                 .addAnnotation(Override.class)
@@ -79,13 +69,4 @@ private static MethodSpec builderImplMethods(ClassName className, String name, C
                 .addStatement("return this")
                 .build();
     }
-
-    private static MethodSpec builderImplGetterMethods(String name, Class clazz) {
-        return MethodSpec.methodBuilder(name)
-                         .addAnnotation(Override.class)
-                         .returns(clazz)
-                         .addModifiers(Modifier.PUBLIC)
-                         .addStatement("return " + name)
-                         .build();
-    }
 }
diff --git a/codegen/src/main/resources/software/amazon/awssdk/codegen/rules/SourceException.java.resource b/codegen/src/main/resources/software/amazon/awssdk/codegen/rules/SourceException.java.resource
@@ -26,9 +26,6 @@ public class SourceException extends SdkException {
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     public static class BuilderImpl extends SdkException.BuilderImpl implements Builder {
@@ -60,10 +57,5 @@ public class SourceException extends SdkException {
             super.numAttempts(numAttempts);
             return this;
         }
-
-        @Override
-        public Integer numAttempts() {
-            return super.numAttempts();
-        }
     }
 }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/baseserviceexception.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/baseserviceexception.java
@@ -43,9 +43,6 @@ public interface Builder extends AwsServiceException.Builder {
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     protected static class BuilderImpl extends AwsServiceException.BuilderImpl implements Builder {
@@ -98,11 +95,6 @@ public BuilderImpl numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public JsonProtocolTestsException build() {
             return new JsonProtocolTestsException(this);
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/emptymodeledexception.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/emptymodeledexception.java
@@ -73,8 +73,6 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, EmptyModeledE
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonProtocolTestsException.BuilderImpl implements Builder {
@@ -127,11 +125,6 @@ public BuilderImpl numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public EmptyModeledException build() {
             return new EmptyModeledException(this);
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonserviceinternalservererrorexception.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonserviceinternalservererrorexception.java
@@ -82,9 +82,6 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, JsonServiceIn
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonException.BuilderImpl implements Builder {
@@ -137,11 +134,6 @@ public BuilderImpl numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public JsonServiceInternalServerErrorException build() {
             return new JsonServiceInternalServerErrorException(this);
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonserviceinvalidinputexception.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonserviceinvalidinputexception.java
@@ -76,9 +76,6 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, JsonServiceIn
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonException.BuilderImpl implements Builder {
@@ -131,11 +128,6 @@ public BuilderImpl numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public JsonServiceInvalidInputException build() {
             return new JsonServiceInvalidInputException(this);
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonservicethrottlingexception.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonservicethrottlingexception.java
@@ -86,9 +86,6 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, JsonServiceTh
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonException.BuilderImpl implements Builder {
@@ -141,11 +138,6 @@ public BuilderImpl numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public JsonServiceThrottlingException build() {
             return new JsonServiceThrottlingException(this);
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java
@@ -188,9 +188,6 @@ public interface Builder extends SdkServiceException.Builder {
         @Override
         Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         Builder cause(Throwable t);
 
@@ -262,11 +259,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public Builder cause(Throwable cause) {
             this.cause = cause;
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java
@@ -88,7 +88,7 @@ public void exceptionMessage_withoutExtendedRequestId() {
 
     @ParameterizedTest
     @MethodSource("exceptionMessageTestCases")
-    void exceptionMessageTests(int numAttempts, String expectedMessage) {
+    void exceptionMessageTests(Integer numAttempts, String expectedMessage) {
         AwsServiceException e = AwsServiceException.builder()
                                                    .message("errorMessage")
                                                    .numAttempts(numAttempts)
@@ -114,7 +114,7 @@ private static Stream<Arguments> exceptionMessageTestCases() {
                 3,
                 "errorMessage (Service: serviceName, Status Code: 500, Request ID: requestId) (SDK Attempt Count: 3)"),
             Arguments.of(
-                0,
+                null,
                 "errorMessage (Service: serviceName, Status Code: 500, Request ID: requestId)")
         );
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryFailedException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryFailedException.java
@@ -61,9 +61,6 @@ public interface Builder extends SdkClientException.Builder {
         @Override
         Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         EndpointDiscoveryFailedException build();
     }
@@ -101,11 +98,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public EndpointDiscoveryFailedException build() {
             return new EndpointDiscoveryFailedException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/AbortedException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/AbortedException.java
@@ -62,9 +62,6 @@ public interface Builder extends SdkClientException.Builder {
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
@@ -100,11 +97,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public AbortedException build() {
             return new AbortedException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallAttemptTimeoutException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallAttemptTimeoutException.java
@@ -64,9 +64,6 @@ public interface Builder extends SdkClientException.Builder {
         @Override
         ApiCallAttemptTimeoutException.Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         ApiCallAttemptTimeoutException build();
     }
@@ -104,11 +101,6 @@ public ApiCallAttemptTimeoutException.Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public ApiCallAttemptTimeoutException build() {
             return new ApiCallAttemptTimeoutException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallTimeoutException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallTimeoutException.java
@@ -64,9 +64,6 @@ public interface Builder extends SdkClientException.Builder {
         @Override
         Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         ApiCallTimeoutException build();
     }
@@ -104,11 +101,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public ApiCallTimeoutException build() {
             return new ApiCallTimeoutException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/Crc32MismatchException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/Crc32MismatchException.java
@@ -64,9 +64,6 @@ public interface Builder extends SdkClientException.Builder {
         @Override
         Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         Crc32MismatchException build();
     }
@@ -104,11 +101,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public Crc32MismatchException build() {
             return new Crc32MismatchException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/NonRetryableException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/NonRetryableException.java
@@ -66,9 +66,6 @@ public interface Builder extends SdkClientException.Builder {
         @Override
         Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         NonRetryableException build();
     }
@@ -116,11 +113,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public NonRetryableException build() {
             return new NonRetryableException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/RetryableException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/RetryableException.java
@@ -66,9 +66,6 @@ public interface Builder extends SdkClientException.Builder {
         @Override
         Builder numAttempts(Integer numAttempts);
 
-        @Override
-        Integer numAttempts();
-
         @Override
         RetryableException build();
     }
@@ -106,11 +103,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public RetryableException build() {
             return new RetryableException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkClientException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkClientException.java
@@ -90,9 +90,6 @@ public interface Builder extends SdkException.Builder {
 
         @Override
         Builder numAttempts(Integer numAttempts);
-
-        @Override
-        Integer numAttempts();
     }
 
     protected static class BuilderImpl extends SdkException.BuilderImpl implements Builder {
@@ -128,11 +125,6 @@ public Builder numAttempts(Integer numAttempts) {
             return this;
         }
 
-        @Override
-        public Integer numAttempts() {
-            return numAttempts;
-        }
-
         @Override
         public SdkClientException build() {
             return new SdkClientException(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkServiceException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkServiceException.java
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@ public class SourceException extends SdkException {`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`Builder numAttempts(Integer numAttempts);`
`29`		`-`
`30`		`- @Override`
`31`		`- Integer numAttempts();`
`32`	`29`	`}`
`33`	`30`
`34`	`31`	`public static class BuilderImpl extends SdkException.BuilderImpl implements Builder {`
`@@ -60,10 +57,5 @@ public class SourceException extends SdkException {`
`60`	`57`	`super.numAttempts(numAttempts);`
`61`	`58`	`return this;`
`62`	`59`	`}`
`63`		`-`
`64`		`- @Override`
`65`		`- public Integer numAttempts() {`
`66`		`- return super.numAttempts();`
`67`		`- }`
`68`	`60`	`}`
`69`	`61`	`}`