wip: nooope had to remove more stuff

Unleash · Jan 22, 2025 · a8b8594 · a8b8594
1 parent 459d6f7
commit a8b8594
Show file tree

Hide file tree

Showing 27 changed files with 161 additions and 479 deletions.
diff --git a/src/main/java/io/getunleash/DefaultUnleash.java b/src/main/java/io/getunleash/DefaultUnleash.java
@@ -1,7 +1,5 @@
 package io.getunleash;
 
-import static io.getunleash.Variant.DISABLED_VARIANT;
-
 import io.getunleash.event.EventDispatcher;
 import io.getunleash.event.IsEnabledImpressionEvent;
 import io.getunleash.event.ToggleEvaluated;
@@ -10,6 +8,10 @@
 import io.getunleash.repository.FeatureRepository;
 import io.getunleash.strategy.*;
 import io.getunleash.util.UnleashConfig;
+import io.getunleash.variant.Variant;
+
+import static io.getunleash.variant.Variant.DISABLED_VARIANT;
+
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.LongAdder;

diff --git a/src/main/java/io/getunleash/EngineProxyImpl.java b/src/main/java/io/getunleash/EngineProxyImpl.java
@@ -8,6 +8,8 @@
 import io.getunleash.repository.YggdrasilAdapters;
 import io.getunleash.strategy.Strategy;
 import io.getunleash.util.UnleashConfig;
+import io.getunleash.variant.Variant;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

diff --git a/src/main/java/io/getunleash/EvaluatedToggle.java b/src/main/java/io/getunleash/EvaluatedToggle.java
@@ -1,6 +1,7 @@
 package io.getunleash;
 
 import io.getunleash.lang.Nullable;
+import io.getunleash.variant.Variant;
 
 public class EvaluatedToggle {
     private final boolean enabled;

diff --git a/src/main/java/io/getunleash/FakeUnleash.java b/src/main/java/io/getunleash/FakeUnleash.java
@@ -1,6 +1,8 @@
 package io.getunleash;
 
 import io.getunleash.lang.Nullable;
+import io.getunleash.variant.Variant;
+
 import java.util.*;
 import java.util.function.BiPredicate;
 import java.util.stream.Collectors;

diff --git a/src/main/java/io/getunleash/FeatureDependency.java b/src/main/java/io/getunleash/FeatureDependency.java
diff --git a/src/main/java/io/getunleash/FeatureEvaluationResult.java b/src/main/java/io/getunleash/FeatureEvaluationResult.java
diff --git a/src/main/java/io/getunleash/Unleash.java b/src/main/java/io/getunleash/Unleash.java
@@ -2,6 +2,8 @@
 
 import java.util.function.BiPredicate;
 
+import io.getunleash.variant.Variant;
+
 public interface Unleash {
     default boolean isEnabled(String toggleName) {
         return isEnabled(toggleName, false);

diff --git a/...sh/repository/ClientFeaturesResponse.java → ...unleash/event/ClientFeaturesResponse.java b/...sh/repository/ClientFeaturesResponse.java → ...unleash/event/ClientFeaturesResponse.java
@@ -1,7 +1,5 @@
-package io.getunleash.repository;
+package io.getunleash.event;
 
-import io.getunleash.event.UnleashEvent;
-import io.getunleash.event.UnleashSubscriber;
 import java.util.Optional;
 
 public final class ClientFeaturesResponse implements UnleashEvent {

diff --git a/src/main/java/io/getunleash/event/UnleashSubscriber.java b/src/main/java/io/getunleash/event/UnleashSubscriber.java
@@ -3,7 +3,7 @@
 import io.getunleash.UnleashException;
 import io.getunleash.metric.ClientMetrics;
 import io.getunleash.metric.ClientRegistration;
-import io.getunleash.repository.ClientFeaturesResponse;
+
 import org.slf4j.LoggerFactory;
 
 public interface UnleashSubscriber {
@@ -25,12 +25,6 @@ default void clientMetrics(ClientMetrics clientMetrics) {}
 
     default void clientRegistered(ClientRegistration clientRegistration) {}
 
-    default void togglesBackedUp(String toggleCollection) {}
-
-    default void toggleBackupRestored(String toggleCollection) {}
-
-    default void togglesBootstrapped(String toggleCollection) {}
-
     default void featuresBootstrapped(String featureCollection) {}
 
     default void featuresBackedUp(String featureCollection) {}

diff --git a/src/main/java/io/getunleash/repository/FeatureBootstrapHandler.java b/src/main/java/io/getunleash/repository/FeatureBootstrapHandler.java
diff --git a/src/main/java/io/getunleash/repository/FeatureFetcher.java b/src/main/java/io/getunleash/repository/FeatureFetcher.java
@@ -1,6 +1,7 @@
 package io.getunleash.repository;
 
 import io.getunleash.UnleashException;
+import io.getunleash.event.ClientFeaturesResponse;
 
 public interface FeatureFetcher {
     ClientFeaturesResponse fetchFeatures() throws UnleashException;

diff --git a/src/main/java/io/getunleash/repository/FeatureRepository.java b/src/main/java/io/getunleash/repository/FeatureRepository.java
@@ -2,7 +2,8 @@
 
 import io.getunleash.FeatureDefinition;
 import io.getunleash.UnleashContext;
-import io.getunleash.Variant;
+import io.getunleash.variant.Variant;
+
 import java.util.stream.Stream;
 
 public interface FeatureRepository {

diff --git a/src/main/java/io/getunleash/repository/FeatureRepositoryImpl.java b/src/main/java/io/getunleash/repository/FeatureRepositoryImpl.java
@@ -3,15 +3,17 @@
 import io.getunleash.FeatureDefinition;
 import io.getunleash.UnleashContext;
 import io.getunleash.UnleashException;
-import io.getunleash.Variant;
 import io.getunleash.engine.UnleashEngine;
 import io.getunleash.engine.YggdrasilError;
 import io.getunleash.engine.YggdrasilInvalidInputException;
+import io.getunleash.event.ClientFeaturesResponse;
 import io.getunleash.event.EventDispatcher;
 import io.getunleash.event.UnleashReady;
 import io.getunleash.util.Throttler;
 import io.getunleash.util.UnleashConfig;
 import io.getunleash.util.UnleashScheduledExecutor;
+import io.getunleash.variant.Variant;
+
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -22,7 +24,7 @@ public class FeatureRepositoryImpl implements FeatureRepository {
     private static final Logger LOGGER = LoggerFactory.getLogger(FeatureRepositoryImpl.class);
     private final UnleashConfig unleashConfig;
     private final BackupHandler featureBackupHandler;
-    private final FeatureBootstrapHandler featureBootstrapHandler;
+    private final ToggleBootstrapProvider bootstrapper;
     private final FeatureFetcher featureFetcher;
     private final EventDispatcher eventDispatcher;
     private final UnleashEngine engine;
@@ -52,15 +54,15 @@ public FeatureRepositoryImpl(
                 featureBackupHandler,
                 engine,
                 fetcher,
-                new FeatureBootstrapHandler(unleashConfig));
+                new ToggleBootstrapFileProvider());
     }
 
     public FeatureRepositoryImpl(
             UnleashConfig unleashConfig,
             BackupHandler featureBackupHandler,
             UnleashEngine engine,
             FeatureFetcher fetcher,
-            FeatureBootstrapHandler bootstrapHandler) {
+            ToggleBootstrapProvider bootstrapHandler) {
         this(
                 unleashConfig,
                 featureBackupHandler,
@@ -75,27 +77,26 @@ public FeatureRepositoryImpl(
             BackupHandler featureBackupHandler,
             UnleashEngine engine,
             FeatureFetcher fetcher,
-            FeatureBootstrapHandler bootstrapHandler,
+            ToggleBootstrapProvider bootstrapHandler,
             EventDispatcher eventDispatcher) {
         this.unleashConfig = unleashConfig;
         this.featureBackupHandler = featureBackupHandler;
         this.engine = engine;
         this.featureFetcher = fetcher;
-        this.featureBootstrapHandler = bootstrapHandler;
+        this.bootstrapper = bootstrapHandler;
         this.eventDispatcher = eventDispatcher;
-        this.throttler =
-                new Throttler(
-                        (int) unleashConfig.getFetchTogglesInterval(),
-                        300,
-                        unleashConfig.getUnleashURLs().getFetchTogglesURL());
+        this.throttler = new Throttler(
+                (int) unleashConfig.getFetchTogglesInterval(),
+                300,
+                unleashConfig.getUnleashURLs().getFetchTogglesURL());
         this.initCollections(unleashConfig.getScheduledExecutor());
     }
 
     @SuppressWarnings("FutureReturnValueIgnored")
     private void initCollections(UnleashScheduledExecutor executor) {
         Optional<String> features = this.featureBackupHandler.read();
         if (!features.isPresent()) {
-            features = this.featureBootstrapHandler.read();
+            features = this.bootstrapper.read();
         }
         if (features.isPresent()) {
             try {
@@ -110,9 +111,9 @@ private void initCollections(UnleashScheduledExecutor executor) {
                 updateFeatures(this.unleashConfig.getStartupExceptionHandler()).run();
             } else {
                 updateFeatures(
-                                e -> {
-                                    throw e;
-                                })
+                        e -> {
+                            throw e;
+                        })
                         .run();
             }
         }

diff --git a/src/main/java/io/getunleash/repository/HttpFeatureFetcher.java b/src/main/java/io/getunleash/repository/HttpFeatureFetcher.java
@@ -1,6 +1,7 @@
 package io.getunleash.repository;
 
 import io.getunleash.UnleashException;
+import io.getunleash.event.ClientFeaturesResponse;
 import io.getunleash.util.UnleashConfig;
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/src/main/java/io/getunleash/repository/OkHttpFeatureFetcher.java b/src/main/java/io/getunleash/repository/OkHttpFeatureFetcher.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.JsonSyntaxException;
 import io.getunleash.UnleashException;
+import io.getunleash.event.ClientFeaturesResponse;
 import io.getunleash.util.OkHttpClientConfigurer;
 import io.getunleash.util.UnleashConfig;
 import java.io.File;