refined implementation and addressed feedback

Author: bachuv

client/src/main/java/com/microsoft/durabletask/AbstractTaskEntity.java

@@ -329,6 +329,7 @@ private static Object invokeMethodDirect(
         }
 
         try {
+            makeDeclaringClassAccessible(method);
             return method.invoke(target, args);
         } catch (InvocationTargetException e) {
             Throwable cause = e.getTargetException();
@@ -421,6 +422,7 @@ private static Object invokeMethod(Method method, Object target, TaskEntityOpera
         }
 
         try {
+            makeDeclaringClassAccessible(method);
             return method.invoke(target, args);
         } catch (InvocationTargetException e) {
             // Unwrap the target exception
@@ -431,4 +433,10 @@ private static Object invokeMethod(Method method, Object target, TaskEntityOpera
             throw new RuntimeException(cause);
         }
     }
+
+    private static void makeDeclaringClassAccessible(Method method) {
+        if (!Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
+            method.setAccessible(true);
+        }
+    }
 }

client/src/test/java/com/microsoft/durabletask/TaskEntityTest.java

@@ -42,6 +42,23 @@ protected Class<Integer> getStateType() {
         }
     }
 
+    /** A non-public entity implementation, matching internal feature entities. */
+    private static class PrivateEntity extends AbstractTaskEntity<String> {
+        public String get() {
+            return this.state;
+        }
+
+        @Override
+        protected String initializeState(TaskEntityOperation operation) {
+            return "private-state";
+        }
+
+        @Override
+        protected Class<String> getStateType() {
+            return String.class;
+        }
+    }
+
     /**
      * Entity that accepts a TaskEntityContext as a method parameter.
      */
@@ -247,6 +264,12 @@ void reflectionDispatch_methodWithReturnValue() throws Exception {
         assertEquals(42, result);
     }
 
+    @Test
+    void reflectionDispatch_publicOperationOnPrivateEntityClass() throws Exception {
+        Object result = new PrivateEntity().run(createOperation("get"));
+        assertEquals("private-state", result);
+    }
+
     @Test
     void reflectionDispatch_caseInsensitive() throws Exception {
         CounterEntity entity = new CounterEntity();

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/CommitCheckpointRequest.java

@@ -11,7 +11,7 @@
  * When {@link #getCheckpoint()} is non-null the cursor moves forward (successful batch); when {@code null} the
  * cursor is retained (failed batch eligible for retry).
  */
-public final class CommitCheckpointRequest {
+final class CommitCheckpointRequest {
 
     private long scannedInstances;
     private long exportedInstances;

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExecuteExportJobOperationOrchestrator.java

@@ -2,16 +2,19 @@
 // Licensed under the MIT License.
 package com.microsoft.durabletask.exporthistory;
 
+import com.microsoft.durabletask.EntityInstanceId;
 import com.microsoft.durabletask.TaskOrchestration;
 import com.microsoft.durabletask.TaskOrchestrationContext;
 
+import javax.annotation.Nullable;
+
 /**
  * Orchestrator that executes a single operation on an export job entity and returns its result.
  * <p>
  * The client schedules this orchestrator (rather than signaling the entity directly) so it can await completion and
  * surface validation errors.
  */
-public final class ExecuteExportJobOperationOrchestrator implements TaskOrchestration {
+final class ExecuteExportJobOperationOrchestrator implements TaskOrchestration {
 
     /** The registered orchestration name. */
     public static final String NAME = "ExecuteExportJobOperationOrchestrator";
@@ -25,3 +28,74 @@ public void run(TaskOrchestrationContext ctx) {
         ctx.complete(result);
     }
 }
+
+/**
+ * Request to execute a single operation on an export job entity, scheduled by the client through
+ * {@link ExecuteExportJobOperationOrchestrator} so the caller can await completion and surface validation errors.
+ */
+final class ExportJobOperationRequest {
+
+    private EntityInstanceId entityId;
+    private String operationName;
+    private Object input;
+
+    /** Creates an empty {@code ExportJobOperationRequest} (for deserialization). */
+    public ExportJobOperationRequest() {
+    }
+
+    /**
+     * Creates an {@code ExportJobOperationRequest}.
+     *
+     * @param entityId      the target entity ID
+     * @param operationName the operation name
+     * @param input         the operation input, or {@code null}
+     */
+    public ExportJobOperationRequest(EntityInstanceId entityId, String operationName, @Nullable Object input) {
+        this.entityId = entityId;
+        this.operationName = operationName;
+        this.input = input;
+    }
+
+    /** @return the target entity ID. */
+    public EntityInstanceId getEntityId() {
+        return this.entityId;
+    }
+
+    /**
+     * Sets the target entity ID.
+     *
+     * @param entityId the entity ID
+     */
+    public void setEntityId(EntityInstanceId entityId) {
+        this.entityId = entityId;
+    }
+
+    /** @return the operation name. */
+    public String getOperationName() {
+        return this.operationName;
+    }
+
+    /**
+     * Sets the operation name.
+     *
+     * @param operationName the operation name
+     */
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+
+    /** @return the operation input, or {@code null}. */
+    @Nullable
+    public Object getInput() {
+        return this.input;
+    }
+
+    /**
+     * Sets the operation input.
+     *
+     * @param input the input, or {@code null}
+     */
+    public void setInput(@Nullable Object input) {
+        this.input = input;
+    }
+}

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExportBlobNaming.java

@@ -9,6 +9,7 @@
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 
 /**
  * Computes export blob names and paths. The blob name is a lowercase-hex SHA-256 hash of
@@ -51,7 +52,7 @@ static String blobFileName(Instant completedTimestamp, String instanceId, Export
     static String formatTimestamp(Instant instant) {
         OffsetDateTime utc = instant.atOffset(ZoneOffset.UTC);
         long ticks = utc.getNano() / 100L;
-        return TIMESTAMP_DATE_TIME.format(utc) + "." + String.format("%07d", ticks) + "+00:00";
+        return TIMESTAMP_DATE_TIME.format(utc) + "." + String.format(Locale.ROOT, "%07d", ticks) + "+00:00";
     }
 
     /**

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExportFailure.java

@@ -7,7 +7,7 @@
 /**
  * Failure of a specific instance export.
  */
-public final class ExportFailure {
+final class ExportFailure {
 
     private String instanceId;
     private String reason;

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExportHistoryConstants.java

@@ -5,7 +5,7 @@
 /**
  * Constants used throughout the export history functionality.
  */
-public final class ExportHistoryConstants {
+final class ExportHistoryConstants {
 
     /**
      * The prefix used for generating export job orchestrator instance IDs.

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExportHistoryJobClient.java

@@ -12,6 +12,8 @@
 import java.time.Duration;
 import java.util.Locale;
 import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Client for managing a single export job via entity operations routed through
@@ -20,6 +22,7 @@
 public final class ExportHistoryJobClient {
 
     private static final Duration OPERATION_TIMEOUT = Duration.ofSeconds(60);
+    private static final Logger LOGGER = Logger.getLogger(ExportHistoryJobClient.class.getName());
 
     private final DurableTaskClient durableTaskClient;
     private final String jobId;
@@ -96,14 +99,32 @@ public ExportJobDescription describe() {
         return ExportJobDescription.fromState(this.jobId, metadata.getState());
     }
 
-    /**
-     * Deletes the export job entity. The export orchestrator self-exits on its next cycle once it observes the job
-     * is gone.
-     */
+    /** Deletes the export job entity, then terminates and purges its linked export orchestrator. */
     public void delete() {
         ExportJobOperationRequest request = new ExportJobOperationRequest(
                 this.entityId, ExportJobTransitions.OP_DELETE, null);
-        scheduleAndWait(request);
+        OrchestrationMetadata result = scheduleAndWait(request);
+        if (result.getRuntimeStatus() != OrchestrationRuntimeStatus.COMPLETED) {
+            FailureDetails failure = result.getFailureDetails();
+            String detail = failure == null ? "" : failure.getErrorMessage();
+            throw new ExportJobClientValidationException(
+                    "Failed to delete export job '" + this.jobId + "': " + detail);
+        }
+
+        terminateAndPurgeOrchestrator();
+    }
+
+    private void terminateAndPurgeOrchestrator() {
+        String orchestratorInstanceId = ExportHistoryConstants.getOrchestratorInstanceId(this.jobId);
+        try {
+            this.durableTaskClient.terminate(orchestratorInstanceId, "Export job deleted");
+            this.durableTaskClient.waitForInstanceCompletion(
+                    orchestratorInstanceId, OPERATION_TIMEOUT, false);
+            this.durableTaskClient.purgeInstance(orchestratorInstanceId);
+        } catch (RuntimeException | TimeoutException ex) {
+            LOGGER.log(Level.WARNING,
+                    "Failed to terminate or purge export orchestrator '" + orchestratorInstanceId + "'.", ex);
+        }
     }
 
     private OrchestrationMetadata scheduleAndWait(ExportJobOperationRequest request) {

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExportHistoryStorageOptions.java

@@ -37,7 +37,6 @@ public final class ExportHistoryStorageOptions {
     private TokenCredential credential;
     private String containerName = "";
     private String prefix;
-    private ExportFormat format = ExportFormat.getDefault();
 
     /**
      * Gets the Azure Storage connection string.
@@ -145,24 +144,4 @@ public ExportHistoryStorageOptions setPrefix(@Nullable String prefix) {
         this.prefix = prefix;
         return this;
     }
-
-    /**
-     * Gets the export format. Defaults to {@link ExportFormat#getDefault()} (JSONL + gzip).
-     *
-     * @return the export format
-     */
-    public ExportFormat getFormat() {
-        return this.format;
-    }
-
-    /**
-     * Sets the export format.
-     *
-     * @param format the export format
-     * @return this options object
-     */
-    public ExportHistoryStorageOptions setFormat(ExportFormat format) {
-        this.format = format;
-        return this;
-    }
 }

exporthistory/src/main/java/com/microsoft/durabletask/exporthistory/ExportHistoryWorkerExtensions.java

@@ -44,7 +44,7 @@ public static DurableTaskGrpcWorkerBuilder useExportHistory(
 
         BlobExportWriter writer = new BlobExportWriter(storage);
 
-        builder.addEntity(ExportJob.NAME, ExportJob.class);
+        builder.addEntity(ExportJob.NAME, ExportJob::new);
 
         builder.addOrchestration(orchestrationFactory(
                 ExportJobOrchestrator.NAME, ExportJobOrchestrator::new));