Warnings and test bug

Author: bbakerman

src/main/java/org/dataloader/DataLoader.java

@@ -59,7 +59,6 @@
  * @author <a href="https://github.com/aschrijver/">Arnold Schrijver</a>
  * @author <a href="https://github.com/bbakerman/">Brad Baker</a>
  */
-@SuppressWarnings("UnusedReturnValue")
 @PublicApi
 public class DataLoader<K, V> {
 

src/test/java/org/dataloader/DataLoaderIfPresentTest.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import static org.dataloader.DataLoaderFactory.*;
+import static org.dataloader.DataLoaderFactory.newDataLoader;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.sameInstance;
 import static org.junit.Assert.assertThat;

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

@@ -37,10 +37,10 @@ public void registration_works() {
         assertThat(registry.getDataLoaders(), equalTo(asList(dlA, dlB, dlC)));
 
 
-        // and unregister
-        DataLoaderRegistry dlUnregistered = registry.unregister("c");
+        // and unregister (fluently)
+        DataLoaderRegistry dlR = registry.unregister("c");
+        assertThat(dlR,equalTo(registry));
 
-        assertThat(dlUnregistered,equalTo(dlC));
         assertThat(registry.getDataLoaders(), equalTo(asList(dlA, dlB)));
 
         // look up by name works

src/test/java/org/dataloader/DataLoaderTest.java

@@ -35,7 +35,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.awaitility.Awaitility.await;
-import static org.dataloader.DataLoaderFactory.*;
+import static org.dataloader.DataLoaderFactory.newDataLoader;
 import static org.dataloader.DataLoaderOptions.newOptions;
 import static org.dataloader.TestKit.listFrom;
 import static org.dataloader.impl.CompletableFutureKit.cause;
@@ -244,7 +244,9 @@ public void should_Clear_single_value_in_loader() throws ExecutionException, Int
         assertThat(future2.get(), equalTo("B"));
         assertThat(loadCalls, equalTo(singletonList(asList("A", "B"))));
 
-        identityLoader.clear("A");
+        // fluency
+        DataLoader<String, String> dl = identityLoader.clear("A");
+        assertThat(dl, equalTo(identityLoader));
 
         CompletableFuture<String> future1a = identityLoader.load("A");
         CompletableFuture<String> future2a = identityLoader.load("B");
@@ -270,7 +272,8 @@ public void should_Clear_all_values_in_loader() throws ExecutionException, Inter
         assertThat(future2.get(), equalTo("B"));
         assertThat(loadCalls, equalTo(singletonList(asList("A", "B"))));
 
-        identityLoader.clearAll();
+        DataLoader<String, String> dlFluent = identityLoader.clearAll();
+        assertThat(dlFluent, equalTo(identityLoader)); // fluency
 
         CompletableFuture<String> future1a = identityLoader.load("A");
         CompletableFuture<String> future2a = identityLoader.load("B");
@@ -287,7 +290,8 @@ public void should_Allow_priming_the_cache() throws ExecutionException, Interrup
         List<Collection<String>> loadCalls = new ArrayList<>();
         DataLoader<String, String> identityLoader = idLoader(new DataLoaderOptions(), loadCalls);
 
-        identityLoader.prime("A", "A");
+        DataLoader<String, String> dlFluency = identityLoader.prime("A", "A");
+        assertThat(dlFluency, equalTo(identityLoader));
 
         CompletableFuture<String> future1 = identityLoader.load("A");
         CompletableFuture<String> future2 = identityLoader.load("B");