Skip to content

Commit 7bf46ea

Browse files
authored
Merge pull request #112 from dugenkui03/patch-01
Make NoOpStatisticsCollector to be default StatisticsCollector
2 parents 16e88d6 + b68f1b2 commit 7bf46ea

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

src/main/java/org/dataloader/DataLoaderOptions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.dataloader.annotations.PublicApi;
2020
import org.dataloader.impl.Assertions;
21-
import org.dataloader.stats.SimpleStatisticsCollector;
21+
import org.dataloader.stats.NoOpStatisticsCollector;
2222
import org.dataloader.stats.StatisticsCollector;
2323

2424
import java.util.Optional;
@@ -55,7 +55,7 @@ public DataLoaderOptions() {
5555
cachingEnabled = true;
5656
cachingExceptionsEnabled = true;
5757
maxBatchSize = -1;
58-
statisticsCollector = SimpleStatisticsCollector::new;
58+
statisticsCollector = NoOpStatisticsCollector::new;
5959
environmentProvider = NULL_PROVIDER;
6060
valueCacheOptions = ValueCacheOptions.newOptions();
6161
}

src/test/java/org/dataloader/DataLoaderRegistryTest.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.dataloader;
22

3+
import org.dataloader.stats.SimpleStatisticsCollector;
34
import org.dataloader.stats.Statistics;
45
import org.junit.Test;
56

@@ -77,9 +78,15 @@ public void stats_can_be_collected() {
7778

7879
DataLoaderRegistry registry = new DataLoaderRegistry();
7980

80-
DataLoader<Object, Object> dlA = newDataLoader(identityBatchLoader);
81-
DataLoader<Object, Object> dlB = newDataLoader(identityBatchLoader);
82-
DataLoader<Object, Object> dlC = newDataLoader(identityBatchLoader);
81+
DataLoader<Object, Object> dlA = newDataLoader(identityBatchLoader,
82+
DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new)
83+
);
84+
DataLoader<Object, Object> dlB = newDataLoader(identityBatchLoader,
85+
DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new)
86+
);
87+
DataLoader<Object, Object> dlC = newDataLoader(identityBatchLoader,
88+
DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new)
89+
);
8390

8491
registry.register("a", dlA).register("b", dlB).register("c", dlC);
8592

src/test/java/org/dataloader/DataLoaderStatsTest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public class DataLoaderStatsTest {
2424
@Test
2525
public void stats_are_collected_by_default() {
2626
BatchLoader<String, String> batchLoader = CompletableFuture::completedFuture;
27-
DataLoader<String, String> loader = newDataLoader(batchLoader);
27+
DataLoader<String, String> loader = newDataLoader(batchLoader,
28+
DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new)
29+
);
2830

2931
loader.load("A");
3032
loader.load("B");
@@ -154,7 +156,9 @@ public void stats_are_collected_with_caching_disabled() {
154156

155157
@Test
156158
public void stats_are_collected_on_exceptions() {
157-
DataLoader<String, String> loader = DataLoaderFactory.newDataLoaderWithTry(batchLoaderThatBlows);
159+
DataLoader<String, String> loader = DataLoaderFactory.newDataLoaderWithTry(batchLoaderThatBlows,
160+
DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new)
161+
);
158162

159163
loader.load("A");
160164
loader.load("exception");

0 commit comments

Comments
 (0)