From 5bba4af5e360df24a0bf9f254972e75e7a3065ed Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 10 Dec 2018 13:06:58 -0500
Subject: [PATCH] Specifically injects the webFluxConversionService.

This allows other projects (spring-integration) to have another
ConversionService bean and auto-configuration won't fail.
---
 .../cloud/gateway/config/GatewayAutoConfiguration.java          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
index faf90563..bb3f58dd 100644
--- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
+++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
@@ -32,6 +32,7 @@ import reactor.netty.tcp.ProxyProvider;
 import rx.RxReactiveStreams;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -302,6 +303,7 @@ public class GatewayAutoConfiguration {
 													List<GatewayFilterFactory> GatewayFilters,
 													List<RoutePredicateFactory> predicates,
 													RouteDefinitionLocator routeDefinitionLocator,
+													@Qualifier("webFluxConversionService")
 													ConversionService conversionService) {
 		return new RouteDefinitionRouteLocator(routeDefinitionLocator, predicates, GatewayFilters,
 				properties, conversionService);