|
4 | 4 | import org.dataloader.annotations.Internal;
|
5 | 5 | import org.dataloader.impl.CompletableFutureKit;
|
6 | 6 | import org.dataloader.reactive.HelperIntegration;
|
7 |
| -import org.dataloader.reactive.DataLoaderMapEntrySubscriber; |
8 |
| -import org.dataloader.reactive.DataLoaderSubscriber; |
| 7 | +import org.dataloader.reactive.MappedBatchSubscriber; |
| 8 | +import org.dataloader.reactive.BatchSubscriber; |
9 | 9 | import org.dataloader.scheduler.BatchLoaderScheduler;
|
10 | 10 | import org.dataloader.stats.StatisticsCollector;
|
11 | 11 | import org.dataloader.stats.context.IncrementBatchLoadCountByStatisticsContext;
|
@@ -510,7 +510,7 @@ private CompletableFuture<List<V>> invokeMapBatchLoader(List<K> keys, BatchLoade
|
510 | 510 |
|
511 | 511 | private CompletableFuture<List<V>> invokeBatchPublisher(List<K> keys, List<Object> keyContexts, List<CompletableFuture<V>> queuedFutures, BatchLoaderEnvironment environment) {
|
512 | 512 | CompletableFuture<List<V>> loadResult = new CompletableFuture<>();
|
513 |
| - Subscriber<V> subscriber = new DataLoaderSubscriber<>(loadResult, keys, keyContexts, queuedFutures, helperIntegration()); |
| 513 | + Subscriber<V> subscriber = new BatchSubscriber<>(loadResult, keys, keyContexts, queuedFutures, helperIntegration()); |
514 | 514 |
|
515 | 515 | BatchLoaderScheduler batchLoaderScheduler = loaderOptions.getBatchLoaderScheduler();
|
516 | 516 | if (batchLoadFunction instanceof BatchPublisherWithContext) {
|
@@ -556,7 +556,7 @@ public void clearCacheEntriesOnExceptions(List<K> keys) {
|
556 | 556 |
|
557 | 557 | private CompletableFuture<List<V>> invokeMappedBatchPublisher(List<K> keys, List<Object> keyContexts, List<CompletableFuture<V>> queuedFutures, BatchLoaderEnvironment environment) {
|
558 | 558 | CompletableFuture<List<V>> loadResult = new CompletableFuture<>();
|
559 |
| - Subscriber<Map.Entry<K, V>> subscriber = new DataLoaderMapEntrySubscriber<>(loadResult, keys, keyContexts, queuedFutures, helperIntegration()); |
| 559 | + Subscriber<Map.Entry<K, V>> subscriber = new MappedBatchSubscriber<>(loadResult, keys, keyContexts, queuedFutures, helperIntegration()); |
560 | 560 |
|
561 | 561 | BatchLoaderScheduler batchLoaderScheduler = loaderOptions.getBatchLoaderScheduler();
|
562 | 562 | if (batchLoadFunction instanceof MappedBatchPublisherWithContext) {
|
|
0 commit comments