Change retries 2.1 builder param to nullable (#6927)

dagnir · web-flow · commit 6e459be971f7 · 2026-04-30T13:06:57.000-07:00
This will allow us to better track opt-in behavior in the UA.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/AwsRetryStrategy.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/AwsRetryStrategy.java
@@ -82,7 +82,7 @@ public static RetryStrategy forRetryMode(RetryMode mode) {
      * @param newRetries2026Enabled Whether retries 2.1 behavior is enabled.
      * @return A retry strategy for the given retry mode.
      */
-    public static RetryStrategy forRetryMode(RetryMode mode, boolean newRetries2026Enabled) {
+    public static RetryStrategy forRetryMode(RetryMode mode, Boolean newRetries2026Enabled) {
         switch (mode) {
             case STANDARD:
                 return standardRetryStrategy(newRetries2026Enabled);
@@ -135,7 +135,7 @@ public static StandardRetryStrategy standardRetryStrategy() {
      * @param newRetries2026Enabled Whether retries 2.1 behavior is enabled.
      * @return A {@link StandardRetryStrategy} with AWS-specific conditions added.
      */
-    public static StandardRetryStrategy standardRetryStrategy(boolean newRetries2026Enabled) {
+    public static StandardRetryStrategy standardRetryStrategy(Boolean newRetries2026Enabled) {
         StandardRetryStrategy.Builder builder = SdkDefaultRetryStrategy.standardRetryStrategyBuilder(newRetries2026Enabled);
         return configure(builder, newRetries2026Enabled).build();
     }
@@ -167,7 +167,7 @@ public static AdaptiveRetryStrategy adaptiveRetryStrategy() {
      * @param newRetries2026Enabled Whether retries 2.1 behavior is enabled.
      * @return An {@link AdaptiveRetryStrategy} with AWS-specific conditions added.
      */
-    public static AdaptiveRetryStrategy adaptiveRetryStrategy(boolean newRetries2026Enabled) {
+    public static AdaptiveRetryStrategy adaptiveRetryStrategy(Boolean newRetries2026Enabled) {
         AdaptiveRetryStrategy.Builder builder = SdkDefaultRetryStrategy.adaptiveRetryStrategyBuilder(newRetries2026Enabled);
         return configure(builder, newRetries2026Enabled)
             .build();
@@ -191,9 +191,9 @@ public static AdaptiveRetryStrategy adaptiveRetryStrategy(boolean newRetries2026
      * @param <T>     The type of the builder extending {@link RetryStrategy.Builder}
      * @return The given builder
      */
-    private static <T extends RetryStrategy.Builder<T, ?>> T configure(T builder, boolean newRetries2026Enabled) {
+    private static <T extends RetryStrategy.Builder<T, ?>> T configure(T builder, Boolean newRetries2026Enabled) {
         builder.retryOnException(AwsRetryStrategy::retryOnAwsRetryableErrors);
-        if (newRetries2026Enabled) {
+        if (Boolean.TRUE.equals(newRetries2026Enabled)) {
             builder.retryOnException(AwsRetryStrategy::isLimitExceededErrorCode);
             builder.treatAsThrottling(AwsRetryStrategy::treatAsThrottlingV21);
         }
diff --git a/core/retries/src/main/java/software/amazon/awssdk/retries/AdaptiveRetryStrategy.java b/core/retries/src/main/java/software/amazon/awssdk/retries/AdaptiveRetryStrategy.java
@@ -71,17 +71,19 @@ static AdaptiveRetryStrategy.Builder builder() {
     /**
      * Create a new {@link AdaptiveRetryStrategy.Builder} with v2.0 or v2.1 retry constants.
      *
-     * @param retries2026Enabled when {@code true}, uses v2.1 constants (50ms base delay, differentiated token costs);
-     *                           when {@code false}, uses v2.0 constants (100ms base delay, uniform token costs)
+     * @param retries2026Enabled when {@code true}, uses v2.1 constants (50ms base delay, differentiated token costs); when
+     *                           {@code false}, uses v2.0 constants (100ms base delay, uniform token costs)
      */
-    static AdaptiveRetryStrategy.Builder builder(boolean retries2026Enabled) {
-        Duration baseDelay = retries2026Enabled ? DefaultRetryStrategy.Standard.BASE_DELAY_V21
-                                                : DefaultRetryStrategy.Standard.BASE_DELAY_V20;
-        int exceptionCost = retries2026Enabled ? DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V21
-                                               : DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V20;
+    static AdaptiveRetryStrategy.Builder builder(Boolean retries2026Enabled) {
+        boolean retries21 = Boolean.TRUE.equals(retries2026Enabled);
+
+        Duration baseDelay = retries21 ? DefaultRetryStrategy.Standard.BASE_DELAY_V21
+                                       : DefaultRetryStrategy.Standard.BASE_DELAY_V20;
+        int exceptionCost = retries21 ? DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V21
+                                      : DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V20;
         // v2.0 does not treat throttling exceptions differently from others
-        int throttlingCost = retries2026Enabled ? DefaultRetryStrategy.Standard.THROTTLING_EXCEPTION_TOKEN_COST_V21
-                                                : exceptionCost;
+        int throttlingCost = retries21 ? DefaultRetryStrategy.Standard.THROTTLING_EXCEPTION_TOKEN_COST_V21
+                                       : exceptionCost;
         return DefaultAdaptiveRetryStrategy
             .builder()
             .maxAttempts(DefaultRetryStrategy.Adaptive.MAX_ATTEMPTS)
diff --git a/core/retries/src/main/java/software/amazon/awssdk/retries/DefaultRetryStrategy.java b/core/retries/src/main/java/software/amazon/awssdk/retries/DefaultRetryStrategy.java
@@ -67,7 +67,7 @@ public static StandardRetryStrategy.Builder standardStrategyBuilder() {
      *
      * @param retries2026Enabled Whether retries 2.1 behavior is used.
      */
-    public static StandardRetryStrategy.Builder standardStrategyBuilder(boolean retries2026Enabled) {
+    public static StandardRetryStrategy.Builder standardStrategyBuilder(Boolean retries2026Enabled) {
         return StandardRetryStrategy.builder(retries2026Enabled);
     }
 
@@ -117,7 +117,7 @@ public static AdaptiveRetryStrategy.Builder adaptiveStrategyBuilder() {
      *
      * @param retries2026Enabled Whether retries 2.1 behavior is used.
      */
-    public static AdaptiveRetryStrategy.Builder adaptiveStrategyBuilder(boolean retries2026Enabled) {
+    public static AdaptiveRetryStrategy.Builder adaptiveStrategyBuilder(Boolean retries2026Enabled) {
         return AdaptiveRetryStrategy.builder(retries2026Enabled);
     }
 
diff --git a/core/retries/src/main/java/software/amazon/awssdk/retries/StandardRetryStrategy.java b/core/retries/src/main/java/software/amazon/awssdk/retries/StandardRetryStrategy.java
@@ -63,17 +63,19 @@ static Builder builder() {
     /**
      * Create a new {@link StandardRetryStrategy.Builder} with v2.0 or v2.1 retry constants.
      *
-     * @param retries2026Enabled when {@code true}, uses v2.1 constants (50ms base delay, differentiated token costs);
-     *                           when {@code false}, uses v2.0 constants (100ms base delay, uniform token costs)
+     * @param retries2026Enabled when {@code true}, uses v2.1 constants (50ms base delay, differentiated token costs); when
+     *                           {@code false}, uses v2.0 constants (100ms base delay, uniform token costs)
      */
-    static Builder builder(boolean retries2026Enabled) {
-        Duration baseDelay = retries2026Enabled ? DefaultRetryStrategy.Standard.BASE_DELAY_V21
-                                                : DefaultRetryStrategy.Standard.BASE_DELAY_V20;
-        int exceptionCost = retries2026Enabled ? DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V21
-                                               : DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V20;
+    static Builder builder(Boolean retries2026Enabled) {
+        boolean retries21 = Boolean.TRUE.equals(retries2026Enabled);
+
+        Duration baseDelay = retries21 ? DefaultRetryStrategy.Standard.BASE_DELAY_V21
+                                       : DefaultRetryStrategy.Standard.BASE_DELAY_V20;
+        int exceptionCost = retries21 ? DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V21
+                                      : DefaultRetryStrategy.Standard.DEFAULT_EXCEPTION_TOKEN_COST_V20;
         // v2.0 does not treat throttling exceptions differently from others
-        int throttlingCost = retries2026Enabled ? DefaultRetryStrategy.Standard.THROTTLING_EXCEPTION_TOKEN_COST_V21
-                                                : exceptionCost;
+        int throttlingCost = retries21 ? DefaultRetryStrategy.Standard.THROTTLING_EXCEPTION_TOKEN_COST_V21
+                                       : exceptionCost;
         return DefaultStandardRetryStrategy
             .builder()
             .retries2026Enabled(retries2026Enabled)
diff --git a/core/retries/src/main/java/software/amazon/awssdk/retries/internal/DefaultStandardRetryStrategy.java b/core/retries/src/main/java/software/amazon/awssdk/retries/internal/DefaultStandardRetryStrategy.java
@@ -30,7 +30,7 @@ public final class DefaultStandardRetryStrategy
     extends BaseRetryStrategy implements StandardRetryStrategy {
     private static final Logger LOG = Logger.loggerFor(DefaultStandardRetryStrategy.class);
     private static final Duration FIVE_SECONDS = Duration.ofSeconds(5);
-    private final boolean retries2026Enabled;
+    private final Boolean retries2026Enabled;
 
     DefaultStandardRetryStrategy(Builder builder) {
         super(LOG, builder);
@@ -48,7 +48,7 @@ public static Builder builder() {
 
     @Override
     protected Duration computeAcquireFailureBackoff(RefreshRetryTokenRequest request) {
-        if (!retries2026Enabled || !request.isLongPolling()) {
+        if (!isRetries2026Enabled() || !request.isLongPolling()) {
             return super.computeAcquireFailureBackoff(request);
         }
 
@@ -60,7 +60,7 @@ protected Duration computeAcquireFailureBackoff(RefreshRetryTokenRequest request
 
     @Override
     protected Duration computeBackoff(RefreshRetryTokenRequest request, DefaultRetryToken token) {
-        if (!retries2026Enabled) {
+        if (!isRetries2026Enabled()) {
             return super.computeBackoff(request, token);
         }
 
@@ -90,8 +90,12 @@ protected Duration computeBackoff(RefreshRetryTokenRequest request, DefaultRetry
         return backoff;
     }
 
+    private boolean isRetries2026Enabled() {
+        return Boolean.TRUE.equals(retries2026Enabled);
+    }
+
     public static class Builder extends BaseRetryStrategy.Builder implements StandardRetryStrategy.Builder {
-        private boolean retries2026Enabled;
+        private Boolean retries2026Enabled;
 
         Builder() {
         }
@@ -160,7 +164,7 @@ public Builder useClientDefaults(boolean useClientDefaults) {
         /**
          * Whether retries 2.1 behavior is enabled.
          */
-        public Builder retries2026Enabled(boolean retries2026Enabled) {
+        public Builder retries2026Enabled(Boolean retries2026Enabled) {
             this.retries2026Enabled = retries2026Enabled;
             return this;
         }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static StandardRetryStrategy.Builder standardStrategyBuilder() {`
`67`	`67`	`*`
`68`	`68`	`* @param retries2026Enabled Whether retries 2.1 behavior is used.`
`69`	`69`	`*/`
`70`		`- public static StandardRetryStrategy.Builder standardStrategyBuilder(boolean retries2026Enabled) {`
	`70`	`+ public static StandardRetryStrategy.Builder standardStrategyBuilder(Boolean retries2026Enabled) {`
`71`	`71`	`return StandardRetryStrategy.builder(retries2026Enabled);`
`72`	`72`	`}`
`73`	`73`
`@@ -117,7 +117,7 @@ public static AdaptiveRetryStrategy.Builder adaptiveStrategyBuilder() {`
`117`	`117`	`*`
`118`	`118`	`* @param retries2026Enabled Whether retries 2.1 behavior is used.`
`119`	`119`	`*/`
`120`		`- public static AdaptiveRetryStrategy.Builder adaptiveStrategyBuilder(boolean retries2026Enabled) {`
	`120`	`+ public static AdaptiveRetryStrategy.Builder adaptiveStrategyBuilder(Boolean retries2026Enabled) {`
`121`	`121`	`return AdaptiveRetryStrategy.builder(retries2026Enabled);`
`122`	`122`	`}`
`123`	`123`