Bad naming in context provider options

Author: bbakerman

README.md

@@ -178,7 +178,7 @@ for the context object.
 
 ```java
         DataLoaderOptions options = DataLoaderOptions.newOptions()
-                .setBatchLoaderEnvironmentProvider(() -> SecurityCtx.getCallingUserCtx());
+                .setBatchLoaderContextProvider(() -> SecurityCtx.getCallingUserCtx());
 
         BatchLoaderWithContext<String, String> batchLoader = new BatchLoaderWithContext<String, String>() {
             @Override

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

@@ -222,7 +222,7 @@ CompletableFuture<V> invokeLoaderImmediately(K key, Object keyContext) {
         List<K> keys = singletonList(key);
         CompletionStage<V> singleLoadCall;
         try {
-            Object context = loaderOptions.getBatchLoaderEnvironmentProvider().getContext();
+            Object context = loaderOptions.getBatchLoaderContextProvider().getContext();
             Map<Object, Object> keyContextMap = mkKeyContextMap(keys, singletonList(keyContext));
             BatchLoaderEnvironment environment = BatchLoaderEnvironment.newBatchLoaderEnvironment()
                     .context(context).keyContexts(keyContextMap).build();
@@ -240,7 +240,7 @@ CompletableFuture<V> invokeLoaderImmediately(K key, Object keyContext) {
     CompletionStage<List<V>> invokeLoader(List<K> keys, List<Object> keyContexts) {
         CompletionStage<List<V>> batchLoad;
         try {
-            Object context = loaderOptions.getBatchLoaderEnvironmentProvider().getContext();
+            Object context = loaderOptions.getBatchLoaderContextProvider().getContext();
             Map<Object, Object> keyContextMap = mkKeyContextMap(keys, keyContexts);
             BatchLoaderEnvironment environment = BatchLoaderEnvironment.newBatchLoaderEnvironment()
                     .context(context).keyContexts(keyContextMap).build();

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

@@ -210,19 +210,19 @@ public DataLoaderOptions setStatisticsCollector(Supplier<StatisticsCollector> st
     /**
      * @return the batch environment provider that will be used to give context to batch load functions
      */
-    public BatchLoaderContextProvider getBatchLoaderEnvironmentProvider() {
+    public BatchLoaderContextProvider getBatchLoaderContextProvider() {
         return environmentProvider;
     }
 
     /**
      * Sets the batch loader environment provider that will be used to give context to batch load functions
      *
-     * @param environmentProvider the batch loader environment provider
+     * @param contextProvider the batch loader context provider
      *
      * @return the data loader options for fluent coding
      */
-    public DataLoaderOptions setBatchLoaderEnvironmentProvider(BatchLoaderContextProvider environmentProvider) {
-        this.environmentProvider = nonNull(environmentProvider);
+    public DataLoaderOptions setBatchLoaderContextProvider(BatchLoaderContextProvider contextProvider) {
+        this.environmentProvider = nonNull(contextProvider);
         return this;
     }
 }

src/test/java/ReadmeExamples.java

@@ -85,7 +85,7 @@ public CompletionStage<List<User>> load(List<Long> userIds) {
 
     private void callContextExample() {
         DataLoaderOptions options = DataLoaderOptions.newOptions()
-                .setBatchLoaderEnvironmentProvider(() -> SecurityCtx.getCallingUserCtx());
+                .setBatchLoaderContextProvider(() -> SecurityCtx.getCallingUserCtx());
 
         BatchLoaderWithContext<String, String> batchLoader = new BatchLoaderWithContext<String, String>() {
             @Override

src/test/java/org/dataloader/DataLoaderBatchLoaderEnvironmentTest.java

@@ -3,7 +3,6 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,7 +38,7 @@ public void context_is_passed_to_batch_loader_function() throws Exception {
             return CompletableFuture.completedFuture(list);
         };
         DataLoaderOptions options = DataLoaderOptions.newOptions()
-                .setBatchLoaderEnvironmentProvider(() -> "ctx");
+                .setBatchLoaderContextProvider(() -> "ctx");
         DataLoader<String, String> loader = DataLoader.newDataLoader(batchLoader, options);
 
         loader.load("A");
@@ -55,7 +54,7 @@ public void context_is_passed_to_batch_loader_function() throws Exception {
     public void key_contexts_are_passed_to_batch_loader_function() throws Exception {
         BatchLoaderWithContext<String, String> batchLoader = contextBatchLoader();
         DataLoaderOptions options = DataLoaderOptions.newOptions()
-                .setBatchLoaderEnvironmentProvider(() -> "ctx");
+                .setBatchLoaderContextProvider(() -> "ctx");
         DataLoader<String, String> loader = DataLoader.newDataLoader(batchLoader, options);
 
         loader.load("A", "aCtx");
@@ -72,7 +71,7 @@ public void key_contexts_are_passed_to_batch_loader_function_when_batching_disab
         BatchLoaderWithContext<String, String> batchLoader = contextBatchLoader();
         DataLoaderOptions options = DataLoaderOptions.newOptions()
                 .setBatchingEnabled(false)
-                .setBatchLoaderEnvironmentProvider(() -> "ctx");
+                .setBatchLoaderContextProvider(() -> "ctx");
         DataLoader<String, String> loader = DataLoader.newDataLoader(batchLoader, options);
 
         CompletableFuture<String> aLoad = loader.load("A", "aCtx");
@@ -89,7 +88,7 @@ public void key_contexts_are_passed_to_batch_loader_function_when_batching_disab
     public void missing_key_contexts_are_passed_to_batch_loader_function() throws Exception {
         BatchLoaderWithContext<String, String> batchLoader = contextBatchLoader();
         DataLoaderOptions options = DataLoaderOptions.newOptions()
-                .setBatchLoaderEnvironmentProvider(() -> "ctx");
+                .setBatchLoaderContextProvider(() -> "ctx");
         DataLoader<String, String> loader = DataLoader.newDataLoader(batchLoader, options);
 
         loader.load("A", "aCtx");
@@ -113,7 +112,7 @@ public void context_is_passed_to_map_batch_loader_function() throws Exception {
             return CompletableFuture.completedFuture(map);
         };
         DataLoaderOptions options = DataLoaderOptions.newOptions()
-                .setBatchLoaderEnvironmentProvider(() -> "ctx");
+                .setBatchLoaderContextProvider(() -> "ctx");
         DataLoader<String, String> loader = DataLoader.newMappedDataLoader(mapBatchLoader, options);
 
         loader.load("A", "aCtx");