Remove individual getters for refactored OperationContext record in execution manager.

Author: phipag

sdk/src/main/java/com/amazonaws/lambda/durable/execution/ExecutionManager.java

@@ -213,18 +213,6 @@ public OperationContext getCurrentContext() {
         return currentContext.get();
     }
 
-    /** Returns the ThreadType for the current thread, or null if not registered. */
-    public ThreadType getCurrentThreadType() {
-        var ctx = currentContext.get();
-        return ctx != null ? ctx.threadType() : null;
-    }
-
-    /** Returns the context ID for the current thread, or null if not registered. */
-    public String getCurrentContextId() {
-        var ctx = currentContext.get();
-        return ctx != null ? ctx.contextId() : null;
-    }
-
     public void deregisterActiveThread(String threadId) {
         // Skip if already suspended
         if (suspendExecutionFuture.isDone()) {

sdk/src/main/java/com/amazonaws/lambda/durable/operation/StepOperation.java

@@ -296,11 +296,10 @@ private void handleStepFailure(Throwable error, int attempt) {
     @Override
     public T get() {
         // Get current context from ThreadLocal (not thread name)
-        var currentContextId = executionManager.getCurrentContextId();
-        var currentThreadType = executionManager.getCurrentThreadType();
+        var currentContext = executionManager.getCurrentContext();
 
         // Nested steps are not supported - calling a step from within another step breaks replay consistency
-        if (currentThreadType == ThreadType.STEP) {
+        if (currentContext.threadType() == ThreadType.STEP) {
             throw new IllegalStateException("Nested step calling is not supported. Cannot call get() on step '" + name
                     + "' from within another step's execution.");
         }
@@ -314,15 +313,15 @@ public T get() {
             phaser.register();
 
             // Deregister current context - allows suspension
-            logger.debug("StepOperation.get() attempting to deregister context: {}", currentContextId);
-            executionManager.deregisterActiveThread(currentContextId);
+            logger.debug("StepOperation.get() attempting to deregister context: {}", currentContext.contextId());
+            executionManager.deregisterActiveThread(currentContext.contextId());
 
             // Block until operation completes
             logger.trace("Waiting for operation to finish {} (Phaser: {})", operationId, phaser);
             phaser.arriveAndAwaitAdvance(); // Wait for phase 0
 
             // Reactivate current context
-            executionManager.registerActiveThread(currentContextId, currentThreadType);
+            executionManager.registerActiveThread(currentContext.contextId(), currentContext.threadType());
 
             // Complete phase 1
             phaser.arriveAndDeregister();

sdk/src/main/java/com/amazonaws/lambda/durable/operation/WaitOperation.java

@@ -97,19 +97,18 @@ public Void get() {
             phaser.register();
 
             // Get current context from ThreadLocal
-            var currentContextId = executionManager.getCurrentContextId();
-            var currentThreadType = executionManager.getCurrentThreadType();
+            var currentContext = executionManager.getCurrentContext();
 
             // Deregister current thread - THIS is where suspension can happen!
             // If no other threads are active, this will throw SuspendExecutionException
-            executionManager.deregisterActiveThread(currentContextId);
+            executionManager.deregisterActiveThread(currentContext.contextId());
 
             // Complete the wait phaser immediately (we don't actually wait in Lambda)
             // The backend handles the wait duration
             phaser.arriveAndAwaitAdvance(); // Phase 0 -> 1
 
             // Reactivate current thread
-            executionManager.registerActiveThread(currentContextId, currentThreadType);
+            executionManager.registerActiveThread(currentContext.contextId(), currentContext.threadType());
 
             // Complete phase 1
             phaser.arriveAndDeregister();

sdk/src/test/java/com/amazonaws/lambda/durable/operation/StepOperationTest.java

@@ -6,6 +6,7 @@
 import static org.mockito.Mockito.*;
 
 import com.amazonaws.lambda.durable.execution.ExecutionManager;
+import com.amazonaws.lambda.durable.execution.OperationContext;
 import com.amazonaws.lambda.durable.execution.ThreadType;
 import com.amazonaws.lambda.durable.logging.DurableLogger;
 import com.amazonaws.lambda.durable.serde.JacksonSerDes;
@@ -19,7 +20,7 @@ void getThrowsIllegalStateExceptionWhenCalledFromStepContext() {
         var executionManager = mock(ExecutionManager.class);
         var phaser = new Phaser(1);
         when(executionManager.startPhaser(any())).thenReturn(phaser);
-        when(executionManager.getCurrentThreadType()).thenReturn(ThreadType.STEP);
+        when(executionManager.getCurrentContext()).thenReturn(new OperationContext("1-step", ThreadType.STEP));
 
         var operation = new StepOperation<>(
                 "1",
@@ -42,8 +43,7 @@ void getDoesNotThrowWhenCalledFromHandlerContext() {
         var phaser = new Phaser(1);
         phaser.arriveAndDeregister(); // Advance to phase 1 to skip blocking
         when(executionManager.startPhaser(any())).thenReturn(phaser);
-        when(executionManager.getCurrentThreadType()).thenReturn(ThreadType.CONTEXT);
-        when(executionManager.getCurrentContextId()).thenReturn("handler");
+        when(executionManager.getCurrentContext()).thenReturn(new OperationContext("handler", ThreadType.CONTEXT));
         when(executionManager.getOperation("1"))
                 .thenReturn(software.amazon.awssdk.services.lambda.model.Operation.builder()
                         .id("1")