Bumping versions

docs/src/main/asciidoc/_configprops.adoc

@@ -80,11 +80,11 @@
 |spring.cloud.gateway.httpclient.pool.max-life-time |  | Duration after which the channel will be closed. If NULL, there is no max life time.
 |spring.cloud.gateway.httpclient.pool.name | `proxy` | The channel pool map name, defaults to proxy.
 |spring.cloud.gateway.httpclient.pool.type |  | Type of pool for HttpClient to use, defaults to ELASTIC.
-|spring.cloud.gateway.httpclient.proxy.type | `HTTP` | proxyType for proxy configuration of Netty HttpClient.
 |spring.cloud.gateway.httpclient.proxy.host |  | Hostname for proxy configuration of Netty HttpClient.
 |spring.cloud.gateway.httpclient.proxy.non-proxy-hosts-pattern |  | Regular expression (Java) for a configured list of hosts. that should be reached directly, bypassing the proxy
 |spring.cloud.gateway.httpclient.proxy.password |  | Password for proxy configuration of Netty HttpClient.
 |spring.cloud.gateway.httpclient.proxy.port |  | Port for proxy configuration of Netty HttpClient.
+|spring.cloud.gateway.httpclient.proxy.type |  | proxyType for proxy configuration of Netty HttpClient.
 |spring.cloud.gateway.httpclient.proxy.username |  | Username for proxy configuration of Netty HttpClient.
 |spring.cloud.gateway.httpclient.response-timeout |  | The response timeout.
 |spring.cloud.gateway.httpclient.ssl.close-notify-flush-timeout | `3000ms` | SSL close_notify flush timeout. Default to 3000 ms.
@@ -141,4 +141,4 @@
 |spring.cloud.gateway.x-forwarded.proto-append | `true` | If appending X-Forwarded-Proto as a list is enabled.
 |spring.cloud.gateway.x-forwarded.proto-enabled | `true` | If X-Forwarded-Proto is enabled.
 
-|===
+|===

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/discovery/GatewayDiscoveryClientAutoConfigurationTest.java

@@ -40,20 +40,21 @@ public class GatewayDiscoveryClientAutoConfigurationTest {
 
 	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
-	private static final SimpleEvaluationContext CONTEXT = SimpleEvaluationContext.forReadOnlyDataBinding().withInstanceMethods().build();
+	private static final SimpleEvaluationContext CONTEXT = SimpleEvaluationContext.forReadOnlyDataBinding()
+			.withInstanceMethods().build();
 
 	private static final FilterDefinition DEFAULT_FILTER = GatewayDiscoveryClientAutoConfiguration.initFilters().get(0);
 
 	private ServiceInstance serviceInstance;
-	
+
 	@BeforeEach
-	public void buildServiceInstance(){
+	public void buildServiceInstance() {
 		this.serviceInstance = mock(ServiceInstance.class);
 		when(this.serviceInstance.getServiceId()).thenReturn(SERVICE_ID);
 	}
 
 	@Test
-	public void defaultRewritePathShouldHandleEmptyRemainingWithoutSlash(){
+	public void defaultRewritePathShouldHandleEmptyRemainingWithoutSlash() {
 		String expectedRemotePath = "/";
 
 		final String result = replace(BASE_URI);
@@ -62,7 +63,7 @@ public class GatewayDiscoveryClientAutoConfigurationTest {
 	}
 
 	@Test
-	public void defaultRewritePathShouldHandleEmptyRemainingWithSlash(){
+	public void defaultRewritePathShouldHandleEmptyRemainingWithSlash() {
 		String extraUri = "/";
 
 		final String result = replace(BASE_URI + extraUri);
@@ -70,9 +71,8 @@ public class GatewayDiscoveryClientAutoConfigurationTest {
 		assertThat(result).isEqualTo(extraUri);
 	}
 
-
 	@Test
-	public void defaultRewritePathShouldHandleNonEmptyRemainingPath(){
+	public void defaultRewritePathShouldHandleNonEmptyRemainingPath() {
 		String extraUri = "/some/additional/uri";
 
 		final String result = replace(BASE_URI + extraUri);
@@ -86,8 +86,8 @@ public class GatewayDiscoveryClientAutoConfigurationTest {
 	}
 
 	private String evaluateExpression(String expression) {
-		return Objects.requireNonNull(PARSER.parseExpression(expression)
-				.getValue(CONTEXT, serviceInstance, String.class));
+		return Objects
+				.requireNonNull(PARSER.parseExpression(expression).getValue(CONTEXT, serviceInstance, String.class));
 	}
 
 }