update sample to use Spring DI for ExportHistory sample instead of static fields

Author: bachuv

samples/src/main/java/io/durabletask/samples/ExportHistorySample.java

@@ -3,54 +3,66 @@
 package io.durabletask.samples;
 
 import com.microsoft.durabletask.*;
+import com.microsoft.durabletask.exporthistory.client.ExportHistoryClient;
+import com.microsoft.durabletask.exporthistory.client.ExportHistoryClients;
 import com.microsoft.durabletask.exporthistory.client.ExportHistoryWorkers;
 import com.microsoft.durabletask.exporthistory.options.ExportHistoryStorageOptions;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 /**
  * Export History sample — Spring Boot web app with REST endpoints for managing export jobs.
  * <p>
  * Java equivalent of the .NET ExportHistoryWebApp sample.
  * <p>
  * Run: ./gradlew runExportHistorySample
- * API: http://localhost:8080/export-jobs
+ * API: http://localhost:5009/export-jobs
  * <p>
  * Requires DTS emulator and Azurite (or Azure Storage).
  */
 @SpringBootApplication
 public class ExportHistorySample {
 
-    // Shared instances — set in main(), read by controller
-    static DurableTaskClient client;
-    static ExportHistoryStorageOptions storageOptions;
-
     public static void main(String[] args) {
-        // Config
+        System.out.println("Export History Web App starting...");
+        System.out.println("REST API: http://localhost:5009/export-jobs");
+
+        // Use port 5009 to avoid conflict with DTS emulator on 8080
+        System.setProperty("server.port", "5009");
+        SpringApplication.run(ExportHistorySample.class, args);
+    }
+
+    @Bean
+    public ExportHistoryStorageOptions storageOptions() {
         String connStr = env("EXPORT_HISTORY_STORAGE_CONNECTION_STRING", "UseDevelopmentStorage=true");
         String container = env("EXPORT_HISTORY_CONTAINER_NAME", "export-history");
-
-        storageOptions = ExportHistoryStorageOptions.newBuilder()
+        return ExportHistoryStorageOptions.newBuilder()
                 .connectionString(connStr)
                 .containerName(container)
                 .build();
+    }
 
-        // Client
-        client = SampleUtils.newClientBuilder().build();
+    @Bean
+    public DurableTaskClient durableTaskClient() {
+        return SampleUtils.newClientBuilder().build();
+    }
 
-        // Worker — registers export history entity, orchestrators, activities
+    @Bean(destroyMethod = "stop")
+    public DurableTaskGrpcWorker durableTaskWorker(
+            DurableTaskClient client, ExportHistoryStorageOptions storageOptions) {
         DurableTaskGrpcWorkerBuilder workerBuilder = SampleUtils.newWorkerBuilder();
         ExportHistoryWorkers.register(workerBuilder, client, storageOptions);
         DurableTaskGrpcWorker worker = workerBuilder.build();
         worker.start();
+        return worker;
+    }
 
-        System.out.println("Export History Web App started.");
-        System.out.println("REST API: http://localhost:5009/export-jobs");
-
-        // Use port 5009 to avoid conflict with DTS emulator on 8080
-        System.setProperty("server.port", "5009");
-        SpringApplication.run(ExportHistorySample.class, args);
+    @Bean
+    public ExportHistoryClient exportHistoryClient(
+            DurableTaskClient client, ExportHistoryStorageOptions storageOptions) {
+        return ExportHistoryClients.create(client, storageOptions);
     }
 
     private static String env(String name, String defaultValue) {

samples/src/main/java/io/durabletask/samples/ExportJobController.java

@@ -3,7 +3,6 @@
 package io.durabletask.samples;
 
 import com.microsoft.durabletask.exporthistory.client.ExportHistoryClient;
-import com.microsoft.durabletask.exporthistory.client.ExportHistoryClients;
 import com.microsoft.durabletask.exporthistory.client.ExportHistoryJobClient;
 import com.microsoft.durabletask.exporthistory.exception.ExportJobNotFoundException;
 import com.microsoft.durabletask.exporthistory.models.*;
@@ -32,9 +31,8 @@ public class ExportJobController {
     private static final Logger logger = Logger.getLogger(ExportJobController.class.getName());
     private final ExportHistoryClient exportClient;
 
-    public ExportJobController() {
-        this.exportClient = ExportHistoryClients.create(
-                ExportHistorySample.client, ExportHistorySample.storageOptions);
+    public ExportJobController(ExportHistoryClient exportClient) {
+        this.exportClient = exportClient;
     }
 
     @PostMapping