Merge remote-tracking branch 'origin/master' into idiomatic-arquillian

Author: jroper

messaging/tck/src/main/java/org/eclipse/microprofile/reactive/messaging/tck/container/MockedSender.java

@@ -65,7 +65,7 @@ public PublisherBuilder<T> createPublisher() {
     }
 
     public void send(T... message) {
-        queue.addAll(Arrays.asList(message).stream().map(SimpleMessage::new).collect(Collectors.toList()));
+        queue.addAll(Arrays.stream(message).map(SimpleMessage::new).collect(Collectors.toList()));
         trySend();
     }
 

streams/api/src/main/java/org/eclipse/microprofile/reactive/streams/ReactiveStreams.java

@@ -25,6 +25,7 @@
 import org.reactivestreams.Subscriber;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
@@ -59,7 +60,7 @@ public static <T> PublisherBuilder<T> fromPublisher(Publisher<? extends T> publi
      * @return A publisher builder that will emit the element.
      */
     public static <T> PublisherBuilder<T> of(T t) {
-        return new PublisherBuilder<>(new Stage.Of(Arrays.asList(t)));
+        return new PublisherBuilder<>(new Stage.Of(Collections.singletonList(t)));
     }
 
     /**

streams/tck/src/main/java/org/eclipse/microprofile/reactive/streams/tck/CancelStageVerification.java

@@ -25,7 +25,7 @@
 import org.testng.SkipException;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -38,25 +38,23 @@ public class CancelStageVerification extends AbstractStageVerification {
     @Test
     public void cancelStageShouldCancelTheStage() {
         CompletableFuture<Void> cancelled = new CompletableFuture<>();
-        CompletionStage<Void> result = ReactiveStreams.fromPublisher(s -> {
-            s.onSubscribe(new Subscription() {
-                @Override
-                public void request(long n) {
-                }
+        CompletionStage<Void> result = ReactiveStreams.fromPublisher(s -> s.onSubscribe(new Subscription() {
+            @Override
+            public void request(long n) {
+            }
 
-                @Override
-                public void cancel() {
-                    cancelled.complete(null);
-                }
-            });
-        }).cancel().run(getEngine());
+            @Override
+            public void cancel() {
+                cancelled.complete(null);
+            }
+        })).cancel().run(getEngine());
         await(cancelled);
         await(result);
     }
 
     @Override
     List<Object> reactiveStreamsTckVerifiers() {
-        return Arrays.asList(new SubscriberVerification());
+        return Collections.singletonList(new SubscriberVerification());
     }
 
     public class SubscriberVerification extends StageSubscriberBlackboxVerification {

streams/tck/src/main/java/org/eclipse/microprofile/reactive/streams/tck/PeekStageVerification.java

@@ -42,9 +42,7 @@ public class PeekStageVerification extends AbstractStageVerification {
     public void peekStageShouldNotModifyElements() {
         AtomicInteger count = new AtomicInteger();
         assertEquals(await(ReactiveStreams.of(1, 2, 3)
-            .peek(i -> {
-                count.incrementAndGet();
-            })
+            .peek(i -> count.incrementAndGet())
             .toList()
             .run(getEngine())), Arrays.asList(1, 2, 3));
         assertEquals(count.get(), 3);

streams/tck/src/main/java/org/eclipse/microprofile/reactive/streams/tck/SubscriberStageVerification.java

@@ -51,17 +51,15 @@ public void subscriberStageShouldRedeemCompletionStageWhenFailed() {
 
     @Test(expectedExceptions = CancellationException.class)
     public void subscriberStageShouldRedeemCompletionStageWithCancellationExceptionWhenCancelled() {
-        CompletionStage<Void> result = ReactiveStreams.fromPublisher(subscriber -> {
-            subscriber.onSubscribe(new Subscription() {
-                @Override
-                public void request(long n) {
-                }
+        CompletionStage<Void> result = ReactiveStreams.fromPublisher(subscriber -> subscriber.onSubscribe(new Subscription() {
+            @Override
+            public void request(long n) {
+            }
 
-                @Override
-                public void cancel() {
-                }
-            });
-        }).to(
+            @Override
+            public void cancel() {
+            }
+        })).to(
             ReactiveStreams.builder().cancel().build(getEngine())
         ).run(getEngine());
         await(result);