From 170ccf8308cb4e86ed96b7bcd8a77cd6342999b5 Mon Sep 17 00:00:00 2001
From: bbaker <bbaker@atlassian.com>
Date: Fri, 24 May 2024 11:43:11 +1000
Subject: [PATCH] reorged method placement

---
 .../java/org/dataloader/DataLoaderHelper.java | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/dataloader/DataLoaderHelper.java b/src/main/java/org/dataloader/DataLoaderHelper.java
index 14ed9bf..62a7cb6 100644
--- a/src/main/java/org/dataloader/DataLoaderHelper.java
+++ b/src/main/java/org/dataloader/DataLoaderHelper.java
@@ -533,25 +533,6 @@ private CompletableFuture<List<V>> invokeBatchPublisher(List<K> keys, List<Objec
         return loadResult;
     }
 
-    private ReactiveSupport.HelperIntegration<K> helperIntegration() {
-        return new ReactiveSupport.HelperIntegration<>() {
-            @Override
-            public StatisticsCollector getStats() {
-                return stats;
-            }
-
-            @Override
-            public void clearCacheView(K key) {
-                dataLoader.clear(key);
-            }
-
-            @Override
-            public void clearCacheEntriesOnExceptions(List<K> keys) {
-                possiblyClearCacheEntriesOnExceptions(keys);
-            }
-        };
-    }
-
     private CompletableFuture<List<V>> invokeMappedBatchPublisher(List<K> keys, List<Object> keyContexts, List<CompletableFuture<V>> queuedFutures, BatchLoaderEnvironment environment) {
         CompletableFuture<List<V>> loadResult = new CompletableFuture<>();
         Subscriber<Map.Entry<K, V>> subscriber = ReactiveSupport.mappedBatchSubscriber(loadResult, keys, keyContexts, queuedFutures, helperIntegration());
@@ -642,4 +623,22 @@ private static <T> DispatchResult<T> emptyDispatchResult() {
         return (DispatchResult<T>) EMPTY_DISPATCH_RESULT;
     }
 
+    private ReactiveSupport.HelperIntegration<K> helperIntegration() {
+        return new ReactiveSupport.HelperIntegration<>() {
+            @Override
+            public StatisticsCollector getStats() {
+                return stats;
+            }
+
+            @Override
+            public void clearCacheView(K key) {
+                dataLoader.clear(key);
+            }
+
+            @Override
+            public void clearCacheEntriesOnExceptions(List<K> keys) {
+                possiblyClearCacheEntriesOnExceptions(keys);
+            }
+        };
+    }
 }