Start building against Reactor 2.0.1 snapshots

See gh-2719

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java

@@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import reactor.core.Environment;
-import reactor.core.Reactor;
+import reactor.Environment;
+import reactor.bus.EventBus;
 import reactor.spring.context.config.EnableReactor;
 
 /**
@@ -39,15 +39,16 @@ import reactor.spring.context.config.EnableReactor;
 public class ReactorAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(Reactor.class)
-	public Reactor rootReactor(Environment environment) {
-		return environment.getRootReactor();
+	@ConditionalOnMissingBean(EventBus.class)
+	public EventBus eventBus(Environment environment) {
+		return EventBus.create(environment);
 	}
 
 	@Configuration
 	@ConditionalOnMissingBean(Environment.class)
 	@EnableReactor
 	protected static class ReactorConfiguration {
+
 	}
 
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-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.
@@ -21,43 +21,53 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import reactor.core.Environment;
-import reactor.core.Reactor;
-import reactor.core.spec.Reactors;
+import reactor.bus.EventBus;
+import reactor.core.Dispatcher;
+import reactor.core.dispatch.MpscDispatcher;
+import reactor.core.dispatch.RingBufferDispatcher;
 
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.assertThat;
 
 /**
  * Tests for {@link ReactorAutoConfiguration}.
  *
  * @author Dave Syer
+ * @author Andy Wilkinson
  */
 public class ReactorAutoConfigurationTests {
 
 	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
 	@Test
-	public void reactorIsAvailable() {
+	public void eventBusIsAvailable() {
 		this.context.register(ReactorAutoConfiguration.class);
 		this.context.refresh();
-		assertNotNull(this.context.getBean(Reactor.class));
+		EventBus eventBus = this.context.getBean(EventBus.class);
+		assertThat(eventBus.getDispatcher(), instanceOf(RingBufferDispatcher.class));
 		this.context.close();
 	}
 
 	@Test
-	public void customReactor() {
+	public void customEventBus() {
 		this.context.register(TestConfiguration.class, ReactorAutoConfiguration.class);
 		this.context.refresh();
-		assertNotNull(this.context.getBean(Reactor.class));
+		EventBus eventBus = this.context.getBean(EventBus.class);
+		assertThat(eventBus.getDispatcher(), instanceOf(MpscDispatcher.class));
 		this.context.close();
 	}
 
 	@Configuration
 	protected static class TestConfiguration {
 
+		@Bean(destroyMethod = "shutdown")
+		public Dispatcher dispatcher() {
+			return new MpscDispatcher("test");
+		}
+
 		@Bean
-		public Reactor reactor(Environment env) {
-			return Reactors.reactor().env(env).dispatcher(Environment.RING_BUFFER).get();
+		public EventBus customEventBus() {
+			return EventBus.create(dispatcher());
 		}
 	}