Update SNAPSHOT to 2.1.0.RELEASE

Upgrade feign-form to 3.5.0 (#106 )
The earlier versions are not compatible with Feign 10.1.0 when using the form encoder. Fixes #105
2019-01-22 18:33:41 +00:00 · 2019-01-18 16:09:46 -05:00 · 2019-01-12 13:05:02 -05:00 · 2019-01-07 09:51:04 -05:00 · 2019-01-07 09:49:36 -05:00 · 2019-01-07 09:35:48 -05:00
36 changed files with 484 additions and 253 deletions
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.RC2</version>
+		<version>2.1.0.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -73,6 +73,8 @@ in your external configuration (see

 A central concept in Spring Cloud's Feign support is that of the named client. Each feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the `@FeignClient` annotation. Spring Cloud creates a new ensemble as an
 `ApplicationContext` on demand for each named client using `FeignClientsConfiguration`. This contains (amongst other things) an `feign.Decoder`, a `feign.Encoder`, and a `feign.Contract`.
+It is possible to override the name of that ensemble by using the `contextId`
+attribute of the `@FeignClient` annotation.

 Spring Cloud lets you take full control of the feign client by declaring additional configuration (on top of the `FeignClientsConfiguration`) using `@FeignClient`. Example:

@@ -90,6 +92,10 @@ NOTE: `FooConfiguration` does not need to be annotated with `@Configuration`. Ho

 NOTE: The `serviceId` attribute is now deprecated in favor of the `name` attribute.

+NOTE: Using `contextId` attribute of the `@FeignClient` annotation in addition to changing the name of
+the `ApplicationContext` ensemble, it will override the alias of the client name
+and it will be used as part of the name of the configuration bean created for that client.
+
 WARNING: Previously, using the `url` attribute, did not require the `name` attribute. Using `name` is now required.

 Placeholders are supported in the `name` and `url` attributes.
@@ -206,6 +212,27 @@ hystrix:
          strategy: SEMAPHORE
 ----

+If we want to create multiple feign clients with the same name or url
+so that they would point to the same server but each with a different custom configuration then
+we have to use `contextId` attribute of the `@FeignClient` in order to avoid name
+collision of these configuration beans.
+
+[source,java,indent=0]
+----
+@FeignClient(contextId = "fooClient", name = "stores", configuration = FooConfiguration.class)
+public interface FooClient {
+    //..
+}
+----
+
+[source,java,indent=0]
+----
+@FeignClient(contextId = "barClient", name = "stores", configuration = BarConfiguration.class)
+public interface BarClient {
+    //..
+}
+----
+
 === Creating Feign Clients Manually

 In some cases it might be necessary to customize your Feign Clients in a way that is not
@@ -425,8 +452,9 @@ public class FooConfiguration {
        return Logger.Level.FULL;
    }
 }
+----

-=== Feign `@QueryMap` support
+=== Feign @QueryMap support

 The OpenFeign `@QueryMap` annotation provides support for POJOs to be used as
 GET parameter maps. Unfortunately, the default OpenFeign QueryMap annotation is
@@ -458,4 +486,4 @@ public class DemoTemplate {
    @GetMapping(path = "/demo")
    String demoEndpoint(@SpringQueryMap Params params);
 }
----
+----
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>2.1.0.RC2</version>
+	<version>2.1.0.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.1.0.RC3</version>
+		<version>2.1.2.RELEASE</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -22,8 +22,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.1.0.RC2</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.1.0.RC2</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.1.0.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.1.0.RELEASE</spring-cloud-netflix.version>

 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.RC2</version>
+		<version>2.1.0.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -82,7 +82,7 @@ public @interface EnableFeignClients {

 	/**
 	 * List of classes annotated with @FeignClient. If not empty, disables classpath scanning.
-	 * @return
+	 * @return list of FeignClient classes
 	 */
 	Class<?>[] clients() default {};
 }
@@ -54,6 +54,11 @@ public @interface FeignClient {
 	@Deprecated
 	String serviceId() default "";

+	/**
+	 * This will be used as the bean name instead of name if present, but will not be used as a service id.
+	 */
+	String contextId() default "";
+
 	/**
 	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
 	 */
@@ -49,6 +49,7 @@ public class FeignClientBuilder {
 			this.feignClientFactoryBean.setApplicationContext(applicationContext);
 			this.feignClientFactoryBean.setType(type);
 			this.feignClientFactoryBean.setName(FeignClientsRegistrar.getName(name));
+			this.feignClientFactoryBean.setContextId(FeignClientsRegistrar.getName(name));
 			// preset default values - these values resemble the default values on the
 			// FeignClient annotation
 			this.url("").path("").decode404(false).fallback(void.class)
@@ -60,6 +61,11 @@ public class FeignClientBuilder {
 			return this;
 		}

+		public Builder contextId(final String contextId) {
+			this.feignClientFactoryBean.setContextId(contextId);
+			return this;
+		}
+
 		public Builder path(final String path) {
 			this.feignClientFactoryBean.setPath(FeignClientsRegistrar.getPath(path));
 			return this;
@@ -60,6 +60,8 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	private String url;

+	private String contextId;
+
 	private String path;

 	private boolean decode404;
@@ -72,6 +74,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	@Override
 	public void afterPropertiesSet() throws Exception {
+		Assert.hasText(this.contextId, "Context id must be set");
 		Assert.hasText(this.name, "Name must be set");
 	}

@@ -104,10 +107,10 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 			if (properties.isDefaultToProperties()) {
 				configureUsingConfiguration(context, builder);
 				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
+				configureUsingProperties(properties.getConfig().get(this.contextId), builder);
 			} else {
 				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
+				configureUsingProperties(properties.getConfig().get(this.contextId), builder);
 				configureUsingConfiguration(context, builder);
 			}
 		} else {
@@ -133,7 +136,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 			builder.options(options);
 		}
 		Map<String, RequestInterceptor> requestInterceptors = context.getInstances(
-				this.name, RequestInterceptor.class);
+				this.contextId, RequestInterceptor.class);
 		if (requestInterceptors != null) {
 			builder.requestInterceptors(requestInterceptors.values());
 		}
@@ -202,16 +205,16 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 	}

 	protected <T> T get(FeignContext context, Class<T> type) {
-		T instance = context.getInstance(this.name, type);
+		T instance = context.getInstance(this.contextId, type);
 		if (instance == null) {
 			throw new IllegalStateException("No bean found of type " + type + " for "
-					+ this.name);
+					+ this.contextId);
 		}
 		return instance;
 	}

 	protected <T> T getOptional(FeignContext context, Class<T> type) {
-		return context.getInstance(this.name, type);
+		return context.getInstance(this.contextId, type);
 	}

 	protected <T> T loadBalance(Feign.Builder builder, FeignContext context,
@@ -241,7 +244,6 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		Feign.Builder builder = feign(context);

 		if (!StringUtils.hasText(this.url)) {
-			String url;
 			if (!this.name.startsWith("http")) {
 				url = "http://" + this.name;
 			}
@@ -309,6 +311,14 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		this.name = name;
 	}

+	public String getContextId() {
+		return contextId;
+	}
+
+	public void setContextId(String contextId) {
+		this.contextId = contextId;
+	}
+
 	public String getUrl() {
 		return url;
 	}
@@ -171,13 +171,15 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		definition.addPropertyValue("path", getPath(attributes));
 		String name = getName(attributes);
 		definition.addPropertyValue("name", name);
+		String contextId = getContextId(attributes);
+		definition.addPropertyValue("contextId", contextId);
 		definition.addPropertyValue("type", className);
 		definition.addPropertyValue("decode404", attributes.get("decode404"));
 		definition.addPropertyValue("fallback", attributes.get("fallback"));
 		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);

-		String alias = name + "FeignClient";
+		String alias = contextId + "FeignClient";
 		AbstractBeanDefinition beanDefinition = definition.getBeanDefinition();

 		boolean primary = (Boolean)attributes.get("primary"); // has a default, won't be null
@@ -227,6 +229,16 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		return getName(name);
 	}

+	private String getContextId(Map<String, Object> attributes) {
+		String contextId = (String) attributes.get("contextId");
+		if (!StringUtils.hasText(contextId)) {
+			return getName(attributes);
+		}
+
+		contextId = resolve(contextId);
+		return getName(contextId);
+	}
+
 	static String getName(String name) {
 		if (!StringUtils.hasText(name)) {
 			return "";
@@ -350,7 +362,10 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		if (client == null) {
 			return null;
 		}
-		String value = (String) client.get("value");
+		String value = (String) client.get("contextId");
+		if (!StringUtils.hasText(value)) {
+			value = (String) client.get("value");
+		}
 		if (!StringUtils.hasText(value)) {
 			value = (String) client.get("name");
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -17,8 +17,6 @@

 package org.springframework.cloud.openfeign;

-import org.springframework.util.Assert;
-
 import feign.Feign;
 import feign.Target;
 import feign.hystrix.FallbackFactory;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-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.
@@ -16,10 +16,6 @@

 package org.springframework.cloud.openfeign.ribbon;

-import feign.Client;
-import feign.Request;
-import feign.Response;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -29,11 +25,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-import org.springframework.cloud.netflix.ribbon.RibbonProperties;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
 import com.netflix.client.AbstractLoadBalancerAwareClient;
 import com.netflix.client.ClientException;
 import com.netflix.client.ClientRequest;
@@ -43,6 +34,15 @@ import com.netflix.client.RetryHandler;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.ILoadBalancer;
 import com.netflix.loadbalancer.Server;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+
+import org.springframework.cloud.netflix.ribbon.RibbonProperties;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpRequest;

 import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecureConnectionIfNeeded;

@@ -51,6 +51,7 @@ import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToSecur
 * @author Spencer Gibb
 * @author Ryan Baxter
 * @author Tim Ysewyn
+ * @author Olga Maciaszek-Sharma
 */
 public class FeignLoadBalancer extends
 		AbstractLoadBalancerAwareClient<FeignLoadBalancer.RibbonRequest, FeignLoadBalancer.RibbonResponse> {
@@ -97,7 +98,7 @@ public class FeignLoadBalancer extends
 			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
 					requestConfig);
 		}
-		if (!request.toRequest().method().equals("GET")) {
+		if (!request.toRequest().httpMethod().name().equals("GET")) {
 			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
 					requestConfig);
 		}
@@ -127,7 +128,8 @@ public class FeignLoadBalancer extends
 		private Request toRequest(Request request) {
 			Map<String, Collection<String>> headers = new LinkedHashMap<>(
 					request.headers());
-			return Request.create(request.method(),getUri().toASCIIString(),headers,request.body(),request.charset());
+			return Request.create(request.httpMethod(), getUri().toASCIIString(), headers,
+					request.requestBody());
 		}

 		Request toRequest() {
@@ -142,7 +144,8 @@ public class FeignLoadBalancer extends
 			return new HttpRequest() {
 				@Override
 				public HttpMethod getMethod() {
-					return HttpMethod.resolve(RibbonRequest.this.toRequest().method());
+					return HttpMethod
+							.resolve(RibbonRequest.this.toRequest().httpMethod().name());
 				}

 				@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-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.
@@ -30,6 +30,8 @@ import feign.Client;
 import feign.Request;
 import feign.Response;

+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
 /**
 * @author Dave Syer
 *
@@ -97,7 +99,12 @@ public class LoadBalancerFeignClient implements Client {
 	}

 	static URI cleanUrl(String originalUrl, String host) {
-		String newUrl = originalUrl.replaceFirst(host, "");
+		String newUrl = originalUrl;
+		if(originalUrl.startsWith("https://")) {
+			newUrl = originalUrl.substring(0, 8) + originalUrl.substring(8 + host.length());
+		} else if(originalUrl.startsWith("http")) {
+			newUrl = originalUrl.substring(0, 7) + originalUrl.substring(7 + host.length());
+		}
 		StringBuffer buffer = new StringBuffer(newUrl);
 		if((newUrl.startsWith("https://") && newUrl.length() == 8) ||
 				(newUrl.startsWith("http://") && newUrl.length() == 7)) {
@@ -101,7 +101,7 @@ public class RetryableFeignLoadBalancer extends FeignLoadBalancer implements Ser
 					feignRequest = request.toRequest();
 				}
 				Response response = request.client().execute(feignRequest, options);
-				if (retryPolicy.retryableStatusCode(response.status())) {
+				if (retryPolicy != null && retryPolicy.retryableStatusCode(response.status())) {
 					byte[] byteArray = response.body() == null ? new byte[]{} : StreamUtils.copyToByteArray(response.body().asInputStream());
 					response.close();
 					throw new RibbonResponseStatusCodeException(RetryableFeignLoadBalancer.this.clientName, response,
@@ -15,13 +15,12 @@
 */
 package org.springframework.cloud.openfeign.ribbon;

+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
 import feign.Response;

-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URI;
 import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.util.StreamUtils;

 /**
 * A {@link RetryableStatusCodeException} for {@link Response}s
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -24,8 +24,11 @@ import java.util.Map;

 import org.springframework.http.HttpHeaders;

+import static java.util.Optional.ofNullable;
+
 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
 public class FeignUtils {

@@ -47,4 +50,11 @@ public class FeignUtils {
 		return headers;
 	}

+	static Collection<String> addTemplateParameter(Collection<String> possiblyNull,
+			String paramName) {
+		Collection<String> params = ofNullable(possiblyNull).orElse(new ArrayList<>());
+		params.add(String.format("{%s}", paramName));
+		return params;
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -26,8 +26,14 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Objects;

+import feign.Request;
+import feign.RequestTemplate;
+import feign.codec.EncodeException;
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.http.HttpHeaders;
@@ -38,11 +44,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
 import org.springframework.web.multipart.MultipartFile;

-import feign.RequestTemplate;
-import feign.codec.EncodeException;
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHeaders;
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;

@@ -129,7 +130,8 @@ public class SpringEncoder implements Encoder {
 					} else {
 						charset = StandardCharsets.UTF_8;
 					}
-					request.body(outputMessage.getOutputStream().toByteArray(), charset);
+					request.body(Request.Body.encoded(outputMessage.getOutputStream()
+							.toByteArray(), charset));
 					return;
 				}
 			}
@@ -29,6 +29,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

+import feign.Contract;
+import feign.Feign;
+import feign.MethodMetadata;
+import feign.Param;
+import feign.Request;
+
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
@@ -52,18 +58,15 @@ import org.springframework.web.bind.annotation.RequestMethod;

 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
+import static org.springframework.cloud.openfeign.support.FeignUtils.addTemplateParameter;
 import static org.springframework.core.annotation.AnnotatedElementUtils.findMergedAnnotation;

-import feign.Contract;
-import feign.Feign;
-import feign.MethodMetadata;
-import feign.Param;
-
 /**
 * @author Spencer Gibb
 * @author Abhijit Sarkar
 * @author Halvdan Hoem Grelland
 * @author Aram Peres
+ * @author Olga Maciaszek-Sharma
 */
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
@@ -132,7 +135,7 @@ public class SpringMvcContract extends Contract.BaseContract
 					if (!pathValue.startsWith("/")) {
 						pathValue = "/" + pathValue;
 					}
-					data.template().insert(0, pathValue);
+					data.template().uri(pathValue);
 				}
 			}
 		}
@@ -178,7 +181,7 @@ public class SpringMvcContract extends Contract.BaseContract
 			methods = new RequestMethod[] { RequestMethod.GET };
 		}
 		checkOne(method, methods, "method");
-		data.template().method(methods[0].name());
+		data.template().method(Request.HttpMethod.valueOf(methods[0].name()));

 		// path
 		checkAtMostOne(method, methodMapping.value(), "value");
@@ -188,10 +191,10 @@ public class SpringMvcContract extends Contract.BaseContract
 				pathValue = resolve(pathValue);
 				// Append path from @RequestMapping if value is present on method
 				if (!pathValue.startsWith("/")
-						&& !data.template().toString().endsWith("/")) {
+						&& !data.template().path().endsWith("/")) {
 					pathValue = "/" + pathValue;
 				}
-				data.template().append(pathValue);
+				data.template().uri(pathValue, true);
 			}
 		}

@@ -395,7 +398,7 @@ public class SpringMvcContract extends Contract.BaseContract
 		@Override
 		public Collection<String> setTemplateParameter(String name,
 				Collection<String> rest) {
-			return addTemplatedParam(rest, name);
+			return addTemplateParameter(rest, name);
 		}
 	}

@@ -91,7 +91,7 @@ public class FeignClientBuilderTests {
 		// on this builder class.
 		// (2) Or a new field was added and the builder class has to be extended with this
 		// new field.
-		Assert.assertThat(methodNames, Matchers.contains("decode404", "fallback",
+		Assert.assertThat(methodNames, Matchers.contains("contextId", "decode404", "fallback",
 				"fallbackFactory", "name", "path", "url"));
 	}

@@ -105,6 +105,7 @@ public class FeignClientBuilderTests {
 		assertFactoryBeanField(builder, "applicationContext", applicationContext);
 		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
 		assertFactoryBeanField(builder, "name", "TestClient");
+		assertFactoryBeanField(builder, "contextId", "TestClient");

 		// and:
 		assertFactoryBeanField(builder, "url",
@@ -16,6 +16,13 @@

 package org.springframework.cloud.openfeign;

+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import feign.Request;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import feign.RetryableException;
@@ -25,6 +32,7 @@ import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -43,11 +51,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
-
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

@@ -77,15 +81,15 @@ public class FeignClientUsingPropertiesTests {

 	public FeignClientUsingPropertiesTests() {
 		fooFactoryBean = new FeignClientFactoryBean();
-		fooFactoryBean.setName("foo");
+		fooFactoryBean.setContextId("foo");
 		fooFactoryBean.setType(FeignClientFactoryBean.class);

 		barFactoryBean = new FeignClientFactoryBean();
-		barFactoryBean.setName("bar");
+		barFactoryBean.setContextId("bar");
 		barFactoryBean.setType(FeignClientFactoryBean.class);

 		formFactoryBean = new FeignClientFactoryBean();
-		formFactoryBean.setName("form");
+		formFactoryBean.setContextId("form");
 		formFactoryBean.setType(FeignClientFactoryBean.class);
 	}

@@ -214,7 +218,7 @@ public class FeignClientUsingPropertiesTests {
 			});

 			requestTemplate.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
-			requestTemplate.body(builder.toString());
+			requestTemplate.body(Request.Body.bodyTemplate(builder.toString(), UTF_8));
 		}
 	}

@@ -62,6 +62,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {

 	public SpringDecoderTests() {
 		setName("test");
+		setContextId("test");
 	}

 	public TestClient testClient() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-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.
@@ -19,6 +19,7 @@ package org.springframework.cloud.openfeign.encoding.proto;
 import feign.RequestTemplate;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
@@ -27,6 +28,8 @@ import org.springframework.cloud.test.ClassPathExclusions;
 import org.springframework.cloud.test.ModifiedClassPathRunner;
 import org.springframework.http.converter.StringHttpMessageConverter;

+import static feign.Request.HttpMethod.POST;
+
 /**
 * Test {@link SpringEncoder} when protobuf is not in classpath
 *
@@ -45,7 +48,7 @@ public class ProtobufNotInClasspathTest {
            }
        };
        RequestTemplate requestTemplate = new RequestTemplate();
-        requestTemplate.method("POST");
+        requestTemplate.method(POST);
        new SpringEncoder(converters).encode("a=b", String.class, requestTemplate);
    }

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-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.
@@ -16,6 +16,14 @@

 package org.springframework.cloud.openfeign.encoding.proto;

+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import feign.RequestTemplate;
 import feign.httpclient.ApacheHttpClient;
@@ -30,24 +38,21 @@ import org.apache.http.message.BasicStatusLine;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.BDDMockito;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;

-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
+import static feign.Request.Body.encoded;
+import static feign.Request.HttpMethod.POST;

 /**
 * Test {@link SpringEncoder} with {@link ProtobufHttpMessageConverter}
@@ -86,7 +91,9 @@ public class ProtobufSpringEncoderTest {
        RequestTemplate requestTemplate = newRequestTemplate();
        newEncoder().encode(request, Request.class, requestTemplate);
        // set a charset
-        requestTemplate.body(requestTemplate.body(), StandardCharsets.UTF_8);
+        requestTemplate
+                .body(encoded(requestTemplate.requestBody()
+                        .asBytes(), StandardCharsets.UTF_8));
        HttpEntity entity = toApacheHttpEntity(requestTemplate);
        byte[] bytes = read(entity.getContent(), (int) entity.getContentLength());

@@ -112,20 +119,22 @@ public class ProtobufSpringEncoderTest {

    private RequestTemplate newRequestTemplate() {
        RequestTemplate requestTemplate = new RequestTemplate();
-        requestTemplate.method("POST");
+        requestTemplate.method(POST);
        return requestTemplate;
    }

    private HttpEntity toApacheHttpEntity(RequestTemplate requestTemplate) throws IOException, URISyntaxException {
        final List<HttpUriRequest> request = new ArrayList<>(1);
-        BDDMockito.given(httpClient.execute(Matchers.<HttpUriRequest>any())).will(new Answer<HttpResponse>() {
+        BDDMockito.given(httpClient.execute(ArgumentMatchers.<HttpUriRequest>any()))
+                .will(new Answer<HttpResponse>() {
            @Override
            public HttpResponse answer(InvocationOnMock invocationOnMock) throws Throwable {
                request.add((HttpUriRequest) invocationOnMock.getArguments()[0]);
                return new BasicHttpResponse(new BasicStatusLine(new ProtocolVersion("http", 1, 1), 200, null));
            }
        });
-        new ApacheHttpClient(httpClient).execute(requestTemplate.request(), new feign.Request.Options());
+        new ApacheHttpClient(httpClient).execute(requestTemplate.resolve(new HashMap<>())
+                .request(), new feign.Request.Options());
        HttpUriRequest httpUriRequest = request.get(0);
        return  ((HttpEntityEnclosingRequestBase)httpUriRequest).getEntity();
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -16,12 +16,15 @@

 package org.springframework.cloud.openfeign.hystrix.security;

+import java.util.Base64;
+
 import com.netflix.hystrix.strategy.HystrixPlugins;
 import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,9 +34,7 @@ import org.springframework.cloud.netflix.hystrix.security.SecurityContextConcurr
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
-import org.springframework.cloud.openfeign.valid.FeignClientTests;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -45,8 +46,6 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;

-import java.util.Base64;
-
 import static org.assertj.core.api.Assertions.assertThat;

 /**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-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.
@@ -20,7 +20,6 @@ import feign.RequestInterceptor;
 import feign.RequestTemplate;

 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;

 /**
 * This interceptor should be called from an Hyxtrix command execution thread. It is
@@ -23,9 +23,13 @@ import feign.hystrix.HystrixFeign;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -64,24 +68,61 @@ public class FeignClientValidationTests {

 	@Test
 	public void testServiceIdAndValue() {
-		this.expected.expectMessage("only one is permitted");
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				NameAndValueConfiguration.class);
+				LoadBalancerAutoConfiguration.class,
+				RibbonAutoConfiguration.class,
+				FeignRibbonClientAutoConfiguration.class,
+				NameAndServiceIdConfiguration.class);
 		assertNotNull(context.getBean(NameAndServiceIdConfiguration.Client.class));
 		context.close();
 	}

 	@Configuration
-	@Import(FeignAutoConfiguration.class)
+	@Import({FeignAutoConfiguration.class, HttpClientConfiguration.class})
 	@EnableFeignClients(clients = NameAndServiceIdConfiguration.Client.class)
 	protected static class NameAndServiceIdConfiguration {

-		@FeignClient(serviceId = "foo", name = "bar")
+		@FeignClient(name = "bar", serviceId = "foo")
 		interface Client {
 			@RequestMapping(method = RequestMethod.GET, value = "/")
 			String get();
 		}
+	}

+	@Test
+	public void testDuplicatedClientNames() {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.setAllowBeanDefinitionOverriding(false);
+		context.register(
+				LoadBalancerAutoConfiguration.class,
+				RibbonAutoConfiguration.class,
+				FeignRibbonClientAutoConfiguration.class,
+				DuplicatedFeignClientNamesConfiguration.class
+		);
+		context.refresh();
+		assertNotNull(context.getBean(DuplicatedFeignClientNamesConfiguration.FooClient.class));
+		assertNotNull(context.getBean(DuplicatedFeignClientNamesConfiguration.BarClient.class));
+		context.close();
+	}
+
+	@Configuration
+
+	@Import({FeignAutoConfiguration.class, HttpClientConfiguration.class})
+	@EnableFeignClients(clients = {DuplicatedFeignClientNamesConfiguration.FooClient.class,
+			DuplicatedFeignClientNamesConfiguration.BarClient.class})
+	protected static class DuplicatedFeignClientNamesConfiguration {
+
+		@FeignClient(contextId = "foo", name = "bar")
+		interface FooClient {
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+		}
+
+		@FeignClient(name = "bar")
+		interface BarClient {
+			@RequestMapping(method = RequestMethod.GET, value = "/")
+			String get();
+		}
 	}

 	@Test
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -18,33 +18,31 @@
 package org.springframework.cloud.openfeign.ribbon;

 import java.net.URI;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

+import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.ILoadBalancer;
 import com.netflix.loadbalancer.RoundRobinRule;
+import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.reactive.LoadBalancerCommand;
+import feign.Client;
+import feign.Request;
+import feign.Request.Options;
+import feign.RequestTemplate;
+import feign.Response;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonRequest;
-import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonResponse;
+
 import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-
-import feign.Client;
-import feign.Request;
-import feign.RequestTemplate;
-import feign.Response;
-import feign.Request.Options;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonRequest;
+import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer.RibbonResponse;

 import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
 import static com.netflix.client.config.CommonClientConfigKey.IsSecure;
@@ -54,11 +52,12 @@ import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOper
 import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
 import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
 import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
+import static feign.Request.HttpMethod.GET;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;

 public class FeignLoadBalancerTests {
@@ -96,19 +95,27 @@ public class FeignLoadBalancerTests {

 		this.feignLoadBalancer = new FeignLoadBalancer(this.lb, this.config,
 				this.inspector);
-		Request request = new RequestTemplate().method("GET").append("http://foo/")
+		Request request = new RequestTemplate()
+				.method(GET)
+				.target("http://foo/")
+				.resolve(new HashMap<>())
 				.request();
 		RibbonRequest ribbonRequest = new RibbonRequest(this.delegate, request,
 				new URI(request.url()));

-		Response response = Response.create(200, "Test",
-				Collections.<String, Collection<String>> emptyMap(), new byte[0]);
+		Response response = Response.builder()
+				.request(request)
+				.status(200)
+				.reason("Test")
+				.headers(Collections.emptyMap())
+				.body(new byte[0])
+				.build();
 		when(this.delegate.execute(any(Request.class), any(Options.class)))
 				.thenReturn(response);

 		RibbonResponse resp = this.feignLoadBalancer.execute(ribbonRequest, null);

-		assertThat(resp.getRequestedURI(), is(new URI("http://foo/")));
+		assertThat(resp.getRequestedURI(), is(new URI("http://foo")));
 	}

 	@Test
@@ -159,7 +166,7 @@ public class FeignLoadBalancerTests {
 	@Test
 	public void testRibbonRequestURLEncode() throws Exception {
 		String url = "http://foo/?name=%7bcookie";//name={cookie
-		Request request = Request.create("GET",url,new HashMap(),null,null);
+		Request request = Request.create(GET, url, new HashMap<>(), null, null);

 		assertThat(request.url(),is(url));

@@ -191,11 +198,15 @@ public class FeignLoadBalancerTests {
 				builder.withServerLocator(request.getRequest().headers().get("c_ip"));
 			}
 		};
-		Request request = new RequestTemplate().method("GET").request();
+		Request request = new RequestTemplate().method(GET).resolve(new HashMap<>()).request();
 		RibbonResponse resp = this.feignLoadBalancer.executeWithLoadBalancer(new RibbonRequest(this.delegate, request,
 				new URI(request.url())), null);
 		assertThat(resp.getRequestedURI().getPort(), is(7777));
-		request = new RequestTemplate().method("GET").header("c_ip", "666").request();
+		request = new RequestTemplate()
+				.method(GET)
+				.header("c_ip", "666")
+				.resolve(new HashMap<>())
+				.request();
 		resp = this.feignLoadBalancer.executeWithLoadBalancer(new RibbonRequest(this.delegate, request,
 				new URI(request.url())), null);
 		assertThat(resp.getRequestedURI().getPort(), is(6666));
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-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.
@@ -16,21 +16,20 @@

 package org.springframework.cloud.openfeign.ribbon;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -41,8 +40,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;

 /**
 * @author Venil Noronha
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -16,6 +16,8 @@

 package org.springframework.cloud.openfeign.ribbon;

+import java.util.HashMap;
+
 import com.netflix.client.config.CommonClientConfigKey;
 import com.netflix.client.config.DefaultClientConfigImpl;
 import com.netflix.client.config.IClientConfig;
@@ -31,11 +33,13 @@ import feign.RequestTemplate;
 import org.hamcrest.CustomMatcher;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;

-import static org.mockito.Matchers.any;
+import static feign.Request.HttpMethod.GET;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -91,7 +95,10 @@ public class FeignRibbonClientTests {

 	@Test
 	public void remoteRequestIsSentAtRoot() throws Exception {
-		Request request = new RequestTemplate().method("GET").append("http://foo")
+		Request request = new RequestTemplate()
+				.method(GET)
+				.target("http://foo")
+				.resolve(new HashMap<>())
 				.request();
 		this.client.execute(request, new Options());
 		RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/");
@@ -101,7 +108,10 @@ public class FeignRibbonClientTests {

 	@Test
 	public void remoteRequestIsSent() throws Exception {
-		Request request = new RequestTemplate().method("GET").append("http://foo/")
+		Request request = new RequestTemplate()
+				.method(GET)
+				.target("http://foo/")
+				.resolve(new HashMap<>())
 				.request();
 		this.client.execute(request, new Options());
 		RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/");
@@ -109,9 +119,25 @@ public class FeignRibbonClientTests {
 				any(Options.class));
 	}

+	@Test
+	public void verifyCleanUrl() throws Exception {
+		Request request = new RequestTemplate()
+				.method(GET)
+				.target("http://tp/abc/bcd.json")
+				.resolve(new HashMap<>())
+				.request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/abc/bcd.json");
+		verify(this.delegate).execute(argThat(matcher),
+				any(Options.class));
+	}
+
 	@Test
 	public void remoteRequestIsSecure() throws Exception {
-		Request request = new RequestTemplate().method("GET").append("https://foo/")
+		Request request = new RequestTemplate()
+				.method(GET)
+				.target("https://foo/")
+				.resolve(new HashMap<>())
 				.request();
 		this.client.execute(request, new Options());
 		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -17,25 +17,31 @@

 package org.springframework.cloud.openfeign.ribbon;

-import feign.Client;
-import feign.Request;
-import feign.Response;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
+
+import com.netflix.client.DefaultLoadBalancerRetryHandler;
+import com.netflix.client.RequestSpecificRetryHandler;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import feign.Client;
+import feign.Request;
+import feign.Response;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
@@ -46,7 +52,6 @@ import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryPolicy;
 import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerContext;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.http.HttpRequest;
 import org.springframework.retry.RetryCallback;
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryListener;
@@ -55,13 +60,6 @@ import org.springframework.retry.backoff.BackOffContext;
 import org.springframework.retry.backoff.BackOffInterruptedException;
 import org.springframework.retry.backoff.BackOffPolicy;

-import com.netflix.client.DefaultLoadBalancerRetryHandler;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-
 import static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
 import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetries;
 import static com.netflix.client.config.CommonClientConfigKey.MaxAutoRetriesNextServer;
@@ -69,15 +67,16 @@ import static com.netflix.client.config.CommonClientConfigKey.OkToRetryOnAllOper
 import static com.netflix.client.config.CommonClientConfigKey.ReadTimeout;
 import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES;
 import static com.netflix.client.config.DefaultClientConfigImpl.DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER;
+import static feign.Request.HttpMethod.GET;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -88,6 +87,7 @@ import static org.mockito.Mockito.when;
 /**
 * @author Ryan Baxter
 * @author Gang Li
+ * @author Olga Maciaszek-Sharma
 */
 public class RetryableFeignLoadBalancerTests {
 	@Mock
@@ -126,12 +126,15 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn("404,502,foo, ,").when(config).getPropertyAsString(eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES),eq(""));
 		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(clientFactory);
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response.builder()
+				.status(200)
+				.request(feignRequest)
+				.headers(new HashMap<>())
+				.build();
 		doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
 		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
@@ -141,9 +144,8 @@ public class RetryableFeignLoadBalancerTests {

 	@Test
 	public void executeNeverRetry() throws Exception {
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
 		doThrow(new IOException("boom")).when(client).execute(any(Request.class), any(Request.Options.class));
@@ -192,12 +194,15 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response.builder()
+				.status(200)
+				.request(feignRequest)
+				.headers(new HashMap<>())
+				.build();
 		doThrow(new IOException("boom")).doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));

 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
@@ -227,13 +232,20 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
-		Response fourOFourResponse = Response.builder().status(404).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response
+				.builder()
+				.request(feignRequest)
+				.status(200)
+				.headers(new HashMap<>())
+				.build();
+		Response fourOFourResponse = Response.builder()
+				.request(feignRequest)
+				.status(404)
+				.headers(new HashMap<>()).build();
 		doReturn(fourOFourResponse).doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
 		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
@@ -247,7 +259,7 @@ public class RetryableFeignLoadBalancerTests {
 			int retriesNextServer = 0;
 			when(this.config.get(MaxAutoRetriesNextServer,
 							DEFAULT_MAX_AUTO_RETRIES_NEXT_SERVER)).thenReturn(retriesNextServer);
-			doReturn(new Server("foo", 80)).when(lb).chooseServer(anyObject());
+			doReturn(new Server("foo", 80)).when(lb).chooseServer(any());
 			RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(lb, config);
 			SpringClientFactory clientFactory = mock(SpringClientFactory.class);
 			IClientConfig config = mock(IClientConfig.class);
@@ -266,18 +278,25 @@ public class RetryableFeignLoadBalancerTests {
 					return backOffPolicy;
 				}
 			};
-			HttpRequest springRequest = mock(HttpRequest.class);
-			Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-							new byte[]{}, StandardCharsets.UTF_8);
+			Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+					new byte[] {}, UTF_8);
 			Client client = mock(Client.class);
 			FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-			Response response = Response.builder().status(404).headers(new HashMap<String, Collection<String>>()).build();
-			Response fourOFourResponse = Response.builder().status(404).headers(new HashMap<String, Collection<String>>()).build();
+			Response response = Response.builder()
+					.request(feignRequest)
+					.status(404)
+					.headers(new HashMap<>())
+					.build();
+			Response fourOFourResponse = Response.builder()
+					.request(feignRequest)
+					.status(404)
+					.headers(new HashMap<>())
+					.build();
 			doReturn(fourOFourResponse).doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));
 			RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
 			FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
 			assertEquals(404, ribbonResponse.toResponse().status());
-			assertEquals(new Integer(0), ribbonResponse.toResponse().body().length());
+			assertEquals(Integer.valueOf(0), ribbonResponse.toResponse().body().length());
 			verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
 			assertEquals(1, backOffPolicy.getCount());
 	}
@@ -288,12 +307,15 @@ public class RetryableFeignLoadBalancerTests {
 		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(clientFactory);
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response.builder()
+				.request(feignRequest)
+				.status(200)
+				.headers(new HashMap<>())
+				.build();
 		doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
 		RequestSpecificRetryHandler retryHandler = feignLb.getRequestSpecificRetryHandler(request, config);
@@ -308,12 +330,15 @@ public class RetryableFeignLoadBalancerTests {
 		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(clientFactory);
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request
+				.create(GET, "http://foo", new HashMap<>(),
+						new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response.builder()
+				.request(feignRequest)
+				.status(200).headers(new HashMap<>())
+				.build();
 		doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));
 		final Server server = new Server("foo", 80);
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(new ILoadBalancer() {
@@ -379,12 +404,15 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://listener", new HashMap<String, Collection<String>>(),
-			new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://listener"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response.builder()
+				.request(feignRequest)
+				.status(200)
+				.headers(new HashMap<>())
+				.build();
 		doThrow(new IOException("boom")).doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));

 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
@@ -408,7 +436,6 @@ public class RetryableFeignLoadBalancerTests {
 		doReturn("").when(config).getPropertyAsString(eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES),eq(""));
 		doReturn(config).when(clientFactory).getClientConfig(eq("default"));
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
 		MyBackOffPolicy backOffPolicy = new MyBackOffPolicy();
 		MyRetryListenerNotRetry myRetryListenerNotRetry = new MyRetryListenerNotRetry();
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(clientFactory){
@@ -422,9 +449,8 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://listener", new HashMap<String, Collection<String>>(),
-			new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://listener"));
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryFactory);
@@ -451,12 +477,15 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://listener", new HashMap<String, Collection<String>>(),
-			new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://listener"));
-		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).build();
+		Response response = Response.builder()
+				.request(feignRequest)
+				.status(200)
+				.headers(new HashMap<>())
+				.build();
 		doThrow(new IOException("boom")).doReturn(response).when(client).execute(any(Request.class), any(Request.Options.class));
 		RetryableFeignLoadBalancer feignLb = new RetryableFeignLoadBalancer(lb, config, inspector, loadBalancedRetryPolicyFactory);
 		FeignLoadBalancer.RibbonResponse ribbonResponse = feignLb.execute(request, null);
@@ -486,12 +515,14 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		HttpRequest springRequest = mock(HttpRequest.class);
-		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
-				new byte[]{}, StandardCharsets.UTF_8);
+		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
+				new byte[] {}, UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response fourOFourResponse = Response.builder().status(404).headers(new HashMap<String, Collection<String>>())
+		Response fourOFourResponse = Response.builder()
+				.request(feignRequest)
+				.status(404)
+				.headers(new HashMap<>())
 				.body(new Response.Body() { //set content into response
 					@Override
 					public Integer length() {
@@ -510,7 +541,12 @@ public class RetryableFeignLoadBalancerTests {

 					@Override
 					public Reader asReader() throws IOException {
-						return new InputStreamReader(asInputStream(), "UTF-8");
+						return new InputStreamReader(asInputStream(), UTF_8);
+					}
+
+					@Override
+					public Reader asReader(Charset charset) throws IOException {
+						return new InputStreamReader(asInputStream(), charset);
 					}

 					@Override
@@ -15,9 +15,6 @@
 */
 package org.springframework.cloud.openfeign.ribbon;

-import feign.Request;
-import feign.Response;
-
 import java.io.ByteArrayInputStream;
 import java.net.URI;
 import java.nio.charset.Charset;
@@ -26,11 +23,16 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import feign.Request;
+import feign.Response;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.util.StreamUtils;

+import static feign.Request.HttpMethod.GET;
 import static org.junit.Assert.assertEquals;

 /**
@@ -45,7 +47,7 @@ public class RibbonResponseStatusCodeExceptionTest {
 		List<String> fooValues = new ArrayList<String>();
 		fooValues.add("bar");
 		headers.put("foo", fooValues);
-		Request request = Request.create("GET", "http://service.com",
+		Request request = Request.create(GET, "http://service.com",
 				new HashMap<String, Collection<String>>(), new byte[]{}, Charset.defaultCharset());
 		byte[] body = "foo".getBytes();
 		ByteArrayInputStream is = new ByteArrayInputStream(body);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -21,10 +21,14 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.util.Collection;
+import java.util.List;

+import feign.RequestTemplate;
+import feign.codec.EncodeException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -46,16 +50,18 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
-
-import feign.RequestTemplate;
-import feign.codec.EncodeException;
+import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
+import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE;

 /**
 * @author Spencer Gibb
+ * @author Olga Maciaszek-Sharma
 */
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
@@ -85,8 +91,8 @@ public class SpringEncoderTests {
 		String header = contentTypeHeader.iterator().next();
 		assertThat("content type header is wrong", header, is("application/mytype"));
 		
-		assertThat("request charset is null", request.charset(), is(notNullValue()));
-		assertThat("request charset is wrong", request.charset(), is(Charset.forName("UTF-8")));
+		assertThat("request charset is null", request.requestCharset(), is(notNullValue()));
+		assertThat("request charset is wrong", request.requestCharset(), is(Charset.forName("UTF-8")));
 	}

 	@Test
@@ -97,7 +103,9 @@ public class SpringEncoderTests {

 		encoder.encode("hi".getBytes(), null, request);

-		assertThat("request charset is not null", request.charset(), is(nullValue()));
+		assertThat("Request Content-Type is not octet-stream",
+				((List) request.headers().get(CONTENT_TYPE)).get(0),
+				equalTo(APPLICATION_OCTET_STREAM_VALUE));
 	}

 	@Test(expected = EncodeException.class)
@@ -109,7 +117,7 @@ public class SpringEncoderTests {
 		MultipartFile multipartFile = new MockMultipartFile("test_multipart_file", "hi".getBytes());
 		encoder.encode(multipartFile, MultipartFile.class, request);

-		assertThat("request charset is not null", request.charset(), is(nullValue()));
+		assertThat("request charset is not null", request.requestCharset(), is(nullValue()));
 	}

 	@Test
@@ -122,7 +130,9 @@ public class SpringEncoderTests {
 		MultipartFile multipartFile = new MockMultipartFile("test_multipart_file", "hi".getBytes());
 		encoder.encode(multipartFile, MultipartFile.class, request);

-		assertThat("request charset is not null", request.charset(), is(nullValue()));
+		assertThat("Request Content-Type is not multipart/form-data",
+				(String) ((List) request.headers().get(CONTENT_TYPE)).get(0),
+				containsString(MediaType.MULTIPART_FORM_DATA_VALUE));
 	}
 	
 	class MediaTypeMatcher implements ArgumentMatcher<MediaType> {
@@ -192,10 +202,7 @@ public class SpringEncoderTests {

 			@Override
 			public boolean canWrite(Class<?> clazz, MediaType mediaType) {
-				if (clazz == String.class) {
-					return true;
-				}
-				return false;
+				return clazz == String.class;
 			}

 			@Override
@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;

+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import feign.MethodMetadata;
 import feign.Param;
 import org.junit.Before;
 import org.junit.Test;
@@ -51,13 +53,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
-
-import feign.MethodMetadata;
+import static org.springframework.web.util.UriUtils.encode;

 /**
 * @author chadjaros
@@ -187,7 +188,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("", data.template().url());
+		assertEquals("/", data.template().url());
 		assertEquals("POST", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -201,7 +202,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("", data.template().url());
+		assertEquals("/", data.template().url());
 		assertEquals("POST", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -215,7 +216,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/advanced/test/{id}", data.template().url());
+		assertEquals("/advanced/test/{id}?amount=" + encode("{amount}", UTF_8),
+				data.template().url());
 		assertEquals("PUT", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -238,7 +240,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/advanced/test/{id}", data.template().url());
+		assertEquals("/advanced/test/{id}?amount=" + encode("{amount}", UTF_8),
+				data.template().url());
 		assertEquals("PUT", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -261,7 +264,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/advanced/test2", data.template().url());
+		assertEquals("/advanced/test2?amount=" + encode("{amount}", UTF_8),
+				data.template().url());
 		assertEquals("PUT", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -334,7 +338,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("", data.template().url());
+		assertEquals("/", data.template().url());
 		assertEquals("GET", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -347,7 +351,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/test", data.template().url());
+		assertEquals("/test?id=" + encode("{id}", UTF_8),
+				data.template().url());
 		assertEquals("GET", data.template().method());
 		assertEquals("[{id}]", data.template().queries().get("id").toString());
 		assertNotNull(data.indexToExpander().get(0));
@@ -360,7 +365,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/test", data.template().url());
+		assertEquals("/test?id=" + encode("{id}", UTF_8), data.template().url());
 		assertEquals("GET", data.template().method());
 		assertEquals("[{id}]", data.template().queries().get("id").toString());
 		assertNotNull(data.indexToExpander().get(0));
@@ -400,7 +405,7 @@ public class SpringMvcContractTests {

 		assertEquals("/test/{id}", data.template().url());
 		assertEquals("GET", data.template().method());
-		assertEquals(true, data.template().headers().isEmpty());
+		assertTrue(data.template().headers().isEmpty());
 	}

 	@Test
@@ -413,7 +418,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/advanced/testfallback/{id}", data.template().url());
+		assertEquals("/advanced/testfallback/{id}?amount=" + encode("{amount}", UTF_8), data
+				.template().url());
 		assertEquals("PUT", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -483,7 +489,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/queryMap", data.template().url());
+		assertEquals("/queryMap?aParam=" + encode("{aParam}", UTF_8),
+				data.template().url());
 		assertEquals("GET", data.template().method());
 		assertEquals(0, data.queryMapIndex().intValue());
 		Map<String, Collection<String>> params = data.template().queries();
@@ -497,7 +504,8 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

-		assertEquals("/queryMapObject", data.template().url());
+		assertEquals("/queryMapObject?aParam=" + encode("{aParam}", UTF_8),
+				data.template().url());
 		assertEquals("GET", data.template().method());
 		assertEquals(0, data.queryMapIndex().intValue());
 		Map<String, Collection<String>> params = data.template().queries();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.concurrent.TimeUnit;

+import feign.Client;
+import feign.httpclient.ApacheHttpClient;
 import org.apache.http.Header;
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpClient;
@@ -36,6 +38,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockingDetails;
 import org.mockito.Mockito;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -55,14 +58,11 @@ import org.springframework.util.ReflectionUtils;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockingDetails;

-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-
 /**
 * @author Ryan Baxter
 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-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.
@@ -16,18 +16,21 @@

 package org.springframework.cloud.openfeign.valid.scanning;

+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import feign.Client;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,11 +41,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
-
-import feign.Client;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

@@ -5,16 +5,17 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.0.RC3</version>		<relativePath/>
+		<version>2.1.2.RELEASE</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.1.0.RC2</version>
+	<version>2.1.0.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
-		<feign.version>9.7.0</feign.version>
-		<feign-form.version>3.3.0</feign-form.version>
+		<feign.version>10.1.0</feign.version>
+		<feign-form.version>3.5.0</feign-form.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.RC2</version>
+		<version>2.1.0.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
Author	SHA1	Message	Date
buildmaster	c1418bafee	Update SNAPSHOT to 2.1.0.RELEASE	2019-01-22 18:33:41 +00:00
Frank Pavageau	67fa03dcd9	Upgrade feign-form to 3.5.0 (#106 ) The earlier versions are not compatible with Feign 10.1.0 when using the form encoder. Fixes #105	2019-01-18 16:09:46 -05:00
Spencer Gibb	5804d12511	Bumps spring cloud build to 2.1.2.BUILD-SNAPSHOT	2019-01-12 13:05:02 -05:00
Ryan Baxter	d148672e13	Merge remote-tracking branch 'origin/2.0.x'	2019-01-07 09:51:04 -05:00
Ryan Baxter	a693c30930	Add null check for retry policy. Fixes #101	2019-01-07 09:49:36 -05:00
Piotr Smolarski	e227808b9d	Support Multiple Clients Using The Same Service (#90 ) * Use serviceId as url target if present. Fixes gh-67 * Code review fixes and improvements * Fix test * Add contextId to override bean name of feign client and its configuration. * Add documentation * Add contextId example to documentation	2019-01-07 09:35:48 -05:00
buildmaster	3051c4c1fd	Going back to snapshots	2018-12-20 21:12:44 +00:00
buildmaster	fb6676d634	Update SNAPSHOT to 2.1.0.RC3	2018-12-20 21:11:11 +00:00
Ryan Baxter	c1bbb9cbb3	Updating API usage for Boot 2.1.x.	2018-12-18 16:18:06 -05:00
Spencer Gibb	e65f78f06b	Merge branch '2.0.x'	2018-12-18 14:49:49 -05:00
Ryan Baxter	4e7e187323	Fix bug where host contains protocol characters (#97 ) Fixes #94	2018-12-18 14:48:31 -05:00
Olga Maciaszek-Sharma	a1a45125ea	Upgrade openfeign to 10.1.0 (#95 ) Upgrade to OpenFeign 10.1.0	2018-12-13 18:03:35 +01:00
Ryan Baxter	b00abe7b68	Fixing docs	2018-12-12 12:22:46 -05:00
buildmaster	b9cb792820	Going back to snapshots	2018-12-11 21:52:28 +00:00