Update SNAPSHOT to 2.2.9.RELEASE

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.9.BUILD-SNAPSHOT</version>
+		<version>2.2.9.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>2.2.9.BUILD-SNAPSHOT</version>
+	<version>2.2.9.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.4.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>2.2.9.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-netflix.version>2.2.9.RELEASE</spring-cloud-netflix.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.9.BUILD-SNAPSHOT</version>
+		<version>2.2.9.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java

@@ -375,7 +375,8 @@ public class FeignClientFactoryBean implements FactoryBean<Object>, Initializing
 		if (!StringUtils.hasText(url)) {
 
 			if (LOG.isInfoEnabled()) {
-				LOG.info("For '" + name + "' URL not provided. Will try picking an instance via load-balancing.");
+				LOG.info("For '" + name
+						+ "' URL not provided. Will try picking an instance via load-balancing.");
 			}
 			if (!name.startsWith("http")) {
 				url = "http://" + name;

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerResponseStatusCodeException.java

@@ -28,11 +28,13 @@ import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeExceptio
  *
  * @author Ryan Baxter
  */
-public class LoadBalancerResponseStatusCodeException extends RetryableStatusCodeException {
+public class LoadBalancerResponseStatusCodeException
+		extends RetryableStatusCodeException {
 
 	private final Response response;
 
-	public LoadBalancerResponseStatusCodeException(String serviceId, Response response, byte[] body, URI uri) {
+	public LoadBalancerResponseStatusCodeException(String serviceId, Response response,
+			byte[] body, URI uri) {
 		super(serviceId, response.status(), response, uri);
 		this.response = Response.builder()
 				.body(new ByteArrayInputStream(body), body.length)

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java

@@ -113,10 +113,10 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
 							String.format("Retrying on status code: %d", responseStatus));
 				}
 				byte[] byteArray = response.body() == null ? new byte[] {}
-					: StreamUtils.copyToByteArray(response.body().asInputStream());
+						: StreamUtils.copyToByteArray(response.body().asInputStream());
 				response.close();
 				throw new LoadBalancerResponseStatusCodeException(serviceId, response,
-					byteArray, URI.create(request.url()));
+						byteArray, URI.create(request.url()));
 			}
 			return response;
 		}, new LoadBalancedRecoveryCallback<Response, Response>() {

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java

@@ -119,8 +119,10 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 
 	private Response testResponse(int status, String body) {
 		// ByteArrayInputStream ignores close() and must be wrapped
-		InputStream reallyCloseable = new BufferedInputStream(new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		InputStream reallyCloseable = new BufferedInputStream(
-		return Response.builder().request(testRequest()).status(status).body(reallyCloseable, null).build();
+				new ByteArrayInputStream(body.getBytes(StandardCharsets.UTF_8)));
+		return Response.builder().request(testRequest()).status(status)
+				.body(reallyCloseable, null).build();
 
 	}
 
@@ -163,23 +165,23 @@ class RetryableFeignBlockingLoadBalancerClientTests {
 	void shouldExposeResponseBodyOnRetry() throws IOException {
 		properties.getRetryableStatusCodes().add(503);
 		Request request = testRequest();
-		when(delegate.execute(any(), any()))
+		when(delegate.execute(any(), any())).thenReturn(testResponse(503, "foo"),
-			.thenReturn(testResponse(503, "foo"), testResponse(503, "foo"));
+				testResponse(503, "foo"));
 		when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
-			.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
+				.thenReturn(new BlockingLoadBalancedRetryPolicy("test",
-				loadBalancerClient, properties));
+						loadBalancerClient, properties));
 		when(loadBalancerClient.reconstructURI(serviceInstance,
-			URI.create("http://test/path")))
+				URI.create("http://test/path")))
-			.thenReturn(URI.create("http://testhost:80/path"));
+						.thenReturn(URI.create("http://testhost:80/path"));
 
-		Response response = feignBlockingLoadBalancerClient.execute(request, new Request.Options());
+		Response response = feignBlockingLoadBalancerClient.execute(request,
+				new Request.Options());
 
-		String bodyContent = IOUtils.toString(response.body().asReader(StandardCharsets.UTF_8));
+		String bodyContent = IOUtils
+				.toString(response.body().asReader(StandardCharsets.UTF_8));
 		assertThat(bodyContent).isEqualTo("foo");
 	}
 
-
-
 	@Test
 	void shouldPassCorrectRequestToDelegate() throws IOException {
 		Request request = testRequest();

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java

@@ -181,7 +181,7 @@ public class FeignClientTests {
 	public void testClient() {
 		assertThat(testClient).as("testClient was null").isNotNull();
 		assertThat(Proxy.isProxyClass(testClient.getClass()))
-			.as("testClient is not a java Proxy").isTrue();
+				.as("testClient is not a java Proxy").isTrue();
 		InvocationHandler invocationHandler = Proxy.getInvocationHandler(testClient);
 		assertThat(invocationHandler).as("invocationHandler was null").isNotNull();
 	}
@@ -198,7 +198,7 @@ public class FeignClientTests {
 		Hello hello = testClient.getHello();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -219,9 +219,9 @@ public class FeignClientTests {
 		List<String> headers = testClient.getHelloHeaders();
 		assertThat(headers).as("headers was null").isNotNull();
 		assertThat(headers.contains("myheader1value"))
-			.as("headers didn't contain myheader1value").isTrue();
+				.as("headers didn't contain myheader1value").isTrue();
 		assertThat(headers.contains("myheader2value"))
-			.as("headers didn't contain myheader2value").isTrue();
+				.as("headers didn't contain myheader2value").isTrue();
 	}
 
 	@Test
@@ -241,12 +241,11 @@ public class FeignClientTests {
 
 	@Test
 	public void testServiceId() {
-		assertThat(testClientServiceId).as("testClientServiceId was null")
+		assertThat(testClientServiceId).as("testClientServiceId was null").isNotNull();
-			.isNotNull();
 		final Hello hello = testClientServiceId.getHello();
 		assertThat(hello).as("The hello response was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -260,7 +259,7 @@ public class FeignClientTests {
 	@Test
 	public void testFormattedParams() {
 		List<LocalDate> list = Arrays.asList(LocalDate.of(2001, 1, 1),
-			LocalDate.of(2018, 6, 10));
+				LocalDate.of(2018, 6, 10));
 		List<LocalDate> params = testClient.getFormattedParams(list);
 		assertThat(params).as("params was null").isNotNull();
 		assertThat(params).as("params not converted correctly").isEqualTo(list);
@@ -271,13 +270,13 @@ public class FeignClientTests {
 		HystrixCommand<List<Hello>> command = testClient.getHellosHystrix();
 		assertThat(command).as("command was null").isNotNull();
 		assertThat(command.getCommandGroup().name()).as(
-			"Hystrix command group name should match the name of the feign client")
+				"Hystrix command group name should match the name of the feign client")
-			.isEqualTo("localapp");
+				.isEqualTo("localapp");
 		String configKey = Feign.configKey(TestClient.class,
-			TestClient.class.getMethod("getHellosHystrix", (Class<?>[]) null));
+				TestClient.class.getMethod("getHellosHystrix", (Class<?>[]) null));
 		assertThat(command.getCommandKey().name())
-			.as("Hystrix command key name should match the feign config key")
+				.as("Hystrix command key name should match the feign config key")
-			.isEqualTo(configKey);
+				.isEqualTo(configKey);
 		List<Hello> hellos = command.execute();
 		assertThat(hellos).as("hellos was null").isNotNull();
 		assertThat(getHelloList()).as("hellos didn't match").isEqualTo(hellos);
@@ -290,7 +289,7 @@ public class FeignClientTests {
 		Hello hello = single.toBlocking().value();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -298,7 +297,7 @@ public class FeignClientTests {
 		ResponseEntity<Void> response = testClient.noContent();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("status code was wrong")
-			.isEqualTo(HttpStatus.NO_CONTENT);
+				.isEqualTo(HttpStatus.NO_CONTENT);
 	}
 
 	@Test
@@ -306,7 +305,7 @@ public class FeignClientTests {
 		ResponseEntity<Void> response = testClient.head();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("status code was wrong")
-			.isEqualTo(HttpStatus.OK);
+				.isEqualTo(HttpStatus.OK);
 	}
 
 	@Test
@@ -316,7 +315,7 @@ public class FeignClientTests {
 		Hello hello = entity.getBody();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello).as("first hello didn't match")
-			.isEqualTo(new Hello(HELLO_WORLD_1));
+				.isEqualTo(new Hello(HELLO_WORLD_1));
 	}
 
 	@Test
@@ -324,7 +323,7 @@ public class FeignClientTests {
 		String response = testClient.moreComplexContentType("{\"value\":\"OK\"}");
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response).as("didn't respond with {\"value\":\"OK\"}")
-			.isEqualTo("{\"value\":\"OK\"}");
+				.isEqualTo("{\"value\":\"OK\"}");
 	}
 
 	@Test
@@ -332,7 +331,7 @@ public class FeignClientTests {
 		ResponseEntity<String> response = decodingTestClient.notFound();
 		assertThat(response).as("response was null").isNotNull();
 		assertThat(response.getStatusCode()).as("status code was wrong")
-			.isEqualTo(HttpStatus.NOT_FOUND);
+				.isEqualTo(HttpStatus.NOT_FOUND);
 		assertThat(response.getBody()).as("response body was not null").isNull();
 	}
 
@@ -371,7 +370,7 @@ public class FeignClientTests {
 		Hello hello = single.toBlocking().value();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbacksingle");
+				.isEqualTo("fallbacksingle");
 	}
 
 	@Test
@@ -381,7 +380,7 @@ public class FeignClientTests {
 		Hello hello = command.execute();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbackcommand");
+				.isEqualTo("fallbackcommand");
 	}
 
 	@Test
@@ -391,7 +390,7 @@ public class FeignClientTests {
 		Hello hello = observable.toBlocking().first();
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbackobservable");
+				.isEqualTo("fallbackobservable");
 	}
 
 	@Test
@@ -401,7 +400,7 @@ public class FeignClientTests {
 		Hello hello = future.get(1, TimeUnit.SECONDS);
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("message was wrong")
-			.isEqualTo("fallbackfuture");
+				.isEqualTo("fallbackfuture");
 	}
 
 	@Test
@@ -410,8 +409,8 @@ public class FeignClientTests {
 		assertThat(hello).as("hello was null").isNotNull();
 		assertThat(hello.getMessage()).as("hello#message was null").isNotNull();
 		assertThat(hello.getMessage().contains("500")).as(
-			"hello#message did not contain the cause (status code) of the fallback invocation")
+				"hello#message did not contain the cause (status code) of the fallback invocation")
-			.isTrue();
+				.isTrue();
 	}
 
 	@Test(expected = HystrixRuntimeException.class)
@@ -439,17 +438,17 @@ public class FeignClientTests {
 	@Test
 	public void testHystrixSetterFactory() {
 		HystrixCommand<List<Hello>> command = hystrixSetterFactoryClient
-			.getHellosHystrix();
+				.getHellosHystrix();
 		assertThat(command).as("command was null").isNotNull();
 		String setterPrefix = TestHystrixSetterFactoryClientConfig.SETTER_PREFIX;
 		assertThat(command.getCommandGroup().name()).as(
-			"Hystrix command group name should match the name of the feign client with a prefix of "
+				"Hystrix command group name should match the name of the feign client with a prefix of "
-				+ setterPrefix)
+						+ setterPrefix)
-			.isEqualTo(setterPrefix + "localapp5");
+				.isEqualTo(setterPrefix + "localapp5");
 		assertThat(command.getCommandKey().name()).as(
-			"Hystrix command key name should match the request method (space) request path with a prefix of "
+				"Hystrix command key name should match the request method (space) request path with a prefix of "
-				+ setterPrefix)
+						+ setterPrefix)
-			.isEqualTo(setterPrefix + "GET /hellos");
+				.isEqualTo(setterPrefix + "GET /hellos");
 		List<Hello> hellos = command.execute();
 		assertThat(hellos).as("hellos was null").isNotNull();
 		assertThat(getHelloList()).as("hellos didn't match").isEqualTo(hellos);
@@ -481,8 +480,7 @@ public class FeignClientTests {
 		Hello pojo2 = new Hello(OI_TERRA_2);
 		MockMultipartFile file = new MockMultipartFile("file", "hello.bin", null,
 				"hello".getBytes());
-		String response = multipartClient.multipartPojo("abc", "123", pojo1, pojo2,
+		String response = multipartClient.multipartPojo("abc", "123", pojo1, pojo2, file);
-				file);
 		assertThat(response).isEqualTo("abc123hello world 1oi terra 2hello.bin");
 	}
 
@@ -507,9 +505,8 @@ public class FeignClientTests {
 				"hello".getBytes());
 		MockMultipartFile file2 = new MockMultipartFile("file2", "hello2.bin", null,
 				"hello".getBytes());
-		String response = multipartClient
+		String response = multipartClient.requestPartListOfPojosAndListOfMultipartFiles(
-				.requestPartListOfPojosAndListOfMultipartFiles(
+				Arrays.asList(pojo1, pojo2), Arrays.asList(file1, file2));
-						Arrays.asList(pojo1, pojo2), Arrays.asList(file1, file2));
 		assertThat(response).isEqualTo("hello world 1oi terra 2hello1.binhello2.bin");
 	}
 
@@ -624,7 +621,7 @@ public class FeignClientTests {
 		String getToString(@RequestParam("arg") Arg arg);
 
 		@PostMapping(path = "/form-urlencoded",
-			consumes = APPLICATION_FORM_URLENCODED_VALUE)
+				consumes = APPLICATION_FORM_URLENCODED_VALUE)
 		Hello postFormUrlEncoded(Hello hello);
 
 		@RequestMapping(method = RequestMethod.GET, path = "/tostring2")
@@ -824,8 +821,7 @@ public class FeignClientTests {
 		public HystrixClientWithFallBackFactory create(final Throwable cause) {
 			return () -> {
 				assertThat(cause).isNotNull().as("Cause was null");
-				return new Hello(
+				return new Hello("Hello from the fallback side: " + cause.getMessage());
-					"Hello from the fallback side: " + cause.getMessage());
 			};
 		}
 
@@ -888,12 +884,12 @@ public class FeignClientTests {
 			return (target, method) -> {
 				String groupKey = SETTER_PREFIX + target.name();
 				RequestMapping requestMapping = method
-					.getAnnotation(RequestMapping.class);
+						.getAnnotation(RequestMapping.class);
 				String commandKey = SETTER_PREFIX + requestMapping.method()[0] + " "
-					+ requestMapping.path()[0];
+						+ requestMapping.path()[0];
 				return HystrixCommand.Setter
-					.withGroupKey(HystrixCommandGroupKey.Factory.asKey(groupKey))
+						.withGroupKey(HystrixCommandGroupKey.Factory.asKey(groupKey))
-					.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey));
+						.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey));
 			};
 		}
 
@@ -1161,7 +1157,7 @@ public class FeignClientTests {
 		}
 
 		@PostMapping(path = "/form-urlencoded",
-			consumes = APPLICATION_FORM_URLENCODED_VALUE)
+				consumes = APPLICATION_FORM_URLENCODED_VALUE)
 		Hello postFormUrlEncoded(Hello hello) {
 			return hello;
 		}

spring-cloud-openfeign-dependencies/pom.xml

@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.5.BUILD-SNAPSHOT</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.2.9.BUILD-SNAPSHOT</version>
+	<version>2.2.9.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>

spring-cloud-starter-openfeign/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.9.BUILD-SNAPSHOT</version>
+		<version>2.2.9.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>