From 94be412327a1e65e58c933748c7db321a889b51a Mon Sep 17 00:00:00 2001 From: Stephane Maldini Date: Thu, 7 Jan 2016 23:41:48 +0000 Subject: [PATCH] Remove last Stream reference --- .../ReactiveStreamsToReactorStreamConverter.java | 5 ++--- .../server/reactive/WriteWithOperatorTests.java | 16 +++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToReactorStreamConverter.java b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToReactorStreamConverter.java index 9ae1c8d19c..3cc34af221 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToReactorStreamConverter.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToReactorStreamConverter.java @@ -22,7 +22,6 @@ import java.util.Set; import org.reactivestreams.Publisher; import reactor.rx.Promise; import reactor.rx.Stream; -import reactor.rx.Streams; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.GenericConverter; @@ -52,13 +51,13 @@ public final class ReactiveStreamsToReactorStreamConverter implements GenericCon return source; } else if (Stream.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) { - return Streams.from((Publisher)source); + return Stream.from((Publisher)source); } else if (Promise.class.isAssignableFrom(source.getClass())) { return source; } else if (Promise.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) { - return Streams.from((Publisher)source).promise(); + return Stream.from((Publisher)source).promise(); } return null; } diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java index 12b06a3d2e..c4b8d22385 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java @@ -29,12 +29,10 @@ import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import reactor.Flux; import reactor.core.subscriber.SubscriberBarrier; -import reactor.rx.Streams; +import reactor.rx.Stream; import reactor.rx.stream.Signal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * @author Rossen Stoyanchev @@ -57,7 +55,7 @@ public class WriteWithOperatorTests { public void errorBeforeFirstItem() throws Exception { IllegalStateException error = new IllegalStateException("boo"); Publisher completion = Flux.error(error).lift(this.operator); - List> signals = Streams.from(completion).materialize().toList().get(); + List> signals = Stream.from(completion).materialize().toList().get(); assertEquals(1, signals.size()); assertSame("Unexpected signal: " + signals.get(0), error, signals.get(0).getThrowable()); @@ -66,7 +64,7 @@ public class WriteWithOperatorTests { @Test public void completionBeforeFirstItem() throws Exception { Publisher completion = Flux.empty().lift(this.operator); - List> signals = Streams.from(completion).materialize().toList().get(); + List> signals = Stream.from(completion).materialize().toList().get(); assertEquals(1, signals.size()); assertTrue("Unexpected signal: " + signals.get(0), signals.get(0).isOnComplete()); @@ -78,7 +76,7 @@ public class WriteWithOperatorTests { @Test public void writeOneItem() throws Exception { Publisher completion = Flux.just("one").lift(this.operator); - List> signals = Streams.from(completion).materialize().toList().get(); + List> signals = Stream.from(completion).materialize().toList().get(); assertEquals(1, signals.size()); assertTrue("Unexpected signal: " + signals.get(0), signals.get(0).isOnComplete()); @@ -93,7 +91,7 @@ public class WriteWithOperatorTests { public void writeMultipleItems() throws Exception { List items = Arrays.asList("one", "two", "three"); Publisher completion = Flux.fromIterable(items).lift(this.operator); - List> signals = Streams.from(completion).materialize().toList().get(); + List> signals = Stream.from(completion).materialize().toList().get(); assertEquals(1, signals.size()); assertTrue("Unexpected signal: " + signals.get(0), signals.get(0).isOnComplete()); @@ -116,7 +114,7 @@ public class WriteWithOperatorTests { } }, subscriber -> new AtomicInteger()); Publisher completion = publisher.lift(this.operator); - List> signals = Streams.from(completion).materialize().toList().get(); + List> signals = Stream.from(completion).materialize().toList().get(); assertEquals(1, signals.size()); assertSame("Unexpected signal: " + signals.get(0), error, signals.get(0).getThrowable());