Added needed getter builder methods to generated exceptions

Author: RanVaknin

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java

@@ -34,7 +34,10 @@ public static List<MethodSpec> builderInterfaceMethods(ClassName className) {
                 builderMethod(className, "requestId", String.class),
                 builderMethod(className, "statusCode", int.class),
                 builderMethod(className, "cause", Throwable.class),
-                builderMethod(className, "writableStackTrace", Boolean.class));
+                builderMethod(className, "writableStackTrace", Boolean.class),
+                builderMethod(className, "numAttempts", Integer.class),
+                builderGetterMethodInterface("numAttempts", Integer.class));
+
     }
 
     public static List<MethodSpec> builderImplMethods(ClassName className) {
@@ -44,7 +47,9 @@ public static List<MethodSpec> builderImplMethods(ClassName className) {
                 builderImplMethods(className, "requestId", String.class),
                 builderImplMethods(className, "statusCode", int.class),
                 builderImplMethods(className, "cause", Throwable.class),
-                builderImplMethods(className, "writableStackTrace", Boolean.class));
+                builderImplMethods(className, "writableStackTrace", Boolean.class),
+                builderImplMethods(className, "numAttempts", Integer.class),
+                builderImplGetterMethods("numAttempts", Integer.class));
     }
 
     private static MethodSpec builderMethod(ClassName className, String name, Class clazz) {
@@ -56,6 +61,14 @@ 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)
@@ -66,4 +79,13 @@ 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();
+    }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/baseserviceexception.java

@@ -100,7 +100,7 @@ public BuilderImpl numAttempts(Integer numAttempts) {
 
         @Override
         public Integer numAttempts() {
-            return this.numAttempts;
+            return numAttempts;
         }
 
         @Override

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/emptymodeledexception.java

@@ -70,6 +70,11 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, EmptyModeledE
 
         @Override
         Builder writableStackTrace(Boolean writableStackTrace);
+
+        @Override
+        Builder numAttempts(Integer numAttempts);
+
+        @Override Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonProtocolTestsException.BuilderImpl implements Builder {
@@ -116,6 +121,17 @@ public BuilderImpl writableStackTrace(Boolean writableStackTrace) {
             return this;
         }
 
+        @Override
+        public BuilderImpl numAttempts(Integer numAttempts) {
+            this.numAttempts = numAttempts;
+            return this;
+        }
+
+        @Override
+        public Integer numAttempts() {
+            return numAttempts;
+        }
+
         @Override
         public EmptyModeledException build() {
             return new EmptyModeledException(this);

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonserviceinternalservererrorexception.java

@@ -79,6 +79,12 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, JsonServiceIn
 
         @Override
         Builder writableStackTrace(Boolean writableStackTrace);
+
+        @Override
+        Builder numAttempts(Integer numAttempts);
+
+        @Override
+        Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonException.BuilderImpl implements Builder {
@@ -125,6 +131,17 @@ public BuilderImpl writableStackTrace(Boolean writableStackTrace) {
             return this;
         }
 
+        @Override
+        public BuilderImpl numAttempts(Integer numAttempts) {
+            this.numAttempts = numAttempts;
+            return this;
+        }
+
+        @Override
+        public Integer numAttempts() {
+            return numAttempts;
+        }
+
         @Override
         public JsonServiceInternalServerErrorException build() {
             return new JsonServiceInternalServerErrorException(this);

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonserviceinvalidinputexception.java

@@ -73,6 +73,12 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, JsonServiceIn
 
         @Override
         Builder writableStackTrace(Boolean writableStackTrace);
+
+        @Override
+        Builder numAttempts(Integer numAttempts);
+
+        @Override
+        Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonException.BuilderImpl implements Builder {
@@ -119,6 +125,17 @@ public BuilderImpl writableStackTrace(Boolean writableStackTrace) {
             return this;
         }
 
+        @Override
+        public BuilderImpl numAttempts(Integer numAttempts) {
+            this.numAttempts = numAttempts;
+            return this;
+        }
+
+        @Override
+        public Integer numAttempts() {
+            return numAttempts;
+        }
+
         @Override
         public JsonServiceInvalidInputException build() {
             return new JsonServiceInvalidInputException(this);

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/jsonservicethrottlingexception.java

@@ -83,6 +83,12 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, JsonServiceTh
 
         @Override
         Builder writableStackTrace(Boolean writableStackTrace);
+
+        @Override
+        Builder numAttempts(Integer numAttempts);
+
+        @Override
+        Integer numAttempts();
     }
 
     static final class BuilderImpl extends JsonException.BuilderImpl implements Builder {
@@ -129,6 +135,17 @@ public BuilderImpl writableStackTrace(Boolean writableStackTrace) {
             return this;
         }
 
+        @Override
+        public BuilderImpl numAttempts(Integer numAttempts) {
+            this.numAttempts = numAttempts;
+            return this;
+        }
+
+        @Override
+        public Integer numAttempts() {
+            return numAttempts;
+        }
+
         @Override
         public JsonServiceThrottlingException build() {
             return new JsonServiceThrottlingException(this);