chore: refactor withRetry to use withRetryAsync

Author: hsilan

sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java

@@ -751,7 +751,9 @@ <T> DurableFuture<T> waitForConditionAsync(
      * @param config retry configuration including the retry strategy and child context wrapping
      * @return the operation result
      */
-    <T> T withRetry(String name, WithRetry<T> operation, WithRetryConfig config);
+    default <T> T withRetry(String name, WithRetry<T> operation, WithRetryConfig config) {
+        return withRetryAsync(name, operation, config).get();
+    }
 
     /**
      * Replay-safe retry loop for any durable operation (anonymous form, sync).
@@ -766,7 +768,9 @@ <T> DurableFuture<T> waitForConditionAsync(
      * @param config retry configuration including the retry strategy and child context wrapping
      * @return the operation result
      */
-    <T> T withRetry(WithRetry<T> operation, WithRetryConfig config);
+    default <T> T withRetry(WithRetry<T> operation, WithRetryConfig config) {
+        return withRetryAsync(operation, config).get();
+    }
 
     /**
      * Replay-safe retry loop for any durable operation (named form, async).

sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java

@@ -399,55 +399,6 @@ public <T> DurableFuture<T> waitForConditionAsync(
     private static final String ANONYMOUS_CHILD_CONTEXT_NAME = "retry";
     private static final String ANONYMOUS_BACKOFF_PREFIX = "retry-backoff-";
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T withRetry(String name, WithRetry<T> operation, WithRetryConfig config) {
-        Objects.requireNonNull(name, "name cannot be null");
-        Objects.requireNonNull(operation, "operation cannot be null");
-        Objects.requireNonNull(config, "config cannot be null");
-
-        if (config.wrapInChildContext()) {
-            return (T) runInChildContextAsync(
-                            name,
-                            new TypeToken<Object>() {},
-                            childCtx -> executeRetryLoop(childCtx, name, operation, config),
-                            RunInChildContextConfig.builder().build(),
-                            OperationSubType.WITH_RETRY)
-                    .get();
-        }
-        return (T) runInVirtualChildContextAsync(
-                        name,
-                        new TypeToken<Object>() {},
-                        childCtx -> executeRetryLoop(childCtx, name, operation, config),
-                        RunInChildContextConfig.builder().build(),
-                        OperationSubType.WITH_RETRY)
-                .get();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T withRetry(WithRetry<T> operation, WithRetryConfig config) {
-        Objects.requireNonNull(operation, "operation cannot be null");
-        Objects.requireNonNull(config, "config cannot be null");
-
-        if (config.wrapInChildContext()) {
-            return (T) runInChildContextAsync(
-                            ANONYMOUS_CHILD_CONTEXT_NAME,
-                            new TypeToken<Object>() {},
-                            childCtx -> executeRetryLoop(childCtx, null, operation, config),
-                            RunInChildContextConfig.builder().build(),
-                            OperationSubType.WITH_RETRY)
-                    .get();
-        }
-        return (T) runInVirtualChildContextAsync(
-                        ANONYMOUS_CHILD_CONTEXT_NAME,
-                        new TypeToken<Object>() {},
-                        childCtx -> executeRetryLoop(childCtx, null, operation, config),
-                        RunInChildContextConfig.builder().build(),
-                        OperationSubType.WITH_RETRY)
-                .get();
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public <T> DurableFuture<T> withRetryAsync(String name, WithRetry<T> operation, WithRetryConfig config) {