From a9d8330368e83a822e71e4303da24e1cf89bef3b Mon Sep 17 00:00:00 2001
From: Frank Chen <frankchn@amazon.com>
Date: Thu, 19 Mar 2026 19:57:04 -0700
Subject: [PATCH] move classes

---
 .../lambda/durable/DurableExecutionCheckpointTest.java     | 1 +
 .../lambda/durable/testing/LocalDurableTestRunner.java     | 2 +-
 .../software/amazon/lambda/durable/CallbackConfig.java     | 2 +-
 .../software/amazon/lambda/durable/DurableContext.java     | 1 +
 .../software/amazon/lambda/durable/DurableHandler.java     | 1 +
 .../java/software/amazon/lambda/durable/StepContext.java   | 2 ++
 .../amazon/lambda/durable/{ => context}/BaseContext.java   | 3 ++-
 .../amazon/lambda/durable/context/BaseContextImpl.java     | 1 -
 .../amazon/lambda/durable/context/DurableContextImpl.java  | 2 +-
 .../amazon/lambda/durable/context/StepContextImpl.java     | 1 -
 .../lambda/durable/{ => execution}/DurableExecutor.java    | 7 ++++---
 .../amazon/lambda/durable/retry/RetryStrategies.java       | 2 +-
 .../amazon/lambda/durable/retry/WaitStrategies.java        | 2 +-
 .../durable/{validation => util}/ParameterValidator.java   | 2 +-
 .../amazon/lambda/durable/DurableExecutionTest.java        | 1 +
 .../amazon/lambda/durable/DurableExecutionWrapperTest.java | 1 +
 .../lambda/durable/validation/ParameterValidatorTest.java  | 1 +
 17 files changed, 20 insertions(+), 12 deletions(-)
 rename sdk/src/main/java/software/amazon/lambda/durable/{ => context}/BaseContext.java (92%)
 rename sdk/src/main/java/software/amazon/lambda/durable/{ => execution}/DurableExecutor.java (97%)
 rename sdk/src/main/java/software/amazon/lambda/durable/{validation => util}/ParameterValidator.java (99%)

diff --git a/sdk-integration-tests/src/test/java/software/amazon/lambda/durable/DurableExecutionCheckpointTest.java b/sdk-integration-tests/src/test/java/software/amazon/lambda/durable/DurableExecutionCheckpointTest.java
index a4b112acf..1662beb34 100644
--- a/sdk-integration-tests/src/test/java/software/amazon/lambda/durable/DurableExecutionCheckpointTest.java
+++ b/sdk-integration-tests/src/test/java/software/amazon/lambda/durable/DurableExecutionCheckpointTest.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.services.lambda.model.*;
+import software.amazon.lambda.durable.execution.DurableExecutor;
 import software.amazon.lambda.durable.model.DurableExecutionInput;
 import software.amazon.lambda.durable.model.ExecutionStatus;
 import software.amazon.lambda.durable.testing.LocalMemoryExecutionClient;
diff --git a/sdk-testing/src/main/java/software/amazon/lambda/durable/testing/LocalDurableTestRunner.java b/sdk-testing/src/main/java/software/amazon/lambda/durable/testing/LocalDurableTestRunner.java
index fa6f63226..864e0391d 100644
--- a/sdk-testing/src/main/java/software/amazon/lambda/durable/testing/LocalDurableTestRunner.java
+++ b/sdk-testing/src/main/java/software/amazon/lambda/durable/testing/LocalDurableTestRunner.java
@@ -15,9 +15,9 @@
 import software.amazon.awssdk.services.lambda.model.OperationType;
 import software.amazon.lambda.durable.DurableConfig;
 import software.amazon.lambda.durable.DurableContext;
-import software.amazon.lambda.durable.DurableExecutor;
 import software.amazon.lambda.durable.DurableHandler;
 import software.amazon.lambda.durable.TypeToken;
+import software.amazon.lambda.durable.execution.DurableExecutor;
 import software.amazon.lambda.durable.model.DurableExecutionInput;
 import software.amazon.lambda.durable.model.ExecutionStatus;
 import software.amazon.lambda.durable.serde.JacksonSerDes;
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/CallbackConfig.java b/sdk/src/main/java/software/amazon/lambda/durable/CallbackConfig.java
index 3cb8d2fda..9cb859aee 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/CallbackConfig.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/CallbackConfig.java
@@ -4,7 +4,7 @@
 
 import java.time.Duration;
 import software.amazon.lambda.durable.serde.SerDes;
-import software.amazon.lambda.durable.validation.ParameterValidator;
+import software.amazon.lambda.durable.util.ParameterValidator;
 
 /** Configuration for callback operations. */
 public class CallbackConfig {
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java b/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java
index ffefc6e11..79ebda106 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/DurableContext.java
@@ -8,6 +8,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import software.amazon.lambda.durable.context.BaseContext;
 import software.amazon.lambda.durable.model.MapResult;
 import software.amazon.lambda.durable.model.WaitForConditionResult;
 
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/DurableHandler.java b/sdk/src/main/java/software/amazon/lambda/durable/DurableHandler.java
index a9acc3b82..af3a5c3e3 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/DurableHandler.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/DurableHandler.java
@@ -10,6 +10,7 @@
 import java.lang.reflect.ParameterizedType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.lambda.durable.execution.DurableExecutor;
 import software.amazon.lambda.durable.model.DurableExecutionInput;
 import software.amazon.lambda.durable.serde.DurableInputOutputSerDes;
 
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/StepContext.java b/sdk/src/main/java/software/amazon/lambda/durable/StepContext.java
index 548e335c1..35e24b6fa 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/StepContext.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/StepContext.java
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package software.amazon.lambda.durable;
 
+import software.amazon.lambda.durable.context.BaseContext;
+
 public interface StepContext extends BaseContext {
     /** Returns the current retry attempt number (0-based). */
     int getAttempt();
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/BaseContext.java b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java
similarity index 92%
rename from sdk/src/main/java/software/amazon/lambda/durable/BaseContext.java
rename to sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java
index 0874e75c9..274b31a79 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/BaseContext.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContext.java
@@ -1,8 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-package software.amazon.lambda.durable;
+package software.amazon.lambda.durable.context;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import software.amazon.lambda.durable.DurableConfig;
 import software.amazon.lambda.durable.logging.DurableLogger;
 
 public interface BaseContext extends AutoCloseable {
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java
index 67fe56834..2cee25d09 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/BaseContextImpl.java
@@ -3,7 +3,6 @@
 package software.amazon.lambda.durable.context;
 
 import com.amazonaws.services.lambda.runtime.Context;
-import software.amazon.lambda.durable.BaseContext;
 import software.amazon.lambda.durable.DurableConfig;
 import software.amazon.lambda.durable.execution.ExecutionManager;
 import software.amazon.lambda.durable.execution.SuspendExecutionException;
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java b/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java
index 78cb1f5ab..e4bb6531c 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/DurableContextImpl.java
@@ -45,7 +45,7 @@
 import software.amazon.lambda.durable.operation.WaitForConditionOperation;
 import software.amazon.lambda.durable.operation.WaitOperation;
 import software.amazon.lambda.durable.util.CompletedDurableFuture;
-import software.amazon.lambda.durable.validation.ParameterValidator;
+import software.amazon.lambda.durable.util.ParameterValidator;
 
 /**
  * User-facing API for defining durable operations within a workflow.
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java b/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java
index 874c5dce1..af5c9222a 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/context/StepContextImpl.java
@@ -4,7 +4,6 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import org.slf4j.LoggerFactory;
-import software.amazon.lambda.durable.BaseContext;
 import software.amazon.lambda.durable.DurableConfig;
 import software.amazon.lambda.durable.StepContext;
 import software.amazon.lambda.durable.execution.ExecutionManager;
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/DurableExecutor.java b/sdk/src/main/java/software/amazon/lambda/durable/execution/DurableExecutor.java
similarity index 97%
rename from sdk/src/main/java/software/amazon/lambda/durable/DurableExecutor.java
rename to sdk/src/main/java/software/amazon/lambda/durable/execution/DurableExecutor.java
index 415f26428..c7d0c490c 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/DurableExecutor.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/execution/DurableExecutor.java
@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-package software.amazon.lambda.durable;
+package software.amazon.lambda.durable.execution;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
@@ -14,12 +14,13 @@
 import software.amazon.awssdk.services.lambda.model.OperationAction;
 import software.amazon.awssdk.services.lambda.model.OperationType;
 import software.amazon.awssdk.services.lambda.model.OperationUpdate;
+import software.amazon.lambda.durable.DurableConfig;
+import software.amazon.lambda.durable.DurableContext;
+import software.amazon.lambda.durable.TypeToken;
 import software.amazon.lambda.durable.context.DurableContextImpl;
 import software.amazon.lambda.durable.exception.DurableOperationException;
 import software.amazon.lambda.durable.exception.IllegalDurableOperationException;
 import software.amazon.lambda.durable.exception.UnrecoverableDurableExecutionException;
-import software.amazon.lambda.durable.execution.ExecutionManager;
-import software.amazon.lambda.durable.execution.SuspendExecutionException;
 import software.amazon.lambda.durable.model.DurableExecutionInput;
 import software.amazon.lambda.durable.model.DurableExecutionOutput;
 import software.amazon.lambda.durable.serde.SerDes;
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/retry/RetryStrategies.java b/sdk/src/main/java/software/amazon/lambda/durable/retry/RetryStrategies.java
index 5020f0b5d..6ff2294e6 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/retry/RetryStrategies.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/retry/RetryStrategies.java
@@ -3,7 +3,7 @@
 package software.amazon.lambda.durable.retry;
 
 import java.time.Duration;
-import software.amazon.lambda.durable.validation.ParameterValidator;
+import software.amazon.lambda.durable.util.ParameterValidator;
 
 /**
  * Factory class for creating common retry strategies.
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/retry/WaitStrategies.java b/sdk/src/main/java/software/amazon/lambda/durable/retry/WaitStrategies.java
index 29da44a16..565f49e84 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/retry/WaitStrategies.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/retry/WaitStrategies.java
@@ -4,7 +4,7 @@
 
 import java.time.Duration;
 import software.amazon.lambda.durable.exception.WaitForConditionException;
-import software.amazon.lambda.durable.validation.ParameterValidator;
+import software.amazon.lambda.durable.util.ParameterValidator;
 
 /**
  * Factory class for creating common {@link WaitForConditionWaitStrategy} implementations.
diff --git a/sdk/src/main/java/software/amazon/lambda/durable/validation/ParameterValidator.java b/sdk/src/main/java/software/amazon/lambda/durable/util/ParameterValidator.java
similarity index 99%
rename from sdk/src/main/java/software/amazon/lambda/durable/validation/ParameterValidator.java
rename to sdk/src/main/java/software/amazon/lambda/durable/util/ParameterValidator.java
index 97222a804..8f948ee2f 100644
--- a/sdk/src/main/java/software/amazon/lambda/durable/validation/ParameterValidator.java
+++ b/sdk/src/main/java/software/amazon/lambda/durable/util/ParameterValidator.java
@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-package software.amazon.lambda.durable.validation;
+package software.amazon.lambda.durable.util;
 
 import java.time.Duration;
 import java.util.Collection;
diff --git a/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionTest.java b/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionTest.java
index 95e9e9202..3b966cdbd 100644
--- a/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionTest.java
+++ b/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionTest.java
@@ -19,6 +19,7 @@
 import software.amazon.awssdk.services.lambda.model.OperationStatus;
 import software.amazon.awssdk.services.lambda.model.OperationType;
 import software.amazon.awssdk.services.lambda.model.StepDetails;
+import software.amazon.lambda.durable.execution.DurableExecutor;
 import software.amazon.lambda.durable.model.DurableExecutionInput;
 import software.amazon.lambda.durable.model.ExecutionStatus;
 
diff --git a/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionWrapperTest.java b/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionWrapperTest.java
index 5f63f2a67..ac9bfdd7a 100644
--- a/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionWrapperTest.java
+++ b/sdk/src/test/java/software/amazon/lambda/durable/DurableExecutionWrapperTest.java
@@ -15,6 +15,7 @@
 import software.amazon.awssdk.services.lambda.model.OperationStatus;
 import software.amazon.awssdk.services.lambda.model.OperationType;
 import software.amazon.lambda.durable.client.DurableExecutionClient;
+import software.amazon.lambda.durable.execution.DurableExecutor;
 import software.amazon.lambda.durable.model.DurableExecutionInput;
 import software.amazon.lambda.durable.model.DurableExecutionOutput;
 import software.amazon.lambda.durable.model.ExecutionStatus;
diff --git a/sdk/src/test/java/software/amazon/lambda/durable/validation/ParameterValidatorTest.java b/sdk/src/test/java/software/amazon/lambda/durable/validation/ParameterValidatorTest.java
index ad281fe9a..8387fbdf6 100644
--- a/sdk/src/test/java/software/amazon/lambda/durable/validation/ParameterValidatorTest.java
+++ b/sdk/src/test/java/software/amazon/lambda/durable/validation/ParameterValidatorTest.java
@@ -15,6 +15,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.junit.jupiter.api.Test;
+import software.amazon.lambda.durable.util.ParameterValidator;
 
 class ParameterValidatorTest {