Update SNAPSHOT to 2.0.3.RELEASE

Bumping versions
Add null check for retry policy. Fixes #101
2019-02-22 15:47:07 +00:00 · 2019-02-14 17:49:07 +00:00 · 2019-01-07 09:49:36 -05:00
50 changed files with 417 additions and 889 deletions
@@ -108,6 +108,8 @@ from the `file` menu.

 == Contributing

+:spring-cloud-build-branch: master
+
 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
 tracker for issues and merging pull requests into master. If you want
@@ -151,4 +153,136 @@ added after the original pull request but before a merge.
  other target branch in the main project).
 * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
+  message (where XXXX is the issue number).
+
+=== Checkstyle
+
+Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            └── checkstyle.xml <1>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+
+==== Checkstyle configuration
+
+Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
+
+.pom.xml
+----
+<properties>
+<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
+        <maven-checkstyle-plugin.failsOnViolation>true
+        </maven-checkstyle-plugin.failsOnViolation> <2>
+        <maven-checkstyle-plugin.includeTestSourceDirectory>true
+        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
+</properties>
+
+<build>
+        <plugins>
+            <plugin> <4>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+            </plugin>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    <reporting>
+        <plugins>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</build>
+----
+<1> Fails the build upon Checkstyle errors
+<2> Fails the build upon Checkstyle violations
+<3> Checkstyle analyzes also the test sources
+<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
+<5> Add checkstyle plugin to your build and reporting phases
+
+If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
+
+.projectRoot/src/checkstyle/checkstyle-suppresions.xml
+----
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
+</suppressions>
+----
+
+It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
+
+```bash
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ touch .springformat
+```
+
+=== IDE setup
+
+==== Intellij IDEA
+
+In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            ├── checkstyle.xml <1>
+            └── intellij
+                ├── Intellij_Project_Defaults.xml <4>
+                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+<4> Project defaults for Intellij that apply most of Checkstyle rules
+<5> Project style conventions for Intellij that apply most of Checkstyle rules
+
+.Code style
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
+
+.Inspection profiles
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
+
+.Checkstyle
+
+To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
+
+Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
+
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.RC3</version>
+		<version>2.0.3.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -425,38 +425,4 @@ public class FooConfiguration {
        return Logger.Level.FULL;
    }
 }
----
-
-=== 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
-incompatible with Spring because it lacks a `value` property.
-
-Spring Cloud OpenFeign provides an equivalent `@SpringQueryMap` annotation, which
-is used to annotate a POJO or Map parameter as a query parameter map.
-
-For example, the `Params` class defines parameters `param1` and `param2`:
-
-[source,java,indent=0]
----
-// Params.java
-public class Params {
-    private String param1;
-    private String param2;
-
-    // [Getters and setters omitted for brevity]
-}
----
-
-The following feign client uses the `Params` class by using the `@SpringQueryMap` annotation:
-
-[source,java,indent=0]
----
-@FeignClient("demo")
-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.RC3</version>
+	<version>2.0.3.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.0.5.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.RC3</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.0.3.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.0.3.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.RC3</version>
+		<version>2.0.3.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2015 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 list of FeignClient classes
+	 * @return
 	 */
 	Class<?>[] clients() default {};
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2016 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,6 +17,8 @@

 package org.springframework.cloud.openfeign;

+import org.springframework.util.Assert;
+
 import feign.Feign;
 import feign.Target;
 import feign.hystrix.FallbackFactory;
@@ -1,53 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign;
-
-import feign.QueryMap;
-import org.springframework.core.annotation.AliasFor;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Spring MVC equivalent of OpenFeign's {@link feign.QueryMap} parameter annotation.
- *
- * @author Aram Peres
- * @see feign.QueryMap
- * @see org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-public @interface SpringQueryMap {
-
-    /**
-     * Alias for {@link #encoded()}.
-     *
-     * @see QueryMap#encoded()
-     */
-    @AliasFor("encoded")
-    boolean value() default false;
-
-    /**
-     * Specifies whether parameter names and values are already encoded.
-     *
-     * @see QueryMap#encoded()
-     */
-    @AliasFor("value")
-    boolean encoded() default false;
-}
@@ -1,51 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.openfeign.annotation;
-
-import feign.MethodMetadata;
-import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.cloud.openfeign.SpringQueryMap;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-/**
- * {@link SpringQueryMap} parameter processor.
- *
- * @author Aram Peres
- * @see AnnotatedParameterProcessor
- */
-public class QueryMapParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<SpringQueryMap> ANNOTATION = SpringQueryMap.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
-		int paramIndex = context.getParameterIndex();
-		MethodMetadata metadata = context.getMethodMetadata();
-		if (metadata.queryMapIndex() == null) {
-			metadata.queryMapIndex(paramIndex);
-			metadata.queryMapEncoded(SpringQueryMap.class.cast(annotation).encoded());
-		}
-		return true;
-	}
-}
@@ -36,8 +36,8 @@ import com.netflix.loadbalancer.ILoadBalancer;
 */
 public class CachingSpringLoadBalancerFactory {

-	protected final SpringClientFactory factory;
-	protected LoadBalancedRetryFactory loadBalancedRetryFactory = null;
+	private final SpringClientFactory factory;
+	private LoadBalancedRetryFactory loadBalancedRetryFactory = null;

 	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015 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,10 @@

 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;
@@ -25,6 +29,11 @@ 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;
@@ -34,15 +43,6 @@ 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,7 +51,6 @@ 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> {
@@ -98,7 +97,7 @@ public class FeignLoadBalancer extends
 			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
 					requestConfig);
 		}
-		if (!request.toRequest().httpMethod().name().equals("GET")) {
+		if (!request.toRequest().method().equals("GET")) {
 			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
 					requestConfig);
 		}
@@ -119,7 +118,7 @@ public class FeignLoadBalancer extends
 		private final Request request;
 		private final Client client;

-		protected RibbonRequest(Client client, Request request, URI uri) {
+		RibbonRequest(Client client, Request request, URI uri) {
 			this.client = client;
 			setUri(uri);
 			this.request = toRequest(request);
@@ -128,8 +127,7 @@ public class FeignLoadBalancer extends
 		private Request toRequest(Request request) {
 			Map<String, Collection<String>> headers = new LinkedHashMap<>(
 					request.headers());
-			return Request.create(request.httpMethod(), getUri().toASCIIString(), headers,
-					request.requestBody());
+			return Request.create(request.method(),getUri().toASCIIString(),headers,request.body(),request.charset());
 		}

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

 				@Override
@@ -173,13 +170,6 @@ public class FeignLoadBalancer extends
 			};
 		}

-		public Request getRequest() {
-			return request;
-		}
-
-		public Client getClient() {
-			return client;
-		}

 		@Override
 		public Object clone() {
@@ -192,7 +182,7 @@ public class FeignLoadBalancer extends
 		private final URI uri;
 		private final Response response;

-		protected RibbonResponse(URI uri, Response response) {
+		RibbonResponse(URI uri, Response response) {
 			this.uri = uri;
 			this.response = response;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015 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,8 +30,6 @@ import feign.Client;
 import feign.Request;
 import feign.Response;

-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
 /**
 * @author Dave Syer
 *
@@ -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,12 +15,13 @@
 */
 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-2018 the original author or authors.
+ * Copyright 2013-2015 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,11 +24,8 @@ 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 {

@@ -50,11 +47,4 @@ 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-2018 the original author or authors.
+ * Copyright 2013-2017 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,14 +26,8 @@ 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;
@@ -44,6 +38,11 @@ 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;

@@ -130,8 +129,7 @@ public class SpringEncoder implements Encoder {
 					} else {
 						charset = StandardCharsets.UTF_8;
 					}
-					request.body(Request.Body.encoded(outputMessage.getOutputStream()
-							.toByteArray(), charset));
+					request.body(outputMessage.getOutputStream().toByteArray(), charset);
 					return;
 				}
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2016 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,7 +18,6 @@ package org.springframework.cloud.openfeign.support;

 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,25 +28,16 @@ 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;
 import org.springframework.cloud.openfeign.annotation.RequestHeaderParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.RequestParamParameterProcessor;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.DefaultParameterNameDiscoverer;
-import org.springframework.core.MethodParameter;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
@@ -58,15 +48,16 @@ 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 {
@@ -75,18 +66,13 @@ public class SpringMvcContract extends Contract.BaseContract

 	private static final String CONTENT_TYPE = "Content-Type";

-	private static final TypeDescriptor STRING_TYPE_DESCRIPTOR =
-			TypeDescriptor.valueOf(String.class);
-	private static final TypeDescriptor ITERABLE_TYPE_DESCRIPTOR =
-			TypeDescriptor.valueOf(Iterable.class);
-
 	private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer();

 	private final Map<Class<? extends Annotation>, AnnotatedParameterProcessor> annotatedArgumentProcessors;
 	private final Map<String, Method> processedMethods = new HashMap<>();

 	private final ConversionService conversionService;
-	private final ConvertingExpanderFactory convertingExpanderFactory;
+	private final Param.Expander expander;
 	private ResourceLoader resourceLoader = new DefaultResourceLoader();

 	public SpringMvcContract() {
@@ -114,7 +100,7 @@ public class SpringMvcContract extends Contract.BaseContract
 		}
 		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
 		this.conversionService = conversionService;
-		this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);
+		this.expander = new ConvertingExpander(conversionService);
 	}

 	@Override
@@ -135,7 +121,7 @@ public class SpringMvcContract extends Contract.BaseContract
 					if (!pathValue.startsWith("/")) {
 						pathValue = "/" + pathValue;
 					}
-					data.template().uri(pathValue);
+					data.template().insert(0, pathValue);
 				}
 			}
 		}
@@ -181,7 +167,7 @@ public class SpringMvcContract extends Contract.BaseContract
 			methods = new RequestMethod[] { RequestMethod.GET };
 		}
 		checkOne(method, methods, "method");
-		data.template().method(Request.HttpMethod.valueOf(methods[0].name()));
+		data.template().method(methods[0].name());

 		// path
 		checkAtMostOne(method, methodMapping.value(), "value");
@@ -191,10 +177,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().path().endsWith("/")) {
+						&& !data.template().toString().endsWith("/")) {
 					pathValue = "/" + pathValue;
 				}
-				data.template().uri(pathValue, true);
+				data.template().append(pathValue);
 			}
 		}

@@ -253,40 +239,14 @@ public class SpringMvcContract extends Contract.BaseContract
 						processParameterAnnotation, method);
 			}
 		}
-
-		if (isHttpAnnotation && data.indexToExpander().get(paramIndex) == null) {
-			TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
-			if (conversionService.canConvert(typeDescriptor, STRING_TYPE_DESCRIPTOR)) {
-				Param.Expander expander =
-						convertingExpanderFactory.getExpander(typeDescriptor);
-				if (expander != null) {
-					data.indexToExpander().put(paramIndex, expander);
-				}
-			}
+		if (isHttpAnnotation && data.indexToExpander().get(paramIndex) == null
+				&& this.conversionService.canConvert(
+						method.getParameterTypes()[paramIndex], String.class)) {
+			data.indexToExpander().put(paramIndex, this.expander);
 		}
 		return isHttpAnnotation;
 	}

-	private static TypeDescriptor createTypeDescriptor(Method method, int paramIndex) {
-		Parameter parameter = method.getParameters()[paramIndex];
-		MethodParameter methodParameter = MethodParameter.forParameter(parameter);
-		TypeDescriptor typeDescriptor = new TypeDescriptor(methodParameter);
-
-		// Feign applies the Param.Expander to each element of an Iterable, so in those
-		// cases we need to provide a TypeDescriptor of the element.
-		if (typeDescriptor.isAssignableTo(ITERABLE_TYPE_DESCRIPTOR)) {
-			TypeDescriptor elementTypeDescriptor =
-					typeDescriptor.getElementTypeDescriptor();
-
-			checkState(elementTypeDescriptor != null,
-					"Could not resolve element type of Iterable type %s. Not declared?",
-					typeDescriptor);
-
-			typeDescriptor = elementTypeDescriptor;
-		}
-		return typeDescriptor;
-	}
-
 	private void parseProduces(MethodMetadata md, Method method,
 			RequestMapping annotation) {
 		String[] serverProduces = annotation.produces();
@@ -337,7 +297,6 @@ public class SpringMvcContract extends Contract.BaseContract
 		annotatedArgumentResolvers.add(new PathVariableParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestParamParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
-		annotatedArgumentResolvers.add(new QueryMapParameterProcessor());

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

-	/**
-	 * @deprecated Not used internally anymore. Will be removed in the future.
-	 */
-	@Deprecated
 	public static class ConvertingExpander implements Param.Expander {

 		private final ConversionService conversionService;
@@ -420,21 +375,4 @@ public class SpringMvcContract extends Contract.BaseContract
 		}

 	}
-
-	private static class ConvertingExpanderFactory {
-
-		private final ConversionService conversionService;
-
-		ConvertingExpanderFactory(ConversionService conversionService) {
-			this.conversionService = conversionService;
-		}
-
-		Param.Expander getExpander(TypeDescriptor typeDescriptor) {
-			return value -> {
-				Object converted = this.conversionService.convert(
-						value, typeDescriptor, STRING_TYPE_DESCRIPTOR);
-				return (String) converted;
-			};
-		}
-	}
 }
@@ -16,13 +16,6 @@

 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;
@@ -32,16 +25,13 @@ 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;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
@@ -51,7 +41,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -150,7 +144,6 @@ public class FeignClientUsingPropertiesTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@RestController
-	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

 		@RequestMapping(method = RequestMethod.GET, value = "/foo")
@@ -218,7 +211,7 @@ public class FeignClientUsingPropertiesTests {
 			});

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

@@ -28,7 +28,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
 import org.springframework.cloud.test.ClassPathExclusions;
@@ -50,11 +49,8 @@ public class FeignHttpClientConfigurationTests {

 	@Before
 	public void setUp() {
-		context = new SpringApplicationBuilder()
-				.properties("debug=true","feign.httpclient.disableSslValidation=true")
-				.web(WebApplicationType.NONE)
-				.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
-				.run();
+		context = new SpringApplicationBuilder().properties("debug=true","feign.httpclient.disableSslValidation=true").web(false)
+				.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
 	}

 	@After
@@ -34,10 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 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.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.ReflectionUtils;
@@ -105,7 +103,6 @@ public class FeignHttpClientUrlTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class, BeanUrlClientNoProtocol.class })
-	@Import(NoSecurityConfiguration.class)
 	protected static class TestConfig {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -25,7 +25,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
@@ -46,7 +45,7 @@ public class FeignOkHttpConfigurationTests {
 	@Before
 	public void setUp() {
 		context = new SpringApplicationBuilder().properties("debug=true","feign.httpclient.disableSslValidation=true",
-				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false").web(WebApplicationType.NONE)
+				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false").web(false)
 				.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
 	}

@@ -28,9 +28,7 @@ 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.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -203,7 +201,6 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 	@Configuration
 	@EnableAutoConfiguration
 	@RestController
-	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements TestClient {

 		@Override
@@ -22,7 +22,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
 import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
@@ -52,7 +51,7 @@ public class SpringRetryDisabledTests {

 	@Before
 	public void setUp() {
-		context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+		context = new SpringApplicationBuilder().web(false)
 				.sources(RibbonAutoConfiguration.class, LoadBalancerAutoConfiguration.class, RibbonClientConfiguration.class,
 						FeignRibbonClientAutoConfiguration.class).run();
 	}
@@ -35,10 +35,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -78,7 +76,6 @@ public class FeignAcceptEncodingTests {
 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
 	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
-	@Import(NoSecurityConfiguration.class)
 	public static class Application {
 	}

@@ -33,10 +33,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -81,7 +79,6 @@ public class FeignContentEncodingTests {
 	@EnableFeignClients(clients = InvoiceClient.class)
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
 	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
-	@Import(NoSecurityConfiguration.class)
 	public static class Application {
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2013 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,7 +19,6 @@ 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;
@@ -28,8 +27,6 @@ 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
 *
@@ -48,7 +45,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-2018 the original author or authors.
+ * Copyright 2012-2013 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,14 +16,6 @@

 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;
@@ -38,21 +30,24 @@ 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.junit.MockitoJUnitRunner;
+import org.mockito.runners.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 static feign.Request.Body.encoded;
-import static feign.Request.HttpMethod.POST;
+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;

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

@@ -119,22 +112,20 @@ 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(ArgumentMatchers.<HttpUriRequest>any()))
-                .will(new Answer<HttpResponse>() {
+        BDDMockito.given(httpClient.execute(Matchers.<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.resolve(new HashMap<>())
-                .request(), new feign.Request.Options());
+        new ApacheHttpClient(httpClient).execute(requestTemplate.request(), new feign.Request.Options());
        HttpUriRequest httpUriRequest = request.get(0);
        return  ((HttpEntityEnclosingRequestBase)httpUriRequest).getEntity();
    }
@@ -16,45 +16,17 @@

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

-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy;
-import org.springframework.cloud.openfeign.hystrix.security.app.ProxyUsernameController;
-import org.springframework.cloud.openfeign.hystrix.security.app.TestInterceptor;
 import org.springframework.cloud.openfeign.hystrix.security.app.UsernameClient;
-import org.springframework.cloud.openfeign.hystrix.security.app.UsernameController;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;

 /**
 * @author Daniel Lavoie
 */
@Configuration
-@EnableAutoConfiguration
+@SpringBootApplication
@EnableFeignClients(clients = UsernameClient.class)
-@Import(NoSecurityConfiguration.class)
 public class HystrixSecurityApplication {

-	@Bean
-	public CustomConcurrenyStrategy customConcurrenyStrategy() {
-		return new CustomConcurrenyStrategy();
-	}
-
-	@Bean
-	public TestInterceptor testInterceptor() {
-		return new TestInterceptor();
-	}
-
-	@Bean
-	public ProxyUsernameController proxyUsernameController() {
-		return new ProxyUsernameController();
-	}
-
-	@Bean
-	public UsernameController usernameController() {
-		return new UsernameController();
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2016 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,34 +17,24 @@
 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.Assert;
 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;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.netflix.hystrix.security.SecurityContextConcurrencyStrategy;
-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.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
+import com.netflix.hystrix.strategy.HystrixPlugins;
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;

 import static org.assertj.core.api.Assertions.assertThat;

@@ -55,8 +45,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
@RunWith(SpringRunner.class)
@DirtiesContext
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
-		properties = { "feign.hystrix.enabled=true"})
+@SpringBootTest(classes = HystrixSecurityApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT,
+		properties = { "username.ribbon.listOfServers=localhost:${local.server.port}",
+				"feign.hystrix.enabled=true"})
@ActiveProfiles("proxysecurity")
 public class HystrixSecurityTests {
 	@Autowired
@@ -65,7 +56,7 @@ public class HystrixSecurityTests {
 	@LocalServerPort
 	private String serverPort;

-	//TODO: move to constants in TestAutoConfiguration
+	//TODOO: move to constants in TestAutoConfiguration
 	private String username = "user";

 	private String password = "password";
@@ -78,21 +69,19 @@ public class HystrixSecurityTests {

 	@Test
 	public void testFeignHystrixSecurity() {
-		HttpHeaders headers = createBasicAuthHeader(username, password);
+		HttpHeaders headers = HystrixSecurityTests.createBasicAuthHeader(username,
+				password);

-		ResponseEntity<String> entity = new RestTemplate()
+		String usernameResult = new RestTemplate()
 				.exchange("http://localhost:" + serverPort + "/proxy-username",
-						HttpMethod.GET, new HttpEntity<Void>(headers), String.class);
+						HttpMethod.GET, new HttpEntity<Void>(headers), String.class)
+				.getBody();

-		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		Assert.assertTrue("Username should have been intercepted by feign interceptor.",
+				username.equals(usernameResult));

-		assertThat(entity.getBody())
-				.as("Username should have been intercepted by feign interceptor.")
-				.isEqualTo(username);
-
-		 assertThat(customConcurrenyStrategy.isHookCalled())
-				.as("Custom hook should have been called.")
-				.isTrue();
+		Assert.assertTrue("Custom hook should have been called.",
+				customConcurrenyStrategy.isHookCalled());
 	}

 	public static HttpHeaders createBasicAuthHeader(final String username,
@@ -108,21 +97,4 @@ public class HystrixSecurityTests {
 			}
 		};
 	}
-
-	@SpringBootConfiguration
-	@Import(HystrixSecurityApplication.class)
-	@RibbonClient(name = "username", configuration = LocalRibbonClientConfiguration.class)
-	protected static class TestConfig { }
-
-	protected static class LocalRibbonClientConfiguration {
-
-		@LocalServerPort
-		private int port = 0;
-
-		@Bean
-		public ServerList<Server> ribbonServerList() {
-			return new StaticServerList<>(new Server("localhost", this.port));
-		}
-
-	}
 }
@@ -1,9 +1,10 @@
 package org.springframework.cloud.openfeign.hystrix.security.app;

+import java.util.concurrent.Callable;
+import org.springframework.stereotype.Component;
 import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;

-import java.util.concurrent.Callable;
-
+@Component
 public class CustomConcurrenyStrategy extends HystrixConcurrencyStrategy {
 	private boolean hookCalled;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2016 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,6 +20,7 @@ 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
@@ -27,6 +28,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 * 
 * @author Daniel Lavoie
 */
+@Component
 public class TestInterceptor implements RequestInterceptor {

 	@Override
@@ -26,5 +26,5 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface UsernameClient {

 	@RequestMapping("/username")
-	String getUsername();
+	public String getUsername();
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2017 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,31 +18,30 @@
 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.netflix.ribbon.DefaultServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
 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 static com.netflix.client.config.CommonClientConfigKey.ConnectTimeout;
 import static com.netflix.client.config.CommonClientConfigKey.IsSecure;
@@ -52,12 +51,11 @@ 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.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;

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

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

-		Response response = Response.builder()
-				.request(request)
-				.status(200)
-				.reason("Test")
-				.headers(Collections.emptyMap())
-				.body(new byte[0])
-				.build();
+		Response response = Response.create(200, "Test",
+				Collections.<String, Collection<String>> emptyMap(), new byte[0]);
 		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
@@ -166,7 +156,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));

@@ -178,38 +168,4 @@ public class FeignLoadBalancerTests {

 	}

-	@Test
-	public void testOverrideFeignLoadBalancer() throws Exception {
-		when(this.config.get(IsSecure)).thenReturn(false);
-		Server server1 = new Server("foo", 6666);
-		Server server2 = new Server("foo", 7777);
-		BaseLoadBalancer baseLoadBalancer = new BaseLoadBalancer();
-		baseLoadBalancer.setRule(new RoundRobinRule() {
-			@Override
-			public Server choose(Object loadBalancerKey) {
-				return loadBalancerKey == null ? server2 : server1;
-			}
-		});
-
-		this.feignLoadBalancer = new FeignLoadBalancer(baseLoadBalancer, this.config,
-				this.inspector) {
-			protected void customizeLoadBalancerCommandBuilder(final FeignLoadBalancer.RibbonRequest request, final IClientConfig config,
-															   final LoadBalancerCommand.Builder<FeignLoadBalancer.RibbonResponse> builder) {
-				builder.withServerLocator(request.getRequest().headers().get("c_ip"));
-			}
-		};
-		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")
-				.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-2018 the original author or authors.
+ * Copyright 2016 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,32 +16,30 @@

 package org.springframework.cloud.openfeign.ribbon;

-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 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.openfeign.test.NoSecurityConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

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

 /**
 * @author Venil Noronha
@@ -86,16 +84,16 @@ public class FeignRibbonClientPathTests {
 	@FeignClient(name = "localapp", path = "/base/path")
 	protected interface TestClient1 extends TestClient { }

-	@FeignClient(name = "localapp1", path = "base/path")
+	@FeignClient(name = "localapp", path = "base/path")
 	protected interface TestClient2 extends TestClient { }

-	@FeignClient(name = "localapp2", path = "base/path/")
+	@FeignClient(name = "localapp", path = "base/path/")
 	protected interface TestClient3 extends TestClient { }

-	@FeignClient(name = "localapp3", path = "/base/path/")
+	@FeignClient(name = "localapp", path = "/base/path/")
 	protected interface TestClient4 extends TestClient { }

-	@FeignClient(name = "localapp4", path = "${test.path.prefix}")
+	@FeignClient(name = "localapp", path = "${test.path.prefix}")
 	protected interface TestClient5 extends TestClient { }
 	
 	@Configuration
@@ -106,8 +104,7 @@ public class FeignRibbonClientPathTests {
 		TestClient1.class, TestClient2.class, TestClient3.class, TestClient4.class,
 		TestClient5.class
 	})
-	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
-	@Import(NoSecurityConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	public static class Application {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -31,10 +31,8 @@ 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;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -80,7 +78,6 @@ public class FeignRibbonClientRetryTests {
 	@RestController
 	@EnableFeignClients(clients = TestClient.class)
 	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
-	@Import(NoSecurityConfiguration.class)
 	public static class Application {

 		private AtomicInteger retries = new AtomicInteger(1);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2015 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,8 +16,6 @@

 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;
@@ -33,13 +31,11 @@ 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 feign.Request.HttpMethod.GET;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -95,10 +91,7 @@ public class FeignRibbonClientTests {

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

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

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

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

 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.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
 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;
@@ -52,6 +46,7 @@ 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;
@@ -60,6 +55,13 @@ 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;
@@ -67,16 +69,15 @@ 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.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
+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.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -87,7 +88,6 @@ import static org.mockito.Mockito.when;
 /**
 * @author Ryan Baxter
 * @author Gang Li
- * @author Olga Maciaszek-Sharma
 */
 public class RetryableFeignLoadBalancerTests {
 	@Mock
@@ -126,15 +126,12 @@ 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);
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.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)
-				.request(feignRequest)
-				.headers(new HashMap<>())
-				.build();
+		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).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);
@@ -144,8 +141,9 @@ public class RetryableFeignLoadBalancerTests {

 	@Test
 	public void executeNeverRetry() throws Exception {
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.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));
@@ -194,15 +192,12 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.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)
-				.request(feignRequest)
-				.headers(new HashMap<>())
-				.build();
+		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).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);
@@ -232,20 +227,13 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response
-				.builder()
-				.request(feignRequest)
-				.status(200)
-				.headers(new HashMap<>())
-				.build();
-		Response fourOFourResponse = Response.builder()
-				.request(feignRequest)
-				.status(404)
-				.headers(new HashMap<>()).build();
+		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();
 		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);
@@ -259,7 +247,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(any());
+			doReturn(new Server("foo", 80)).when(lb).chooseServer(anyObject());
 			RibbonLoadBalancerContext lbContext = new RibbonLoadBalancerContext(lb, config);
 			SpringClientFactory clientFactory = mock(SpringClientFactory.class);
 			IClientConfig config = mock(IClientConfig.class);
@@ -278,25 +266,18 @@ public class RetryableFeignLoadBalancerTests {
 					return backOffPolicy;
 				}
 			};
-			Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-					new byte[] {}, UTF_8);
+			HttpRequest springRequest = mock(HttpRequest.class);
+			Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+							new byte[]{}, StandardCharsets.UTF_8);
 			Client client = mock(Client.class);
 			FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-			Response response = Response.builder()
-					.request(feignRequest)
-					.status(404)
-					.headers(new HashMap<>())
-					.build();
-			Response fourOFourResponse = Response.builder()
-					.request(feignRequest)
-					.status(404)
-					.headers(new HashMap<>())
-					.build();
+			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();
 			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(Integer.valueOf(0), ribbonResponse.toResponse().body().length());
+			assertEquals(new Integer(0), ribbonResponse.toResponse().body().length());
 			verify(client, times(2)).execute(any(Request.class), any(Request.Options.class));
 			assertEquals(1, backOffPolicy.getCount());
 	}
@@ -307,15 +288,12 @@ public class RetryableFeignLoadBalancerTests {
 		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(clientFactory);
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder()
-				.request(feignRequest)
-				.status(200)
-				.headers(new HashMap<>())
-				.build();
+		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).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);
@@ -330,15 +308,12 @@ public class RetryableFeignLoadBalancerTests {
 		SpringClientFactory clientFactory = mock(SpringClientFactory.class);
 		doReturn(lbContext).when(clientFactory).getLoadBalancerContext(any(String.class));
 		RibbonLoadBalancedRetryFactory loadBalancedRetryFactory = new RibbonLoadBalancedRetryFactory(clientFactory);
-		Request feignRequest = Request
-				.create(GET, "http://foo", new HashMap<>(),
-						new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response response = Response.builder()
-				.request(feignRequest)
-				.status(200).headers(new HashMap<>())
-				.build();
+		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).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() {
@@ -404,15 +379,12 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://listener", new HashMap<String, Collection<String>>(),
+			new byte[]{}, StandardCharsets.UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://listener"));
-		Response response = Response.builder()
-				.request(feignRequest)
-				.status(200)
-				.headers(new HashMap<>())
-				.build();
+		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).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);
@@ -436,6 +408,7 @@ 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){
@@ -449,8 +422,9 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://listener", new HashMap<String, Collection<String>>(),
+			new byte[]{}, StandardCharsets.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);
@@ -477,15 +451,12 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://listener", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://listener", new HashMap<String, Collection<String>>(),
+			new byte[]{}, StandardCharsets.UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://listener"));
-		Response response = Response.builder()
-				.request(feignRequest)
-				.status(200)
-				.headers(new HashMap<>())
-				.build();
+		Response response = Response.builder().status(200).headers(new HashMap<String, Collection<String>>()).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);
@@ -515,14 +486,12 @@ public class RetryableFeignLoadBalancerTests {
 				return backOffPolicy;
 			}
 		};
-		Request feignRequest = Request.create(GET, "http://foo", new HashMap<>(),
-				new byte[] {}, UTF_8);
+		HttpRequest springRequest = mock(HttpRequest.class);
+		Request feignRequest = Request.create("GET", "http://foo", new HashMap<String, Collection<String>>(),
+				new byte[]{}, StandardCharsets.UTF_8);
 		Client client = mock(Client.class);
 		FeignLoadBalancer.RibbonRequest request = new FeignLoadBalancer.RibbonRequest(client, feignRequest, new URI("http://foo"));
-		Response fourOFourResponse = Response.builder()
-				.request(feignRequest)
-				.status(404)
-				.headers(new HashMap<>())
+		Response fourOFourResponse = Response.builder().status(404).headers(new HashMap<String, Collection<String>>())
 				.body(new Response.Body() { //set content into response
 					@Override
 					public Integer length() {
@@ -541,12 +510,7 @@ public class RetryableFeignLoadBalancerTests {

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

 					@Override
@@ -15,6 +15,9 @@
 */
 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;
@@ -23,16 +26,11 @@ 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.junit.MockitoJUnitRunner;
-
+import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.util.StreamUtils;

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

 /**
@@ -47,7 +45,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);
@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,6 +32,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.springframework.boot.test.util.EnvironmentTestUtils.addEnvironment;

 /**
 * @author Ryan Baxter
@@ -63,12 +63,12 @@ public class FeignHttpClientPropertiesTests {

 	@Test
 	public void testCustomization() {
-		TestPropertyValues.of("feign.httpclient.maxConnections=2",
+		addEnvironment(this.context, "feign.httpclient.maxConnections=2",
 				"feign.httpclient.connectionTimeout=2",
 				"feign.httpclient.maxConnectionsPerRoute=2",
 				"feign.httpclient.timeToLive=2",
 				"feign.httpclient.disableSslValidation=true",
-				"feign.httpclient.followRedirects=false").applyTo(this.context);
+				"feign.httpclient.followRedirects=false");
 		setupContext();
 		assertEquals(2, getProperties().getMaxConnections());
 		assertEquals(2, getProperties().getConnectionTimeout());
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2017 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,14 +21,10 @@ 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;
@@ -50,18 +46,16 @@ 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 static org.springframework.http.HttpHeaders.CONTENT_TYPE;
-import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE;
+
+import feign.RequestTemplate;
+import feign.codec.EncodeException;

 /**
 * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
 */
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
@@ -91,8 +85,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.requestCharset(), is(notNullValue()));
-		assertThat("request charset is wrong", request.requestCharset(), is(Charset.forName("UTF-8")));
+		assertThat("request charset is null", request.charset(), is(notNullValue()));
+		assertThat("request charset is wrong", request.charset(), is(Charset.forName("UTF-8")));
 	}

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

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

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

 	@Test(expected = EncodeException.class)
@@ -117,7 +109,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.requestCharset(), is(nullValue()));
+		assertThat("request charset is not null", request.charset(), is(nullValue()));
 	}

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

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

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

 			@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2016 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,27 +18,12 @@ package org.springframework.cloud.openfeign.support;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Collection;
-import java.util.Collections;
 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;
-
-import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.format.annotation.NumberFormat;
-import org.springframework.format.number.NumberStyleFormatter;
-import org.springframework.format.support.FormattingConversionServiceFactoryBean;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.MultiValueMap;
@@ -53,17 +38,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;

-import static java.nio.charset.StandardCharsets.UTF_8;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+
 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 static org.springframework.web.util.UriUtils.encode;
+
+import feign.MethodMetadata;

 /**
 * @author chadjaros
- * @author Halvdan Hoem Grelland
- * @author Aram Peres
 */
 public class SpringMvcContractTests {
 	private static final Class<?> EXECUTABLE_TYPE;
@@ -83,12 +67,7 @@ public class SpringMvcContractTests {

 	@Before
 	public void setup() {
-		FormattingConversionServiceFactoryBean conversionServiceFactoryBean
-				= new FormattingConversionServiceFactoryBean();
-		conversionServiceFactoryBean.afterPropertiesSet();
-		ConversionService conversionService = conversionServiceFactoryBean.getObject();
-
-		this.contract = new SpringMvcContract(Collections.emptyList(), conversionService);
+		this.contract = new SpringMvcContract();
 	}

 	@Test
@@ -188,7 +167,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());
@@ -202,7 +181,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());
@@ -216,8 +195,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

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

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

-		assertEquals("/advanced/test2?amount=" + encode("{amount}", UTF_8),
-				data.template().url());
+		assertEquals("/advanced/test2", data.template().url());
 		assertEquals("PUT", data.template().method());
 		assertEquals(MediaType.APPLICATION_JSON_VALUE,
 				data.template().headers().get("Accept").iterator().next());
@@ -279,47 +255,6 @@ public class SpringMvcContractTests {
 				data.template().queries().get("amount").iterator().next());
 	}

-	@Test
-	public void testProcessAnnotations_DateTimeFormatParam() throws Exception {
-		Method method = TestTemplate_DateTimeFormatParameter.class.getDeclaredMethod(
-				"getTest", LocalDateTime.class);
-		MethodMetadata data = this.contract
-				.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		Param.Expander expander = data.indexToExpander().get(0);
-		assertNotNull(expander);
-
-		LocalDateTime input = LocalDateTime.of(2001, 10, 12, 23, 56, 3);
-
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(
-				TestTemplate_DateTimeFormatParameter.CUSTOM_PATTERN);
-
-		String expected = formatter.format(input);
-
-		assertEquals(expected, expander.expand(input));
-	}
-
-	@Test
-	public void testProcessAnnotations_NumberFormatParam() throws Exception {
-		Method method = TestTemplate_NumberFormatParameter.class.getDeclaredMethod(
-				"getTest", BigDecimal.class);
-		MethodMetadata data = this.contract
-				.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		Param.Expander expander = data.indexToExpander().get(0);
-		assertNotNull(expander);
-
-		NumberStyleFormatter formatter = new NumberStyleFormatter(
-				TestTemplate_NumberFormatParameter.CUSTOM_PATTERN);
-
-		BigDecimal input = BigDecimal.valueOf(1220.345);
-
-		String expected = formatter.print(input, Locale.getDefault());
-		String actual = expander.expand(input);
-
-		assertEquals(expected, actual);
-	}
-
 	@Test
 	public void testProcessAnnotations_Advanced2() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest");
@@ -338,7 +273,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());
@@ -351,8 +286,7 @@ public class SpringMvcContractTests {
 		MethodMetadata data = this.contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);

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

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

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

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

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

-		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();
-		assertEquals("{aParam}", params.get("aParam").iterator().next());
-	}
-
-	@Test
-	public void testProcessQueryMapObject() throws Exception {
-		Method method = TestTemplate_QueryMap.class.getDeclaredMethod("queryMapObject",
-				TestObject.class, String.class);
-		MethodMetadata data = this.contract
-				.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertEquals("/queryMapObject?aParam=" + encode("{aParam}", UTF_8),
-				data.template().url());
+		assertEquals("/queryMap", data.template().url());
 		assertEquals("GET", data.template().method());
 		assertEquals(0, data.queryMapIndex().intValue());
 		Map<String, Collection<String>> params = data.template().queries();
@@ -597,11 +514,6 @@ public class SpringMvcContractTests {
 		String queryMapMoreThanOnce(
 				@RequestParam MultiValueMap<String, String> queryMap1,
 				@RequestParam MultiValueMap<String, String> queryMap2);
-
-		@RequestMapping(path = "/queryMapObject")
-		String queryMapObject(
-				@SpringQueryMap TestObject queryMap,
-				@RequestParam(name = "aParam") String aParam);
 	}

 	@JsonAutoDetect
@@ -627,24 +539,6 @@ public class SpringMvcContractTests {
 		TestObject getTest();
 	}

-	public interface TestTemplate_DateTimeFormatParameter {
-
-		String CUSTOM_PATTERN = "dd-MM-yyyy HH:mm";
-
-		@RequestMapping(method = RequestMethod.GET)
-		String getTest(@RequestParam(name = "localDateTime")
-				@DateTimeFormat(pattern = CUSTOM_PATTERN) LocalDateTime localDateTime);
-	}
-
-	public interface TestTemplate_NumberFormatParameter {
-
-		String CUSTOM_PATTERN = "$###,###.###";
-
-		@RequestMapping(method = RequestMethod.GET)
-		String getTest(@RequestParam("amount")
-				@NumberFormat(pattern = CUSTOM_PATTERN) BigDecimal amount);
-	}
-
 	@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 	public class TestObject {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2017 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,8 +21,6 @@ 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;
@@ -38,7 +36,6 @@ 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;
@@ -58,11 +55,14 @@ import org.springframework.util.ReflectionUtils;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.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,33 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.springframework.cloud.openfeign.test;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter {
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
-		http.authorizeRequests()
-				.anyRequest().permitAll()
-				.and()
-				.csrf().disable();
-	}
-}
@@ -20,7 +20,6 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.text.ParseException;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -48,13 +47,10 @@ import org.springframework.cloud.openfeign.support.FallbackCommand;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
 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;
-import org.springframework.context.annotation.Import;
 import org.springframework.format.Formatter;
 import org.springframework.format.FormatterRegistry;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -98,7 +94,6 @@ import rx.Single;
 * @author Spencer Gibb
 * @author Jakub Narloch
 * @author Erik Kringen
- * @author Halvdan Hoem Grelland
 */
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = FeignClientTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
@@ -199,11 +194,6 @@ public class FeignClientTests {
 		@RequestMapping(method = RequestMethod.GET, path = "/helloparams")
 		List<String> getParams(@RequestParam("params") List<String> params);

-		@RequestMapping(method = RequestMethod.GET, path = "/formattedparams")
-		List<LocalDate> getFormattedParams(
-				@RequestParam("params")
-				@DateTimeFormat(pattern = "dd-MM-yyyy") List<LocalDate> params);
-
 		@RequestMapping(method = RequestMethod.GET, path = "/hellos")
 		HystrixCommand<List<Hello>> getHellosHystrix();

@@ -408,7 +398,6 @@ public class FeignClientTests {
 			@RibbonClient(name = "localapp6", configuration = LocalRibbonClientConfiguration.class),
 			@RibbonClient(name = "localapp7", configuration = LocalRibbonClientConfiguration.class)
 	})
-	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

 		// needs to be in parent context to test multiple HystrixClient beans
@@ -502,13 +491,6 @@ public class FeignClientTests {
 			return params;
 		}

-		@RequestMapping(method = RequestMethod.GET, path = "/formattedparams")
-		public List<LocalDate> getFormattedParams(
-				@RequestParam("params")
-				@DateTimeFormat(pattern = "dd-MM-yyyy") List<LocalDate> params) {
-			return params;
-		}
-
 		@RequestMapping(method = RequestMethod.GET, path = "/noContent")
 		ResponseEntity<Void> noContent() {
 			return ResponseEntity.noContent().build();
@@ -651,15 +633,6 @@ public class FeignClientTests {
 		assertEquals("params size was wrong", list.size(), params.size());
 	}

-	@Test
-	public void testFormattedParams() {
-		List<LocalDate> list = Arrays.asList(
-				LocalDate.of(2001, 1, 1), LocalDate.of(2018, 6, 10));
-		List<LocalDate> params = this.testClient.getFormattedParams(list);
-		assertNotNull("params was null", params);
-		assertEquals("params not converted correctly", list, params);
-	}
-
 	@Test
 	public void testHystrixCommand() throws NoSuchMethodException {
 		HystrixCommand<List<Hello>> command = this.testClient.getHellosHystrix();
@@ -25,16 +25,13 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 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;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -98,7 +95,7 @@ public class FeignHttpClientTests {
 		User getUser(@PathVariable("id") long id);
 	}

-	@FeignClient("localapp1")
+	@FeignClient("localapp")
 	protected interface UserClient extends UserService {
 	}

@@ -106,11 +103,7 @@ public class FeignHttpClientTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
-	@RibbonClients({
-			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class)
-	})
-	@Import(NoSecurityConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	protected static class Application implements UserService {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -24,16 +24,13 @@ 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.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
 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;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -99,7 +96,7 @@ public class FeignOkHttpTests {
 		User getUser(@PathVariable("id") long id);
 	}

-	@FeignClient("localapp1")
+	@FeignClient("localapp")
 	protected interface UserClient extends UserService {
 	}

@@ -107,11 +104,7 @@ public class FeignOkHttpTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients(clients = { TestClient.class, UserClient.class })
-	@RibbonClients({
-			@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
-			@RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class)
-	})
-	@Import(NoSecurityConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	protected static class Application implements UserService {

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -24,13 +24,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.cloud.openfeign.testclients.TestClient;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -68,7 +66,6 @@ public class FeignClientEnvVarTests {
 	@RestController
 	@EnableFeignClients(basePackages = {"${basepackage}"})
 	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
-	@Import(NoSecurityConfiguration.class)
 	protected static class Application {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		public String getHello() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2015 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,31 +16,30 @@

 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.openfeign.test.NoSecurityConfiguration;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.StaticServerList;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 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;

@@ -66,7 +65,7 @@ public class FeignClientScanningTests {
 	@SuppressWarnings("unused")
 	private Client feignClient;

-	@FeignClient("localapp123")
+	@FeignClient("localapp")
 	protected interface TestClient {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		String getHello();
@@ -82,8 +81,7 @@ public class FeignClientScanningTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients // NO clients attribute. That's what this class is testing!
-	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
-	@Import(NoSecurityConfiguration.class)
+	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
 	protected static class Application {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		public String getHello() {
@@ -5,15 +5,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.0.RC3</version>		<relativePath/>
+		<version>2.0.5.RELEASE</version>
+		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.1.0.RC3</version>
+	<version>2.0.3.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
-		<feign.version>10.1.0</feign.version>
+		<feign.version>9.7.0</feign.version>
 		<feign-form.version>3.3.0</feign-form.version>
 	</properties>
 	<dependencyManagement>
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.1.0.RC3</version>
+		<version>2.0.3.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
Author	SHA1	Message	Date
buildmaster	80de4e6b66	Update SNAPSHOT to 2.0.3.RELEASE	2019-02-22 15:47:07 +00:00
buildmaster	5f4acbe80e	Bumping versions	2019-02-14 17:49:07 +00:00
Ryan Baxter	a693c30930	Add null check for retry policy. Fixes #101	2019-01-07 09:49:36 -05:00