Simplify builder interfaces.

Author: kinyoklion

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/FDv2DataSource.java

@@ -6,7 +6,6 @@
 import com.launchdarkly.sdk.server.datasources.Synchronizer;
 import com.launchdarkly.sdk.server.interfaces.DataSourceStatusProvider;
 import com.launchdarkly.sdk.server.subsystems.DataSource;
-import com.launchdarkly.sdk.server.subsystems.DataSourceUpdateSink;
 import com.launchdarkly.sdk.server.subsystems.DataSourceUpdateSinkV2;
 
 import java.io.Closeable;
@@ -20,7 +19,7 @@
 import java.util.stream.Collectors;
 
 class FDv2DataSource implements DataSource {
-    private final List<InitializerFactory> initializers;
+    private final List<DataSourceFactory<Initializer>> initializers;
     private final List<SynchronizerFactoryWithState> synchronizers;
 
     private final DataSourceUpdateSinkV2 dataSourceUpdates;
@@ -48,12 +47,12 @@ public enum State {
             Blocked
         }
 
-        private final SynchronizerFactory factory;
+        private final DataSourceFactory<Synchronizer> factory;
 
         private State state = State.Available;
 
 
-        public SynchronizerFactoryWithState(SynchronizerFactory factory) {
+        public SynchronizerFactoryWithState(DataSourceFactory<Synchronizer> factory) {
             this.factory = factory;
         }
 
@@ -70,18 +69,14 @@ public Synchronizer build() {
         }
     }
 
-    public interface InitializerFactory {
-        Initializer build();
-    }
-
-    public interface SynchronizerFactory {
-        Synchronizer build();
+    public interface DataSourceFactory<T> {
+        T build();
     }
 
 
     public FDv2DataSource(
-            ImmutableList<InitializerFactory> initializers,
-            ImmutableList<SynchronizerFactory> synchronizers,
+            ImmutableList<DataSourceFactory<Initializer>> initializers,
+            ImmutableList<DataSourceFactory<Synchronizer>> synchronizers,
             DataSourceUpdateSinkV2 dataSourceUpdates
     ) {
         this.initializers = initializers;
@@ -120,7 +115,7 @@ private SynchronizerFactoryWithState getFirstAvailableSynchronizer() {
 
     private void runInitializers() {
         boolean anyDataReceived = false;
-        for (InitializerFactory factory : initializers) {
+        for (DataSourceFactory<Initializer> factory : initializers) {
             try {
                 Initializer initializer = factory.build();
                 if (setActiveSource(initializer)) return;

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/FDv2DataSystem.java

@@ -13,11 +13,8 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.util.LinkedList;
 import java.util.concurrent.Future;
 
-import static com.launchdarkly.sdk.server.ComponentsImpl.toHttpProperties;
-
 /**
  * Internal implementation of the FDv2 data system.
  * <p>
@@ -49,34 +46,18 @@ private FDv2DataSystem(
     this.readOnlyStore = new ReadonlyStoreFacade(store);
   }
 
-  private static class SynchronizerFactoryWrapper implements FDv2DataSource.SynchronizerFactory {
-
-    private final SynchronizerBuilder builder;
-    private final DataSourceBuilderContext context;
-
-    public SynchronizerFactoryWrapper(SynchronizerBuilder builder, DataSourceBuilderContext context) {
-      this.builder = builder;
-      this.context = context;
-    }
-
-    @Override
-    public Synchronizer build() {
-      return builder.build(context);
-    }
-  }
-
-  private static class InitializerFactoryWrapper implements FDv2DataSource.InitializerFactory {
+  private static class FactoryWrapper<TDataSource> implements FDv2DataSource.DataSourceFactory<TDataSource> {
 
-    private final InitializerBuilder builder;
+    private final DataSourceBuilder<TDataSource> builder;
     private final DataSourceBuilderContext context;
 
-    public InitializerFactoryWrapper(InitializerBuilder builder, DataSourceBuilderContext context) {
+    public FactoryWrapper(DataSourceBuilder<TDataSource> builder, DataSourceBuilderContext context) {
       this.builder = builder;
       this.context = context;
     }
 
     @Override
-    public Initializer build() {
+    public TDataSource build() {
       return builder.build(context);
     }
   }
@@ -141,12 +122,12 @@ static FDv2DataSystem create(
       selectorSource
     );
 
-    ImmutableList<FDv2DataSource.InitializerFactory> initializerFactories = dataSystemConfiguration.getInitializers().stream()
-      .map(initializer -> new InitializerFactoryWrapper(initializer, builderContext))
+    ImmutableList<FDv2DataSource.DataSourceFactory<Initializer>> initializerFactories = dataSystemConfiguration.getInitializers().stream()
+      .map(initializer -> new FactoryWrapper<>(initializer, builderContext))
       .collect(ImmutableList.toImmutableList());
 
-    ImmutableList<FDv2DataSource.SynchronizerFactory> synchronizerFactories = dataSystemConfiguration.getSynchronizers().stream()
-      .map(synchronizer -> new SynchronizerFactoryWrapper(synchronizer, builderContext))
+    ImmutableList<FDv2DataSource.DataSourceFactory<Synchronizer>> synchronizerFactories = dataSystemConfiguration.getSynchronizers().stream()
+      .map(synchronizer -> new FactoryWrapper<>(synchronizer, builderContext))
       .collect(ImmutableList.toImmutableList());
 
     DataSource dataSource = new FDv2DataSource(
@@ -205,12 +186,8 @@ public void close() throws IOException {
       return;
     }
     try {
-      if (dataSource instanceof Closeable) {
-        ((Closeable) dataSource).close();
-      }
-      if (store instanceof Closeable) {
-        ((Closeable) store).close();
-      }
+      dataSource.close();
+      store.close();
     } finally {
       disposed = true;
     }

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

@@ -17,22 +17,22 @@
  */
 public final class DataSystemBuilder {
 
-  private final List<InitializerBuilder> initializers = new ArrayList<>();
-  private final List<SynchronizerBuilder> synchronizers = new ArrayList<>();
+  private final List<DataSourceBuilder<Initializer>> initializers = new ArrayList<>();
+  private final List<DataSourceBuilder<Synchronizer>> synchronizers = new ArrayList<>();
   private ComponentConfigurer<DataSource> fDv1FallbackSynchronizer;
   private ComponentConfigurer<DataStore> persistentStore;
   private DataSystemConfiguration.DataStoreMode persistentDataStoreMode;
 
   /**
    * Add one or more initializers to the builder.
-   * To replace initializers, please refer to {@link #replaceInitializers(InitializerBuilder[])}.
+   * To replace initializers, please refer to {@link #replaceInitializers(DataSourceBuilder[])}.
    *
    * @param initializers the initializers to add
    * @return a reference to the builder
    */
   @SafeVarargs
-  public final DataSystemBuilder initializers(InitializerBuilder... initializers) {
-    for (InitializerBuilder initializer : initializers) {
+  public final DataSystemBuilder initializers(DataSourceBuilder<Initializer>... initializers) {
+    for (DataSourceBuilder<Initializer> initializer : initializers) {
       this.initializers.add(initializer);
     }
     return this;
@@ -46,9 +46,9 @@ public final DataSystemBuilder initializers(InitializerBuilder... initializers)
    * @return a reference to this builder
    */
   @SafeVarargs
-  public final DataSystemBuilder replaceInitializers(InitializerBuilder... initializers) {
+  public final DataSystemBuilder replaceInitializers(DataSourceBuilder<Initializer>... initializers) {
     this.initializers.clear();
-    for (InitializerBuilder initializer : initializers) {
+    for (DataSourceBuilder<Initializer> initializer : initializers) {
       this.initializers.add(initializer);
     }
     return this;
@@ -62,8 +62,8 @@ public final DataSystemBuilder replaceInitializers(InitializerBuilder... initial
    * @return a reference to the builder
    */
   @SafeVarargs
-  public final DataSystemBuilder synchronizers(SynchronizerBuilder... synchronizers) {
-    for (SynchronizerBuilder synchronizer : synchronizers) {
+  public final DataSystemBuilder synchronizers(DataSourceBuilder<Synchronizer>... synchronizers) {
+    for (DataSourceBuilder<Synchronizer> synchronizer : synchronizers) {
       this.synchronizers.add(synchronizer);
     }
     return this;
@@ -77,9 +77,9 @@ public final DataSystemBuilder synchronizers(SynchronizerBuilder... synchronizer
    * @return a reference to this builder
    */
   @SafeVarargs
-  public final DataSystemBuilder replaceSynchronizers(SynchronizerBuilder... synchronizers) {
+  public final DataSystemBuilder replaceSynchronizers(DataSourceBuilder<Synchronizer>... synchronizers) {
     this.synchronizers.clear();
-    for (SynchronizerBuilder synchronizer : synchronizers) {
+    for (DataSourceBuilder<Synchronizer> synchronizer : synchronizers) {
       this.synchronizers.add(synchronizer);
     }
     return this;

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

@@ -3,10 +3,11 @@
 import com.launchdarkly.sdk.LDValue;
 import com.launchdarkly.sdk.internal.events.DiagnosticConfigProperty;
 import com.launchdarkly.sdk.server.StandardEndpoints;
+import com.launchdarkly.sdk.server.datasources.Initializer;
 import com.launchdarkly.sdk.server.interfaces.ServiceEndpoints;
 import com.launchdarkly.sdk.server.subsystems.ClientContext;
+import com.launchdarkly.sdk.server.subsystems.DataSourceBuilder;
 import com.launchdarkly.sdk.server.subsystems.DiagnosticDescription;
-import com.launchdarkly.sdk.server.subsystems.InitializerBuilder;
 
 
 /**
@@ -28,7 +29,7 @@
  *             .fDv1FallbackSynchronizer(DataSystemComponents.fDv1Polling()));
  * </code></pre>
  */
-public abstract class FDv2PollingInitializerBuilder implements InitializerBuilder, DiagnosticDescription {
+public abstract class FDv2PollingInitializerBuilder implements DataSourceBuilder<Initializer>, DiagnosticDescription {
   protected ServiceEndpoints serviceEndpointsOverride;
 
   /**

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

@@ -6,9 +6,8 @@
 import com.launchdarkly.sdk.server.datasources.Synchronizer;
 import com.launchdarkly.sdk.server.interfaces.ServiceEndpoints;
 import com.launchdarkly.sdk.server.subsystems.ClientContext;
-import com.launchdarkly.sdk.server.subsystems.ComponentConfigurer;
+import com.launchdarkly.sdk.server.subsystems.DataSourceBuilder;
 import com.launchdarkly.sdk.server.subsystems.DiagnosticDescription;
-import com.launchdarkly.sdk.server.subsystems.SynchronizerBuilder;
 
 import java.net.URI;
 import java.time.Duration;
@@ -33,7 +32,7 @@
  *             .fDv1FallbackSynchronizer(DataSystemComponents.fDv1Polling()));
  * </code></pre>
  */
-public abstract class FDv2PollingSynchronizerBuilder implements SynchronizerBuilder, DiagnosticDescription {
+public abstract class FDv2PollingSynchronizerBuilder implements DataSourceBuilder<Synchronizer>, DiagnosticDescription {
   /**
    * The default value for {@link #pollInterval(Duration)}: 30 seconds.
    */

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

@@ -6,9 +6,8 @@
 import com.launchdarkly.sdk.server.datasources.Synchronizer;
 import com.launchdarkly.sdk.server.interfaces.ServiceEndpoints;
 import com.launchdarkly.sdk.server.subsystems.ClientContext;
-import com.launchdarkly.sdk.server.subsystems.ComponentConfigurer;
+import com.launchdarkly.sdk.server.subsystems.DataSourceBuilder;
 import com.launchdarkly.sdk.server.subsystems.DiagnosticDescription;
-import com.launchdarkly.sdk.server.subsystems.SynchronizerBuilder;
 
 import java.net.URI;
 import java.time.Duration;
@@ -32,7 +31,7 @@
  *             .fDv1FallbackSynchronizer(DataSystemComponents.fDv1Polling()));
  * </code></pre>
  */
-public abstract class FDv2StreamingSynchronizerBuilder implements SynchronizerBuilder, DiagnosticDescription {
+public abstract class FDv2StreamingSynchronizerBuilder implements DataSourceBuilder<Synchronizer>, DiagnosticDescription {
   /**
    * The default value for {@link #initialReconnectDelay(Duration)}: 1000 milliseconds.
    */

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/subsystems/DataSourceBuilder.java

@@ -0,0 +1,19 @@
+package com.launchdarkly.sdk.server.subsystems;
+
+
+/**
+ * Interface for building synchronizers and initializers.
+ * <p>
+ * This class is not stable, and not subject to any backwards compatibility guarantees or semantic versioning.
+ * It is in early access. If you want access to this feature, please join the EAP. https://launchdarkly.com/docs/sdk/features/data-saving-mode
+ * @param <TDataSource>
+ */
+public interface DataSourceBuilder<TDataSource> {
+  /**
+   * Builds a data source instance based on the provided context.
+   *
+   * @param context the context for building the data source
+   * @return the built data source instance
+   */
+  TDataSource build(DataSourceBuilderContext context);
+}

lib/sdk/server/src/main/java/com/launchdarkly/sdk/server/subsystems/DataSystemConfiguration.java

@@ -37,8 +37,8 @@ public enum DataStoreMode {
     READ_WRITE
   }
 
-  private final ImmutableList<InitializerBuilder> initializers;
-  private final ImmutableList<SynchronizerBuilder> synchronizers;
+  private final ImmutableList<DataSourceBuilder<Initializer>> initializers;
+  private final ImmutableList<DataSourceBuilder<Synchronizer>> synchronizers;
   private final ComponentConfigurer<DataSource> fDv1FallbackSynchronizer;
   private final ComponentConfigurer<DataStore> persistentStore;
   private final DataStoreMode persistentDataStoreMode;
@@ -56,8 +56,8 @@ public enum DataStoreMode {
    * @param persistentDataStoreMode see {@link #getPersistentDataStoreMode()}
    */
   public DataSystemConfiguration(
-      ImmutableList<InitializerBuilder> initializers,
-      ImmutableList<SynchronizerBuilder> synchronizers,
+      ImmutableList<DataSourceBuilder<Initializer>> initializers,
+      ImmutableList<DataSourceBuilder<Synchronizer>> synchronizers,
       ComponentConfigurer<DataSource> fDv1FallbackSynchronizer,
       ComponentConfigurer<DataStore> persistentStore,
       DataStoreMode persistentDataStoreMode) {
@@ -73,7 +73,7 @@ public DataSystemConfiguration(
    *
    * @return the list of initializer configurers
    */
-  public ImmutableList<InitializerBuilder> getInitializers() {
+  public ImmutableList<DataSourceBuilder<Initializer>> getInitializers() {
     return initializers;
   }
 
@@ -82,7 +82,7 @@ public ImmutableList<InitializerBuilder> getInitializers() {
    *
    * @return the list of synchronizer configurers
    */
-  public ImmutableList<SynchronizerBuilder> getSynchronizers() {
+  public ImmutableList<DataSourceBuilder<Synchronizer>> getSynchronizers() {
     return synchronizers;
   }