Skip to content

Commit a93112a

Browse files
committed
reactive streams support branch - getting it compiling
1 parent e16fa65 commit a93112a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/org/dataloader/BatchPublisher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* the future returned by {@link DataLoader#load(Object)} to complete as soon as the individual value is available
1212
* (rather than when all values have been retrieved).
1313
* <p>
14-
* <b>NOTE:</b> It is <b>required </b> that {@link Subscriber#onNext(V)} is invoked on each value in the same order as
14+
* <b>NOTE:</b> It is <b>required </b> that {@link Subscriber#onNext(Object)} is invoked on each value in the same order as
1515
* the provided keys.
1616
*
1717
* @param <K> type parameter indicating the type of keys to use for data load requests.

src/test/java/org/dataloader/DataLoaderBatchPublisherTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.dataloader.fixtures.User;
66
import org.dataloader.fixtures.UserManager;
77
import org.dataloader.impl.CompletableFutureKit;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99
import reactor.core.publisher.Flux;
1010

1111
import java.util.ArrayList;
@@ -30,12 +30,12 @@
3030
import static org.dataloader.DataLoaderOptions.newOptions;
3131
import static org.dataloader.fixtures.TestKit.listFrom;
3232
import static org.dataloader.impl.CompletableFutureKit.cause;
33+
import static org.hamcrest.MatcherAssert.assertThat;
3334
import static org.hamcrest.Matchers.empty;
3435
import static org.hamcrest.Matchers.equalTo;
3536
import static org.hamcrest.Matchers.instanceOf;
3637
import static org.hamcrest.Matchers.is;
37-
import static org.junit.Assert.assertArrayEquals;
38-
import static org.junit.Assert.assertThat;
38+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
3939

4040
public class DataLoaderBatchPublisherTest {
4141

src/test/java/org/dataloader/DataLoaderMappedBatchPublisherTest.java

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

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44
import reactor.core.publisher.Flux;
55

66
import java.util.ArrayList;
@@ -19,10 +19,10 @@
1919
import static org.dataloader.DataLoaderOptions.newOptions;
2020
import static org.dataloader.fixtures.TestKit.listFrom;
2121
import static org.dataloader.impl.CompletableFutureKit.cause;
22+
import static org.hamcrest.MatcherAssert.assertThat;
2223
import static org.hamcrest.Matchers.equalTo;
2324
import static org.hamcrest.Matchers.instanceOf;
2425
import static org.hamcrest.Matchers.is;
25-
import static org.junit.Assert.assertThat;
2626

2727
public class DataLoaderMappedBatchPublisherTest {
2828

0 commit comments

Comments
 (0)