Update TCP/Reactor

Issue: SPR-12599

Author: rstoyanchev

build.gradle

@@ -117,9 +117,9 @@ configure(allprojects) { project ->
 	}
 
 	repositories {
-		mavenLocal()
 		maven { url "https://repo.spring.io/libs-release" }
 		maven { url "https://repo.spring.io/milestone" }
+		maven { url "https://repo.spring.io/snapshot" } // for reactor 2.0.1 snapshot
 	}
 
 	dependencies {
@@ -487,6 +487,7 @@ project("spring-messaging") {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		compile(project(":spring-context"))
+		optional("io.projectreactor:reactor-core:${reactorVersion}")
 		optional("io.projectreactor:reactor-net:${reactorVersion}") {
 			exclude group: "io.netty", module: "netty-all"
 		}
@@ -497,7 +498,6 @@ project("spring-messaging") {
 		optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		testCompile(project(":spring-test"))
-		testCompile('org.slf4j:slf4j-log4j12:1.7.10')
 		testCompile("javax.inject:javax.inject-tck:1")
 		testCompile("javax.servlet:javax.servlet-api:3.1.0")
 		testCompile("javax.validation:validation-api:1.0.0.GA")

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/Reactor2StompCodec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/Reactor2TcpStompClient.java

@@ -18,16 +18,17 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.tcp.TcpOperations;
 import org.springframework.messaging.tcp.reactor.Reactor2TcpClient;
+import org.springframework.messaging.tcp.reactor.Reactor2TcpClient.TcpClientSpecFactory;
 import org.springframework.util.concurrent.ListenableFuture;
 import reactor.Environment;
 import reactor.core.config.ConfigurationReader;
 import reactor.core.config.DispatcherConfiguration;
 import reactor.core.config.DispatcherType;
 import reactor.core.config.ReactorConfiguration;
-import reactor.fn.Function;
-import reactor.io.net.Spec;
+import reactor.io.net.Spec.TcpClientSpec;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 
 /**
@@ -52,40 +53,18 @@ public Reactor2TcpStompClient() {
 
 	/**
 	 * Create an instance with the given host and port.
-	 *
 	 * @param host the host
 	 * @param port the port
 	 */
 	public Reactor2TcpStompClient(final String host, final int port) {
-		this.tcpClient = new Reactor2TcpClient<byte[]>(createNettyTcpClientFactory(host, port));
-	}
-
-	private Function<Spec.TcpClientSpec<Message<byte[]>, Message<byte[]>>,
-			Spec.TcpClientSpec<Message<byte[]>, Message<byte[]>>> createNettyTcpClientFactory(
-			final String host, final int port
-	) {
-
-		final Environment environment = new Environment(new StompClientDispatcherConfigReader()).assignErrorJournal();
-
-		return new Function<Spec.TcpClientSpec<Message<byte[]>, Message<byte[]>>,
-				Spec.TcpClientSpec<Message<byte[]>, Message<byte[]>>>() {
-
-			@Override
-			public Spec.TcpClientSpec<Message<byte[]>, Message<byte[]>> apply(Spec.TcpClientSpec<Message<byte[]>,
-					Message<byte[]>> spec) {
-
-				return spec
-						.codec(new Reactor2StompCodec(new StompEncoder(), new StompDecoder()))
-						.env(environment)
-						.dispatcher(environment.getCachedDispatchers("StompClient").get())
-						.connect(host, port);
-			}
-		};
+		ConfigurationReader reader = new StompClientDispatcherConfigReader();
+		Environment environment = new Environment(reader).assignErrorJournal();
+		StompTcpClientSpecFactory factory = new StompTcpClientSpecFactory(environment, host, port);
+		this.tcpClient = new Reactor2TcpClient<byte[]>(factory);
 	}
 
 	/**
 	 * Create an instance with a pre-configured TCP client.
-	 *
 	 * @param tcpClient the client to use
 	 */
 	public Reactor2TcpStompClient(TcpOperations<byte[]> tcpClient) {
@@ -136,8 +115,35 @@ public ReactorConfiguration read() {
 			String dispatcherName = "StompClient";
 			DispatcherType dispatcherType = DispatcherType.DISPATCHER_GROUP;
 			DispatcherConfiguration config = new DispatcherConfiguration(dispatcherName, dispatcherType, 128, 0);
-			return new ReactorConfiguration(Arrays.<DispatcherConfiguration>asList(config), dispatcherName, new Properties
-					());
+			List<DispatcherConfiguration> configList = Arrays.<DispatcherConfiguration>asList(config);
+			return new ReactorConfiguration(configList, dispatcherName, new Properties());
+		}
+	}
+
+	private static class StompTcpClientSpecFactory
+			implements TcpClientSpecFactory<Message<byte[]>, Message<byte[]>> {
+
+		private final Environment environment;
+
+		private final String host;
+
+		private final int port;
+
+		public StompTcpClientSpecFactory(Environment environment, String host, int port) {
+			this.environment = environment;
+			this.host = host;
+			this.port = port;
+		}
+
+		@Override
+		public TcpClientSpec<Message<byte[]>, Message<byte[]>> apply(
+				TcpClientSpec<Message<byte[]>, Message<byte[]>> tcpClientSpec) {
+
+			return tcpClientSpec
+					.codec(new Reactor2StompCodec(new StompEncoder(), new StompDecoder()))
+					.env(this.environment)
+					.dispatcher(this.environment.getCachedDispatchers("StompClient").get())
+					.connect(this.host, this.port);
 		}
 	}
 

spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/AbstractPromiseToListenableFutureAdapter.java

@@ -54,7 +54,8 @@ protected AbstractPromiseToListenableFutureAdapter(Promise<S> promise) {
 			public void accept(S result) {
 				try {
 					registry.success(adapt(result));
-				} catch (Throwable t) {
+				}
+				catch (Throwable t) {
 					registry.failure(t);
 				}
 			}

spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/PassThroughPromiseToListenableFutureAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,11 @@
 
 package org.springframework.messaging.tcp.reactor;
 
-
 import reactor.rx.Promise;
 
 /**
- * A Promise-to-ListenableFutureAdapter where the source and the target from the Promise and
- * the ListenableFuture respectively are of the same type.
+ * A Promise-to-ListenableFutureAdapter where the source and the target from
+ * the Promise and the ListenableFuture respectively are of the same type.
  *
  * @author Rossen Stoyanchev
  * @since 4.0