pr feedback

Author: sanzmauro

client/src/main/java/io/split/client/SplitFactoryImpl.java

@@ -73,7 +73,6 @@ public class SplitFactoryImpl implements SplitFactory {
     private final EventClient _eventClient;
     private final SyncManager _syncManager;
     private final Evaluator _evaluator;
-    private final Runnable _destroyer;
     private final String _apiToken;
 
     // Caches
@@ -141,8 +140,13 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
         _syncManager = SyncManagerImp.build(config.streamingEnabled(), _splitSynchronizationTask, _splitFetcher, _segmentSynchronizationTaskImp, _splitCache, config.authServiceURL(), _httpclient, config.streamingServiceURL(), config.authRetryBackoffBase(), buildSSEdHttpClient(config), _segmentCache);
         _syncManager.start();
 
-        // Destroyer
-        _destroyer = buildDestroyer(config);
+        // DestroyOnShutDown
+        if (config.destroyOnShutDown()) {
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                // Using the full path to avoid conflicting with Thread.destroy()
+                SplitFactoryImpl.this.destroy();
+            }));
+        }
 
         // Evaluator
         _evaluator = new EvaluatorImp(_splitCache);
@@ -168,7 +172,30 @@ public SplitManager manager() {
     public void destroy() {
         synchronized (SplitFactoryImpl.class) {
             if (!isTerminated) {
-                _destroyer.run();
+                Runnable destroyer = () -> {
+                    _log.info("Shutdown called for split");
+                    try {
+                        _segmentSynchronizationTaskImp.close();
+                        _log.info("Successful shutdown of segment fetchers");
+                        _splitSynchronizationTask.close();
+                        _log.info("Successful shutdown of splits");
+                        _impressionsManager.close();
+                        _log.info("Successful shutdown of impressions manager");
+                        _unCachedFireAndForget.close();
+                        _log.info("Successful shutdown of metrics 1");
+                        _cachedFireAndForgetMetrics.close();
+                        _log.info("Successful shutdown of metrics 2");
+                        _httpclient.close();
+                        _log.info("Successful shutdown of httpclient");
+                        _eventClient.close();
+                        _log.info("Successful shutdown of eventClient");
+                        _syncManager.shutdown();
+                        _log.info("Successful shutdown of syncManager");
+                    } catch (IOException e) {
+                        _log.error("We could not shutdown split", e);
+                    }
+                };
+                destroyer.run();
                 _apiKeyCounter.remove(_apiToken);
                 isTerminated = true;
             }
@@ -306,37 +333,4 @@ private FireAndForgetMetrics buildCachedFireAndForgetMetrics(SplitClientConfig c
 
         return FireAndForgetMetrics.instance(cachedMetrics, 2, 1000);
     }
-
-    private Runnable buildDestroyer(SplitClientConfig config) {
-        if (config.destroyOnShutDown()) {
-            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-                // Using the full path to avoid conflicting with Thread.destroy()
-                SplitFactoryImpl.this.destroy();
-            }));
-        }
-
-        return () -> {
-            _log.info("Shutdown called for split");
-            try {
-                _segmentSynchronizationTaskImp.close();
-                _log.info("Successful shutdown of segment fetchers");
-                _splitSynchronizationTask.close();
-                _log.info("Successful shutdown of splits");
-                _impressionsManager.close();
-                _log.info("Successful shutdown of impressions manager");
-                _unCachedFireAndForget.close();
-                _log.info("Successful shutdown of metrics 1");
-                _cachedFireAndForgetMetrics.close();
-                _log.info("Successful shutdown of metrics 2");
-                _httpclient.close();
-                _log.info("Successful shutdown of httpclient");
-                _eventClient.close();
-                _log.info("Successful shutdown of eventClient");
-                _syncManager.shutdown();
-                _log.info("Successful shutdown of syncManager");
-            } catch (IOException e) {
-                _log.error("We could not shutdown split", e);
-            }
-        };
-    }
 }