Skip to content

Commit e98621b

Browse files
committed
renamed classes inline with their counterparts
1 parent 91d3036 commit e98621b

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/main/java/org/dataloader/DataLoaderHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import org.dataloader.annotations.Internal;
55
import org.dataloader.impl.CompletableFutureKit;
66
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;
99
import org.dataloader.scheduler.BatchLoaderScheduler;
1010
import org.dataloader.stats.StatisticsCollector;
1111
import org.dataloader.stats.context.IncrementBatchLoadCountByStatisticsContext;
@@ -510,7 +510,7 @@ private CompletableFuture<List<V>> invokeMapBatchLoader(List<K> keys, BatchLoade
510510

511511
private CompletableFuture<List<V>> invokeBatchPublisher(List<K> keys, List<Object> keyContexts, List<CompletableFuture<V>> queuedFutures, BatchLoaderEnvironment environment) {
512512
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());
514514

515515
BatchLoaderScheduler batchLoaderScheduler = loaderOptions.getBatchLoaderScheduler();
516516
if (batchLoadFunction instanceof BatchPublisherWithContext) {
@@ -556,7 +556,7 @@ public void clearCacheEntriesOnExceptions(List<K> keys) {
556556

557557
private CompletableFuture<List<V>> invokeMappedBatchPublisher(List<K> keys, List<Object> keyContexts, List<CompletableFuture<V>> queuedFutures, BatchLoaderEnvironment environment) {
558558
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());
560560

561561
BatchLoaderScheduler batchLoaderScheduler = loaderOptions.getBatchLoaderScheduler();
562562
if (batchLoadFunction instanceof MappedBatchPublisherWithContext) {

src/main/java/org/dataloader/reactive/DataLoaderSubscriberBase.java renamed to src/main/java/org/dataloader/reactive/AbstractBatchSubscriber.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @param <T> for two
2020
*/
21-
abstract class DataLoaderSubscriberBase<K, V, T> implements Subscriber<T> {
21+
abstract class AbstractBatchSubscriber<K, V, T> implements Subscriber<T> {
2222

2323
final CompletableFuture<List<V>> valuesFuture;
2424
final List<K> keys;
@@ -31,7 +31,7 @@ abstract class DataLoaderSubscriberBase<K, V, T> implements Subscriber<T> {
3131
boolean onErrorCalled = false;
3232
boolean onCompleteCalled = false;
3333

34-
DataLoaderSubscriberBase(
34+
AbstractBatchSubscriber(
3535
CompletableFuture<List<V>> valuesFuture,
3636
List<K> keys,
3737
List<Object> callContexts,

src/main/java/org/dataloader/reactive/DataLoaderSubscriber.java renamed to src/main/java/org/dataloader/reactive/BatchSubscriber.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* @param <K> the type of keys
1616
* @param <V> the type of values
1717
*/
18-
public class DataLoaderSubscriber<K, V> extends DataLoaderSubscriberBase<K, V, V> {
18+
public class BatchSubscriber<K, V> extends AbstractBatchSubscriber<K, V, V> {
1919

2020
private int idx = 0;
2121

22-
public DataLoaderSubscriber(
22+
public BatchSubscriber(
2323
CompletableFuture<List<V>> valuesFuture,
2424
List<K> keys,
2525
List<Object> callContexts,

src/main/java/org/dataloader/reactive/DataLoaderMapEntrySubscriber.java renamed to src/main/java/org/dataloader/reactive/MappedBatchSubscriber.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
* @param <K> the type of keys
1616
* @param <V> the type of values
1717
*/
18-
public class DataLoaderMapEntrySubscriber<K, V> extends DataLoaderSubscriberBase<K, V, Map.Entry<K, V>> {
18+
public class MappedBatchSubscriber<K, V> extends AbstractBatchSubscriber<K, V, Map.Entry<K, V>> {
1919

2020
private final Map<K, Object> callContextByKey;
2121
private final Map<K, List<CompletableFuture<V>>> queuedFuturesByKey;
2222
private final Map<K, V> completedValuesByKey = new HashMap<>();
2323

2424

25-
public DataLoaderMapEntrySubscriber(
25+
public MappedBatchSubscriber(
2626
CompletableFuture<List<V>> valuesFuture,
2727
List<K> keys,
2828
List<Object> callContexts,

0 commit comments

Comments
 (0)