Commit f46d281b authored by Dave Syer's avatar Dave Syer

Upgrade to Reactor 1.1

Fixes gh-706
parent a27be338
...@@ -202,8 +202,8 @@ ...@@ -202,8 +202,8 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectreactor</groupId> <groupId>org.projectreactor.spring</groupId>
<artifactId>reactor-spring</artifactId> <artifactId>reactor-spring-context</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -3,6 +3,7 @@ package org.test ...@@ -3,6 +3,7 @@ package org.test
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@EnableReactor @EnableReactor
@Consumer
@Log @Log
class Runner implements CommandLineRunner { class Runner implements CommandLineRunner {
...@@ -22,7 +23,7 @@ class Runner implements CommandLineRunner { ...@@ -22,7 +23,7 @@ class Runner implements CommandLineRunner {
latch.await() latch.await()
} }
@Selector(reactor="reactor", value="hello") @Selector(value="hello")
void receive(String data) { void receive(String data) {
log.info "Hello ${data}" log.info "Hello ${data}"
latch.countDown() latch.countDown()
......
...@@ -37,17 +37,22 @@ public class ReactorCompilerAutoConfiguration extends CompilerAutoConfiguration ...@@ -37,17 +37,22 @@ public class ReactorCompilerAutoConfiguration extends CompilerAutoConfiguration
@Override @Override
public void applyDependencies(DependencyCustomizer dependencies) { public void applyDependencies(DependencyCustomizer dependencies) {
dependencies.ifAnyMissingClasses("reactor.core.Reactor") dependencies.ifAnyMissingClasses("reactor.core.Reactor")
.add("reactor-spring", false).add("reactor-core"); .add("reactor-spring-context", false).add("reactor-spring-core", false)
.add("reactor-core");
} }
@Override @Override
public void applyImports(ImportCustomizer imports) { public void applyImports(ImportCustomizer imports) {
imports.addImports("reactor.core.Reactor", "reactor.event.Event", imports.addImports("reactor.core.Reactor", "reactor.event.Event",
"reactor.function.Consumer", "reactor.function.Functions", "reactor.function.Consumer", "reactor.function.Functions",
"reactor.event.selector.Selectors", "reactor.spring.annotation.Selector", "reactor.event.selector.Selectors",
"reactor.spring.annotation.ReplyTo", "reactor.spring.context.annotation.Consumer",
"reactor.spring.context.config.EnableReactor").addStarImports( "reactor.spring.context.annotation.Selector",
"reactor.event.Selectors"); "reactor.spring.context.annotation.SelectorType",
"reactor.spring.context.annotation.ReplyTo",
"reactor.spring.context.config.EnableReactor")
.addStarImports("reactor.event.Selectors")
.addImport("ReactorEnvironment", "reactor.core.Environment");
} }
} }
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<mongodb.version>2.11.4</mongodb.version> <mongodb.version>2.11.4</mongodb.version>
<mysql.version>5.1.30</mysql.version> <mysql.version>5.1.30</mysql.version>
<neo4j.version>2.0.2</neo4j.version> <neo4j.version>2.0.2</neo4j.version>
<reactor.version>1.0.1.RELEASE</reactor.version> <reactor.version>1.1.0.RELEASE</reactor.version>
<servlet-api.version>3.0.1</servlet-api.version> <servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<snakeyaml.version>1.13</snakeyaml.version> <snakeyaml.version>1.13</snakeyaml.version>
...@@ -418,8 +418,23 @@ ...@@ -418,8 +418,23 @@
<version>${reactor.version}</version> <version>${reactor.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectreactor</groupId> <groupId>org.projectreactor.spring</groupId>
<artifactId>reactor-spring</artifactId> <artifactId>reactor-spring-core</artifactId>
<version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>org.projectreactor.spring</groupId>
<artifactId>reactor-spring-context</artifactId>
<version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>org.projectreactor.spring</groupId>
<artifactId>reactor-spring-messaging</artifactId>
<version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>org.projectreactor.spring</groupId>
<artifactId>reactor-spring-webmvc</artifactId>
<version>${reactor.version}</version> <version>${reactor.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment