Fix initialization issue in ReactorResourceFactory

Follow-up on recent commit #d537a1c.

Issue: SPR-17243

spring-web/src/main/java/org/springframework/http/client/reactive/ReactorResourceFactory.java

@@ -46,9 +46,9 @@ public class ReactorResourceFactory implements InitializingBean, DisposableBean
 	private Consumer<HttpResources> globalResourcesConsumer;
 
 
-	private Supplier<ConnectionProvider> connectionProviderSupplier = () -> ConnectionProvider.elastic("http");
+	private Supplier<ConnectionProvider> connectionProviderSupplier = () -> ConnectionProvider.elastic("webflux");
 
-	private Supplier<LoopResources> loopResourcesSupplier = () -> LoopResources.create("reactor-http");
+	private Supplier<LoopResources> loopResourcesSupplier = () -> LoopResources.create("webflux-http");
 
 
 	@Nullable
@@ -166,6 +166,8 @@ public void afterPropertiesSet() throws Exception {
 			if (this.globalResourcesConsumer != null) {
 				this.globalResourcesConsumer.accept(httpResources);
 			}
+			this.connectionProvider = httpResources;
+			this.loopResources = httpResources;
 		}
 		else {
 			if (this.loopResources == null) {

spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2002-2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.http.client.reactive;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Test;
+import reactor.netty.http.HttpResources;
+import reactor.netty.resources.ConnectionProvider;
+import reactor.netty.resources.LoopResources;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * Unit tests for {@link ReactorResourceFactory}.
+ * @author Rossen Stoyanchev
+ */
+public class ReactorResourceFactoryTests {
+
+	private final ReactorResourceFactory resourceFactory = new ReactorResourceFactory();
+
+	private final ConnectionProvider connectionProvider = mock(ConnectionProvider.class);
+
+	private final LoopResources loopResources = mock(LoopResources.class);
+
+
+	@Test
+	public void globalResources() throws Exception {
+
+		this.resourceFactory.setUseGlobalResources(true);
+		this.resourceFactory.afterPropertiesSet();
+
+		HttpResources globalResources = HttpResources.get();
+		assertSame(globalResources, this.resourceFactory.getConnectionProvider());
+		assertSame(globalResources, this.resourceFactory.getLoopResources());
+		assertFalse(globalResources.isDisposed());
+
+		this.resourceFactory.destroy();
+
+		assertTrue(globalResources.isDisposed());
+	}
+
+	@Test
+	public void globalResourcesWithConsumer() throws Exception {
+
+		AtomicBoolean invoked = new AtomicBoolean(false);
+
+		this.resourceFactory.addGlobalResourcesConsumer(httpResources -> invoked.set(true));
+		this.resourceFactory.afterPropertiesSet();
+
+		assertTrue(invoked.get());
+		this.resourceFactory.destroy();
+	}
+
+	@Test
+	public void localResources() throws Exception {
+
+		this.resourceFactory.setUseGlobalResources(false);
+		this.resourceFactory.afterPropertiesSet();
+
+		ConnectionProvider connectionProvider = this.resourceFactory.getConnectionProvider();
+		LoopResources loopResources = this.resourceFactory.getLoopResources();
+
+		assertNotSame(HttpResources.get(), connectionProvider);
+		assertNotSame(HttpResources.get(), loopResources);
+
+		// The below does not work since ConnectionPoolProvider simply checks if pool is empty.
+		// assertFalse(connectionProvider.isDisposed());
+		assertFalse(loopResources.isDisposed());
+
+		this.resourceFactory.destroy();
+
+		assertTrue(connectionProvider.isDisposed());
+		assertTrue(loopResources.isDisposed());
+	}
+
+	@Test
+	public void localResourcesViaSupplier() throws Exception {
+
+		this.resourceFactory.setUseGlobalResources(false);
+		this.resourceFactory.setConnectionProviderSupplier(() -> this.connectionProvider);
+		this.resourceFactory.setLoopResourcesSupplier(() -> this.loopResources);
+		this.resourceFactory.afterPropertiesSet();
+
+		ConnectionProvider connectionProvider = this.resourceFactory.getConnectionProvider();
+		LoopResources loopResources = this.resourceFactory.getLoopResources();
+
+		assertSame(this.connectionProvider, connectionProvider);
+		assertSame(this.loopResources, loopResources);
+
+		verifyNoMoreInteractions(this.connectionProvider, this.loopResources);
+
+		this.resourceFactory.destroy();
+
+		// Managed (destroy disposes)..
+		verify(this.connectionProvider).dispose();
+		verify(this.loopResources).dispose();
+		verifyNoMoreInteractions(this.connectionProvider, this.loopResources);
+	}
+
+	@Test
+	public void externalResources() throws Exception {
+
+		this.resourceFactory.setUseGlobalResources(false);
+		this.resourceFactory.setConnectionProvider(this.connectionProvider);
+		this.resourceFactory.setLoopResources(this.loopResources);
+		this.resourceFactory.afterPropertiesSet();
+
+		ConnectionProvider connectionProvider = this.resourceFactory.getConnectionProvider();
+		LoopResources loopResources = this.resourceFactory.getLoopResources();
+
+		assertSame(this.connectionProvider, connectionProvider);
+		assertSame(this.loopResources, loopResources);
+
+		verifyNoMoreInteractions(this.connectionProvider, this.loopResources);
+
+		this.resourceFactory.destroy();
+
+		// Not managed (destroy has no impact)..
+		verifyNoMoreInteractions(this.connectionProvider, this.loopResources);
+	}
+
+}