Consolidate implementation.

Author: kinyoklion

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/integrations/FileDataSourceImpl.java

@@ -33,6 +33,8 @@ final class FileDataSourceImpl implements DataSource {
     private final LDLogger logger;
     private Thread updateThread;
 
+    private final boolean autoUpdate;
+
     FileDataSourceImpl(
             DataSourceUpdateSink dataSourceUpdates,
             List<SourceInfo> sources,
@@ -42,8 +44,8 @@ final class FileDataSourceImpl implements DataSource {
     ) {
         this.dataSourceUpdates = dataSourceUpdates;
         this.logger = logger;
-        // The FDv1
         this.synchronizer = new FileSynchronizer(sources, autoUpdate, duplicateKeysHandling, logger, true);
+        this.autoUpdate = autoUpdate;
     }
 
     @Override
@@ -62,14 +64,13 @@ public Future<Void> start() {
 
         processResult(initialResult);
 
-        // Note that if the initial load finds any errors, it will not set our status to "initialized".
-        // But we will still do all the other startup steps, because we still might end up getting
-        // valid data if we are told to reload by the file watcher.
-
-        // Start a background thread to listen for file changes
-        updateThread = new Thread(this::runUpdateLoop, FileDataSourceImpl.class.getName());
-        updateThread.setDaemon(true);
-        updateThread.start();
+        // We only need to drive the update loop if auto-updating is enabled.
+        if(autoUpdate) {
+            // Start a background thread to listen for file changes
+            updateThread = new Thread(this::runUpdateLoop, FileDataSourceImpl.class.getName());
+            updateThread.setDaemon(true);
+            updateThread.start();
+        }
 
         return initFuture;
     }

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/integrations/FileInitializer.java

@@ -5,6 +5,7 @@
 import com.launchdarkly.sdk.server.datasources.Initializer;
 import com.launchdarkly.sdk.server.integrations.FileDataSourceBuilder.SourceInfo;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
@@ -14,28 +15,40 @@
  * This implements the {@link Initializer} interface, loading files once and returning
  * the result. If loading fails, it returns a terminal error since an initializer
  * cannot retry.
+ * <p>
+ * Internally delegates to {@link FileSynchronizer} with auto-update disabled.
  */
-final class FileInitializer extends FileDataSourceBase implements Initializer {
-    private final CompletableFuture<FDv2SourceResult> shutdownFuture = new CompletableFuture<>();
+final class FileInitializer implements Initializer {
+    private final FileSynchronizer synchronizer;
 
     FileInitializer(
             List<SourceInfo> sources,
             FileData.DuplicateKeysHandling duplicateKeysHandling,
             LDLogger logger,
             boolean persist
     ) {
-        super(sources, duplicateKeysHandling, logger, persist);
+        // Use FileSynchronizer with autoUpdate=false for the actual file loading
+        this.synchronizer = new FileSynchronizer(sources, false, duplicateKeysHandling, logger, persist);
     }
 
     @Override
     public CompletableFuture<FDv2SourceResult> run() {
-        CompletableFuture<FDv2SourceResult> loadResult = CompletableFuture.supplyAsync(() -> loadData(true));
-        return CompletableFuture.anyOf(shutdownFuture, loadResult)
-                .thenApply(result -> (FDv2SourceResult) result);
+        return synchronizer.next().thenApply(result -> {
+            // Convert INTERRUPTED to TERMINAL_ERROR for initializer semantics
+            // (initializers can't retry, so all errors are terminal)
+            if (result.getResultType() == FDv2SourceResult.ResultType.STATUS &&
+                    result.getStatus().getState() == FDv2SourceResult.State.INTERRUPTED) {
+                return FDv2SourceResult.terminalError(
+                        result.getStatus().getErrorInfo(),
+                        result.isFdv1Fallback()
+                );
+            }
+            return result;
+        });
     }
 
     @Override
-    public void close() {
-        shutdownFuture.complete(FDv2SourceResult.shutdown());
+    public void close() throws IOException {
+        synchronizer.close();
     }
 }