Merge remote-tracking branch 'origin/master' into instrumentation-sup…

…port # Conflicts: #	src/main/java/org/dataloader/DataLoaderOptions.java

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

@@ -17,7 +17,6 @@
 package org.dataloader;
 
 import org.dataloader.annotations.PublicApi;
-import org.dataloader.impl.Assertions;
 import org.dataloader.instrumentation.DataLoaderInstrumentation;
 import org.dataloader.instrumentation.DataLoaderInstrumentationHelper;
 import org.dataloader.scheduler.BatchLoaderScheduler;
@@ -44,18 +43,18 @@ public class DataLoaderOptions {
  private static final Supplier<StatisticsCollector> NOOP_COLLECTOR = NoOpStatisticsCollector::new;
  private static final ValueCacheOptions DEFAULT_VALUE_CACHE_OPTIONS = ValueCacheOptions.newOptions();
 
- private boolean batchingEnabled;
- private boolean cachingEnabled;
- private boolean cachingExceptionsEnabled;
- private CacheKey<?> cacheKeyFunction;
- private CacheMap<?, ?> cacheMap;
- private ValueCache<?, ?> valueCache;
- private int maxBatchSize;
- private Supplier<StatisticsCollector> statisticsCollector;
- private BatchLoaderContextProvider environmentProvider;
- private ValueCacheOptions valueCacheOptions;
- private BatchLoaderScheduler batchLoaderScheduler;
- private DataLoaderInstrumentation instrumentation;
+ private final boolean batchingEnabled;
+ private final boolean cachingEnabled;
+ private final boolean cachingExceptionsEnabled;
+ private final CacheKey<?> cacheKeyFunction;
+ private final CacheMap<?, ?> cacheMap;
+ private final ValueCache<?, ?> valueCache;
+ private final int maxBatchSize;
+ private final Supplier<StatisticsCollector> statisticsCollector;
+ private final BatchLoaderContextProvider environmentProvider;
+ private final ValueCacheOptions valueCacheOptions;
+ private final BatchLoaderScheduler batchLoaderScheduler;
+ private final DataLoaderInstrumentation instrumentation;
 
  /**
  * Creates a new data loader options with default settings.