Update SNAPSHOT to 2.1.0.RC1

Merge remote-tracking branch 'origin/2.0.x'
Update pom.xml (#88 )
2018-12-11 16:37:40 +00:00 · 2018-12-11 10:04:16 -05:00 · 2018-12-11 10:02:58 -05:00 · 2018-12-11 09:12:30 -05:00 · 2018-12-10 12:30:03 -05:00 · 2018-12-06 21:26:36 +01:00
53 changed files with 1078 additions and 155 deletions
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.0.0.RC2</version>
+		<version>2.1.0.RC1</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
@@ -224,14 +224,14 @@ class FooController {
 	private FooClient adminClient;

    	@Autowired
-	public FooController(
-			Decoder decoder, Encoder encoder, Client client, Contract contract) {
+	public FooController(Decoder decoder, Encoder encoder, Client client, Contract contract) {
 		this.fooClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
-                .contract(contract)
+				.contract(contract)
 				.requestInterceptor(new BasicAuthRequestInterceptor("user", "user"))
 				.target(FooClient.class, "http://PROD-SVC");
+
 		this.adminClient = Feign.builder().client(client)
 				.encoder(encoder)
 				.decoder(decoder)
@@ -425,12 +425,37 @@ 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]
 ----
-        OtherClass.someMethod(myprop.get());
-    }
+// Params.java
+public class Params {
+    private String param1;
+    private String param2;
+
+    // [Getters and setters omitted for brevity]
 }
-stripped). The proxy uses Ribbon to locate an instance to forward to
-via discovery, and all requests are executed in a
-<<hystrix-fallbacks-for-routes, hystrix command>>, so
-failures will show up in Hystrix metrics, and once the circuit is open
-the proxy will not try to contact the service.
+----
+
+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.0.0.RC2</version>
+	<version>2.1.0.RC1</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.0.1.RELEASE</version>
+		<version>2.1.0.RC2</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.0.0.RC2</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.0.0.RC2</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.1.0.RC1</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.1.0.RC1</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.0.0.RC2</version>
+		<version>2.1.0.RC1</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
@@ -93,6 +93,10 @@
 			<artifactId>feign-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign.form</groupId>
+			<artifactId>feign-form-spring</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-slf4j</artifactId>
@@ -163,6 +167,16 @@
 			<artifactId>okhttp</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -202,8 +202,8 @@ public class FeignAutoConfiguration {

 		@Bean
 		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient() {
-			return new OkHttpClient(this.okHttpClient);
+		public Client feignClient(okhttp3.OkHttpClient client) {
+			return new OkHttpClient(client);
 		}
 	}

@@ -0,0 +1,93 @@
+/*
+ * 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 org.springframework.context.ApplicationContext;
+
+/**
+ * A builder for creating Feign clients without using the {@link FeignClient} annotation.
+ * <p>
+ * This builder builds the Feign client exactly like it would be created by using the
+ * {@link FeignClient} annotation.
+ *
+ * @author Sven Döring
+ */
+public class FeignClientBuilder {
+
+	private final ApplicationContext applicationContext;
+
+	public FeignClientBuilder(final ApplicationContext applicationContext) {
+		this.applicationContext = applicationContext;
+	}
+
+	public <T> Builder<T> forType(final Class<T> type, final String name) {
+		return new Builder<>(applicationContext, type, name);
+	}
+
+	public static class Builder<T> {
+
+		private FeignClientFactoryBean feignClientFactoryBean;
+
+		private Builder(final ApplicationContext applicationContext, final Class<T> type,
+				final String name) {
+			this.feignClientFactoryBean = new FeignClientFactoryBean();
+
+			this.feignClientFactoryBean.setApplicationContext(applicationContext);
+			this.feignClientFactoryBean.setType(type);
+			this.feignClientFactoryBean.setName(FeignClientsRegistrar.getName(name));
+			// preset default values - these values resemble the default values on the
+			// FeignClient annotation
+			this.url("").path("").decode404(false).fallback(void.class)
+					.fallbackFactory(void.class);
+		}
+
+		public Builder url(final String url) {
+			this.feignClientFactoryBean.setUrl(FeignClientsRegistrar.getUrl(url));
+			return this;
+		}
+
+		public Builder path(final String path) {
+			this.feignClientFactoryBean.setPath(FeignClientsRegistrar.getPath(path));
+			return this;
+		}
+
+		public Builder decode404(final boolean decode404) {
+			this.feignClientFactoryBean.setDecode404(decode404);
+			return this;
+		}
+
+		public Builder fallback(final Class<T> fallback) {
+			FeignClientsRegistrar.validateFallback(fallback);
+			this.feignClientFactoryBean.setFallback(fallback);
+			return this;
+		}
+
+		public Builder fallbackFactory(final Class<T> fallbackFactory) {
+			FeignClientsRegistrar.validateFallbackFactory(fallbackFactory);
+			this.feignClientFactoryBean.setFallbackFactory(fallbackFactory);
+			return this;
+		}
+
+		/**
+		 * @param <T> the target type of the Feign client to be created
+		 * @return the created Feign client
+		 */
+		public <T> T build() {
+			return this.feignClientFactoryBean.getTarget();
+		}
+	}
+}
@@ -229,6 +229,14 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,

 	@Override
 	public Object getObject() throws Exception {
+		return getTarget();
+	}
+
+	/**
+	 * @param <T> the target type of the Feign client
+	 * @return a {@link Feign} client created with the specified data and the context information
+	 */
+	<T> T getTarget() {
 		FeignContext context = applicationContext.getBean(FeignContext.class);
 		Feign.Builder builder = feign(context);

@@ -241,7 +249,7 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 				url = this.name;
 			}
 			url += cleanPath();
-			return loadBalance(builder, context, new HardCodedTarget<>(this.type,
+			return (T) loadBalance(builder, context, new HardCodedTarget<>(this.type,
 					this.name, url));
 		}
 		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
@@ -251,14 +259,14 @@ class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
 			if (client instanceof LoadBalancerFeignClient) {
-				// not lod balancing because we have a url,
+				// not load balancing because we have a url,
 				// but ribbon is on the classpath, so unwrap
 				client = ((LoadBalancerFeignClient)client).getDelegate();
 			}
 			builder.client(client);
 		}
 		Targeter targeter = get(context, Targeter.class);
-		return targeter.target(this, builder, context, new HardCodedTarget<>(
+		return (T) targeter.target(this, builder, context, new HardCodedTarget<>(
 				this.type, this.name, url));
 	}

@@ -198,12 +198,19 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 		AnnotationAttributes annotation = AnnotationAttributes.fromMap(attributes);
 		// This blows up if an aliased property is overspecified
 		// FIXME annotation.getAliasedString("name", FeignClient.class, null);
+		validateFallback(annotation.getClass("fallback"));
+		validateFallbackFactory(annotation.getClass("fallbackFactory"));
+	}
+
+	static void validateFallback(final Class clazz) {
 		Assert.isTrue(
-			!annotation.getClass("fallback").isInterface(),
+			!clazz.isInterface(),
 			"Fallback class must implement the interface annotated by @FeignClient"
 		);
-		Assert.isTrue(
-			!annotation.getClass("fallbackFactory").isInterface(),
+	}
+
+	static void validateFallbackFactory(final Class clazz) {
+		Assert.isTrue(!clazz.isInterface(),
 			"Fallback factory must produce instances of fallback classes that implement the interface annotated by @FeignClient"
 		);
 	}
@@ -217,6 +224,10 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 			name = (String) attributes.get("value");
 		}
 		name = resolve(name);
+		return getName(name);
+	}
+
+	static String getName(String name) {
 		if (!StringUtils.hasText(name)) {
 			return "";
 		}
@@ -247,6 +258,10 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,

 	private String getUrl(Map<String, Object> attributes) {
 		String url = resolve((String) attributes.get("url"));
+		return getUrl(url);
+	}
+
+	static String getUrl(String url) {
 		if (StringUtils.hasText(url) && !(url.startsWith("#{") && url.contains("}"))) {
 			if (!url.contains("://")) {
 				url = "http://" + url;
@@ -263,6 +278,10 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,

 	private String getPath(Map<String, Object> attributes) {
 		String path = resolve((String) attributes.get("path"));
+		return getPath(path);
+	}
+
+	static String getPath(String path) {
 		if (StringUtils.hasText(path)) {
 			path = path.trim();
 			if (!path.startsWith("/")) {
@@ -62,19 +62,6 @@ class HystrixTargeter implements Targeter {
 											Class<?> fallbackFactoryClass) {
 		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>)
 			getFromContext("fallbackFactory", feignClientName, context, fallbackFactoryClass, FallbackFactory.class);
-		/* We take a sample fallback from the fallback factory to check if it returns a fallback
-		that is compatible with the annotated feign interface. */
-		Object exampleFallback = fallbackFactory.create(new RuntimeException());
-		Assert.notNull(exampleFallback,
-			String.format(
-			"Incompatible fallbackFactory instance for feign client %s. Factory may not produce null!",
-				feignClientName));
-		if (!target.type().isAssignableFrom(exampleFallback.getClass())) {
-			throw new IllegalStateException(
-				String.format(
-					"Incompatible fallbackFactory instance for feign client %s. Factory produces instances of '%s', but should produce instances of '%s'",
-					feignClientName, exampleFallback.getClass(), target.type()));
-		}
 		return builder.target(target, fallbackFactory);
 	}

@@ -0,0 +1,53 @@
+/*
+ * 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;
+}
@@ -0,0 +1,51 @@
+/*
+ * 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;
+	}
+}
@@ -79,9 +79,8 @@ public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor
 			final long length = Long.parseLong(strLen);
 			return length > getProperties().getMinRequestSize();
 		} catch (NumberFormatException ex) {
-			// ignores the exception
+			return false;
 		}
-		return false;
 	}

 	/**
@@ -36,8 +36,8 @@ import com.netflix.loadbalancer.ILoadBalancer;
 */
 public class CachingSpringLoadBalancerFactory {

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

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

@@ -118,7 +118,7 @@ public class FeignLoadBalancer extends
 		private final Request request;
 		private final Client client;

-		RibbonRequest(Client client, Request request, URI uri) {
+		protected RibbonRequest(Client client, Request request, URI uri) {
 			this.client = client;
 			setUri(uri);
 			this.request = toRequest(request);
@@ -170,6 +170,13 @@ public class FeignLoadBalancer extends
 			};
 		}

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

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

-		RibbonResponse(URI uri, Response response) {
+		protected RibbonResponse(URI uri, Response response) {
 			this.uri = uri;
 			this.response = response;
 		}
@@ -54,6 +54,7 @@ public class FeignRibbonClientAutoConfiguration {

 	@Bean
 	@Primary
+	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
 	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
 			SpringClientFactory factory) {
@@ -62,6 +63,7 @@ public class FeignRibbonClientAutoConfiguration {

 	@Bean
 	@Primary
+	@ConditionalOnMissingBean
 	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
 	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
 		SpringClientFactory factory,
@@ -97,7 +97,13 @@ public class LoadBalancerFeignClient implements Client {
 	}

 	static URI cleanUrl(String originalUrl, String host) {
-		return URI.create(originalUrl.replaceFirst(host, ""));
+		String newUrl = originalUrl.replaceFirst(host, "");
+		StringBuffer buffer = new StringBuffer(newUrl);
+		if((newUrl.startsWith("https://") && newUrl.length() == 8) ||
+				(newUrl.startsWith("http://") && newUrl.length() == 7)) {
+			buffer.append("/");
+		}
+		return URI.create(buffer.toString());
 	}

 	private FeignLoadBalancer lbClient(String clientName) {
@@ -24,6 +24,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Objects;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,10 +36,12 @@ import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 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;
@@ -51,6 +54,8 @@ public class SpringEncoder implements Encoder {

 	private static final Log log = LogFactory.getLog(SpringEncoder.class);

+	private final SpringFormEncoder springFormEncoder = new SpringFormEncoder();
+
 	private ObjectFactory<HttpMessageConverters> messageConverters;

 	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
@@ -71,6 +76,18 @@ public class SpringEncoder implements Encoder {
 				requestContentType = MediaType.valueOf(type);
 			}

+			if (bodyType != null && bodyType.equals(MultipartFile.class)) {
+				if (Objects.equals(requestContentType, MediaType.MULTIPART_FORM_DATA)) {
+					springFormEncoder.encode(requestBody, bodyType, request);
+					return;
+				} else {
+					String message = "Content-Type \"" + MediaType.MULTIPART_FORM_DATA +
+									 "\" not set for request body of type " +
+									 requestBody.getClass().getSimpleName();
+					throw new EncodeException(message);
+				}
+			}
+
 			for (HttpMessageConverter<?> messageConverter : this.messageConverters
 					.getObject().getConverters()) {
 				if (messageConverter.canWrite(requestType, requestContentType)) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ 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;
@@ -30,14 +31,17 @@ import java.util.Map;

 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,6 +62,8 @@ import feign.Param;
 /**
 * @author Spencer Gibb
 * @author Abhijit Sarkar
+ * @author Halvdan Hoem Grelland
+ * @author Aram Peres
 */
 public class SpringMvcContract extends Contract.BaseContract
 		implements ResourceLoaderAware {
@@ -66,13 +72,18 @@ 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 Param.Expander expander;
+	private final ConvertingExpanderFactory convertingExpanderFactory;
 	private ResourceLoader resourceLoader = new DefaultResourceLoader();

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

 	@Override
@@ -239,14 +250,40 @@ public class SpringMvcContract extends Contract.BaseContract
 						processParameterAnnotation, method);
 			}
 		}
-		if (isHttpAnnotation && data.indexToExpander().get(paramIndex) == null
-				&& this.conversionService.canConvert(
-						method.getParameterTypes()[paramIndex], String.class)) {
-			data.indexToExpander().put(paramIndex, this.expander);
+
+		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);
+				}
+			}
 		}
 		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();
@@ -297,6 +334,7 @@ public class SpringMvcContract extends Contract.BaseContract
 		annotatedArgumentResolvers.add(new PathVariableParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestParamParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
+		annotatedArgumentResolvers.add(new QueryMapParameterProcessor());

 		return annotatedArgumentResolvers;
 	}
@@ -361,6 +399,10 @@ public class SpringMvcContract extends Contract.BaseContract
 		}
 	}

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

 		private final ConversionService conversionService;
@@ -375,4 +417,21 @@ 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;
+			};
+		}
+	}
 }
@@ -0,0 +1,33 @@
+{"groups": [
+], "properties": [
+	{
+	    "name": "feign.hystrix.enabled",
+	    "type": "java.lang.Boolean",
+	    "description": "If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker.",
+	    "defaultValue": "false"
+	},
+	{
+		"name": "feign.httpclient.enabled",
+		"type": "java.lang.Boolean",
+		"description": "Enables the use of the Apache HTTP Client by Feign.",
+		"defaultValue": "true"
+	},
+	{
+		"name": "feign.okhttp.enabled",
+		"type": "java.lang.Boolean",
+		"description": "Enables the use of the OK HTTP Client by Feign.",
+		"defaultValue": "false"
+	},
+	{
+		"name": "feign.compression.response.enabled",
+		"type": "java.lang.Boolean",
+		"description": "Enables the response from Feign to be compressed.",
+		"defaultValue": "false"
+	},
+	{
+		"name": "feign.compression.request.enabled",
+		"type": "java.lang.Boolean",
+		"description": "Enables the request sent by Feign to be compressed.",
+		"defaultValue": "false"
+	}
+]}
@@ -0,0 +1,158 @@
+/*
+ * 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 java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.file.ClosedFileSystemException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+import org.springframework.cloud.openfeign.testclients.TestClient;
+import org.springframework.context.ApplicationContext;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * @author Sven Döring
+ */
+public class FeignClientBuilderTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	private FeignClientBuilder feignClientBuilder;
+
+	private ApplicationContext applicationContext;
+
+	private static Object getDefaultValueFromFeignClientAnnotation(
+			final String methodName) {
+		final Method method = ReflectionUtils.findMethod(FeignClient.class, methodName);
+		return method.getDefaultValue();
+	}
+
+	private static void assertFactoryBeanField(final FeignClientBuilder.Builder builder,
+			final String fieldName, final Object expectedValue) {
+		final Field factoryBeanField = ReflectionUtils
+				.findField(FeignClientBuilder.Builder.class, "feignClientFactoryBean");
+		ReflectionUtils.makeAccessible(factoryBeanField);
+		final FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) ReflectionUtils
+				.getField(factoryBeanField, builder);
+
+		final Field field = ReflectionUtils.findField(FeignClientFactoryBean.class,
+				fieldName);
+		ReflectionUtils.makeAccessible(field);
+		final Object value = ReflectionUtils.getField(field, factoryBean);
+		Assert.assertEquals("Expected value for the field '" + fieldName + "':",
+				expectedValue, value);
+	}
+
+	@Before
+	public void setUp() {
+		this.applicationContext = Mockito.mock(ApplicationContext.class);
+		this.feignClientBuilder = new FeignClientBuilder(applicationContext);
+	}
+
+	@Test
+	public void safetyCheckForNewFieldsOnTheFeignClientAnnotation() {
+		final List<String> methodNames = new ArrayList();
+		for (final Method method : FeignClient.class.getMethods()) {
+			methodNames.add(method.getName());
+		}
+		methodNames.removeAll(
+				Arrays.asList("annotationType", "value", "serviceId", "qualifier",
+						"configuration", "primary", "equals", "hashCode", "toString"));
+		Collections.sort(methodNames);
+		// If this safety check fails the Builder has to be updated.
+		// (1) Either a field was removed from the FeignClient annotation and so it has to
+		// be removed
+		// on this builder class.
+		// (2) Or a new field was added and the builder class has to be extended with this
+		// new field.
+		Assert.assertThat(methodNames, Matchers.contains("decode404", "fallback",
+				"fallbackFactory", "name", "path", "url"));
+	}
+
+	@Test
+	public void forType_preinitializedBuilder() {
+		// when:
+		final FeignClientBuilder.Builder builder = feignClientBuilder
+				.forType(FeignClientBuilderTests.class, "TestClient");
+
+		// then:
+		assertFactoryBeanField(builder, "applicationContext", applicationContext);
+		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
+		assertFactoryBeanField(builder, "name", "TestClient");
+
+		// and:
+		assertFactoryBeanField(builder, "url",
+				getDefaultValueFromFeignClientAnnotation("url"));
+		assertFactoryBeanField(builder, "path",
+				getDefaultValueFromFeignClientAnnotation("path"));
+		assertFactoryBeanField(builder, "decode404",
+				getDefaultValueFromFeignClientAnnotation("decode404"));
+		assertFactoryBeanField(builder, "fallback",
+				getDefaultValueFromFeignClientAnnotation("fallback"));
+		assertFactoryBeanField(builder, "fallbackFactory",
+				getDefaultValueFromFeignClientAnnotation("fallbackFactory"));
+	}
+
+	@Test
+	public void forType_allFieldsSetOnBuilder() {
+		// when:
+		final FeignClientBuilder.Builder builder = feignClientBuilder
+				.forType(FeignClientBuilderTests.class, "TestClient").decode404(true)
+				.fallback(Object.class).fallbackFactory(Object.class).path("Path/")
+				.url("Url/");
+
+		// then:
+		assertFactoryBeanField(builder, "applicationContext", applicationContext);
+		assertFactoryBeanField(builder, "type", FeignClientBuilderTests.class);
+		assertFactoryBeanField(builder, "name", "TestClient");
+
+		// and:
+		assertFactoryBeanField(builder, "url", "http://Url/");
+		assertFactoryBeanField(builder, "path", "/Path");
+		assertFactoryBeanField(builder, "decode404", true);
+		assertFactoryBeanField(builder, "fallback", Object.class);
+		assertFactoryBeanField(builder, "fallbackFactory", Object.class);
+	}
+
+	@Test
+	public void forType_build() {
+		// given:
+		Mockito.when(applicationContext.getBean(FeignContext.class))
+				.thenThrow(new ClosedFileSystemException()); // throw an unusual exception
+																// in the
+																// FeignClientFactoryBean
+		final FeignClientBuilder.Builder builder = feignClientBuilder
+				.forType(TestClient.class, "TestClient");
+
+		// expect: 'the build will fail right after calling build() with the mocked
+		// unusual exception'
+		thrown.expect(Matchers.isA(ClosedFileSystemException.class));
+		builder.build();
+	}
+}
@@ -30,8 +30,10 @@ 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;
@@ -144,6 +146,7 @@ public class FeignClientUsingPropertiesTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@RestController
+	@Import(NoSecurityConfiguration.class)
 	protected static class Application {

 		@RequestMapping(method = RequestMethod.GET, value = "/foo")
@@ -28,6 +28,7 @@ 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;
@@ -49,8 +50,11 @@ public class FeignHttpClientConfigurationTests {

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

 	@After
@@ -34,8 +34,10 @@ 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;
@@ -103,6 +105,7 @@ 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,6 +25,7 @@ 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;
@@ -45,7 +46,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(false)
+				"feign.okhttp.enabled=true", "feign.httpclient.enabled=false").web(WebApplicationType.NONE)
 				.sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run();
 	}

@@ -28,7 +28,9 @@ 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;
@@ -201,6 +203,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean {
 	@Configuration
 	@EnableAutoConfiguration
 	@RestController
+	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements TestClient {

 		@Override
@@ -22,6 +22,7 @@ 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;
@@ -51,7 +52,7 @@ public class SpringRetryDisabledTests {

 	@Before
 	public void setUp() {
-		context = new SpringApplicationBuilder().web(false)
+		context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
 				.sources(RibbonAutoConfiguration.class, LoadBalancerAutoConfiguration.class, RibbonClientConfiguration.class,
 						FeignRibbonClientAutoConfiguration.class).run();
 	}
@@ -31,8 +31,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClientBuilder;
 import org.springframework.context.ApplicationContext;
+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;
@@ -66,12 +69,24 @@ public class FeignClientTests {
 	@Autowired
 	private org.springframework.cloud.openfeign.beans.extra.TestClient extraClient;

+	@Qualifier("build-by-builder")
+	@Autowired
+	private TestClient buildByBuilder;
+
 	@Configuration
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients
+	@Import(FeignClientBuilder.class)
 	protected static class Application {

+		@Bean("build-by-builder")
+		public TestClient buildByBuilder(final FeignClientBuilder feignClientBuilder) {
+			return feignClientBuilder
+					.forType(TestClient.class, "builderapp")
+					.build();
+		}
+
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		public Hello getHello() {
 			return new Hello("hello world 1");
@@ -112,7 +127,7 @@ public class FeignClientTests {
 	}

 	@Test
-	public void testAnnnotations() throws Exception {
+	public void testAnnotations() {
 		Map<String, Object> beans = this.context
 				.getBeansWithAnnotation(FeignClient.class);
 		assertTrue("Wrong clients: " + beans,
@@ -122,13 +137,31 @@ public class FeignClientTests {
 	@Test
 	public void testClient() {
 		assertNotNull("testClient was null", this.testClient);
-		assertNotNull("testClient was null", this.extraClient);
+		assertNotNull("extraClient was null", this.extraClient);
 		assertTrue("testClient is not a java Proxy",
 				Proxy.isProxyClass(this.testClient.getClass()));
 		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.testClient);
 		assertNotNull("invocationHandler was null", invocationHandler);
 	}

+	@Test
+	public void extraClient() {
+		assertNotNull("extraClient was null", this.extraClient);
+		assertTrue("extraClient is not a java Proxy",
+				Proxy.isProxyClass(this.extraClient.getClass()));
+		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.extraClient);
+		assertNotNull("invocationHandler was null", invocationHandler);
+	}
+
+	@Test
+	public void buildByBuilder() {
+		assertNotNull("buildByBuilder was null", this.buildByBuilder);
+		assertTrue("buildByBuilder is not a java Proxy",
+				Proxy.isProxyClass(this.buildByBuilder.getClass()));
+		InvocationHandler invocationHandler = Proxy.getInvocationHandler(this.buildByBuilder);
+		assertNotNull("invocationHandler was null", invocationHandler);
+	}
+
 	@Configuration
 	public static class TestDefaultFeignConfig {
 	}
@@ -18,9 +18,11 @@ package org.springframework.cloud.openfeign.beans;

 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.beans.FeignClientTests.Hello;
+import org.springframework.context.annotation.Primary;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

+@Primary
@FeignClient(value = "localapp")
 public interface TestClient {
 	@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -35,8 +35,10 @@ 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;
@@ -76,6 +78,7 @@ 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,8 +33,10 @@ 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;
@@ -79,6 +81,7 @@ 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 {
 	}

@@ -16,17 +16,45 @@

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

-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 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
-@SpringBootApplication
+@EnableAutoConfiguration
@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();
+	}
+
 }
@@ -16,25 +16,36 @@

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

-import java.util.Base64;
-import org.junit.Assert;
+import com.netflix.hystrix.strategy.HystrixPlugins;
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 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.cloud.openfeign.valid.FeignClientTests;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 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 java.util.Base64;

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

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

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

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

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

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

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

-		Assert.assertTrue("Custom hook should have been called.",
-				customConcurrenyStrategy.isHookCalled());
+		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();
 	}

 	public static HttpHeaders createBasicAuthHeader(final String username,
@@ -97,4 +109,21 @@ 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,10 +1,9 @@
 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;

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

@@ -28,7 +28,6 @@ import org.springframework.stereotype.Component;
 * 
 * @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")
-	public String getUsername();
+	String getUsername();
 }
@@ -240,44 +240,4 @@ public class FeignClientValidationTests {
 		}

 	}
-
-	@Test
-	public void testWrongFallbackFactoryGenericType() {
-		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-			WrongFallbackFactoryGenericTypeConfiguration.class)) {
-			this.expected.expectMessage("Incompatible fallbackFactory instance");
-			assertNotNull(context.getBean(WrongFallbackFactoryGenericTypeConfiguration.Client.class));
-		}
-	}
-
-	@Configuration
-	@Import(FeignAutoConfiguration.class)
-	@EnableFeignClients(clients = WrongFallbackFactoryGenericTypeConfiguration.Client.class)
-	protected static class WrongFallbackFactoryGenericTypeConfiguration {
-
-		@FeignClient(name = "foobar", url = "http://localhost", fallbackFactory = ClientFallback.class)
-		interface Client {
-			@RequestMapping(method = RequestMethod.GET, value = "/")
-			String get();
-		}
-
-		@Bean
-		ClientFallback dummy() {
-			return new ClientFallback();
-		}
-
-		class ClientFallback implements FallbackFactory<String> {
-
-			@Override
-			public String create(Throwable cause) {
-				return "tryinToTrickYa";
-			}
-		}
-
-		@Bean
-		public Feign.Builder feignBuilder() {
-			return HystrixFeign.builder();
-		}
-
-	}
 }
@@ -23,6 +23,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

+import com.netflix.loadbalancer.BaseLoadBalancer;
+import com.netflix.loadbalancer.RoundRobinRule;
+import com.netflix.loadbalancer.reactive.LoadBalancerCommand;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -168,4 +171,34 @@ 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").request();
+		RibbonResponse resp = this.feignLoadBalancer.executeWithLoadBalancer(new RibbonRequest(this.delegate, request,
+				new URI(request.url())), null);
+		assertThat(resp.getRequestedURI().getPort(), is(7777));
+		request = new RequestTemplate().method("GET").header("c_ip", "666").request();
+		resp = this.feignLoadBalancer.executeWithLoadBalancer(new RibbonRequest(this.delegate, request,
+				new URI(request.url())), null);
+		assertThat(resp.getRequestedURI().getPort(), is(6666));
+	}
+
 }
@@ -26,12 +26,15 @@ 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.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;
@@ -84,16 +87,16 @@ public class FeignRibbonClientPathTests {
 	@FeignClient(name = "localapp", path = "/base/path")
 	protected interface TestClient1 extends TestClient { }

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

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

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

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

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -31,8 +31,10 @@ 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;
@@ -78,6 +80,7 @@ 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);
@@ -37,7 +37,9 @@ import org.springframework.cloud.netflix.ribbon.SpringClientFactory;

 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;

 /**
 * @author Dave Syer
@@ -87,14 +89,24 @@ public class FeignRibbonClientTests {
 		when(stats.getSingleServerStat(any(Server.class))).thenReturn(mock(ServerStats.class));
 	}

+	@Test
+	public void remoteRequestIsSentAtRoot() throws Exception {
+		Request request = new RequestTemplate().method("GET").append("http://foo")
+				.request();
+		this.client.execute(request, new Options());
+		RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/");
+		verify(this.delegate).execute(argThat(matcher),
+				any(Options.class));
+	}
+
 	@Test
 	public void remoteRequestIsSent() throws Exception {
 		Request request = new RequestTemplate().method("GET").append("http://foo/")
 				.request();
 		this.client.execute(request, new Options());
 		RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/");
-		/*FIXME verify(this.delegate).execute(argThat(matcher),
-				any(Options.class));*/
+		verify(this.delegate).execute(argThat(matcher),
+				any(Options.class));
 	}

 	@Test
@@ -103,8 +115,8 @@ public class FeignRibbonClientTests {
 				.request();
 		this.client.execute(request, new Options());
 		RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/");
-		/*FIXME verify(this.delegate).execute(argThat(matcher),
-				any(Options.class));*/
+		verify(this.delegate).execute(argThat(matcher),
+				any(Options.class));
 	}

 	private final static class RequestMatcher extends CustomMatcher<Request> {
@@ -14,7 +14,7 @@
 * limitations under the License.
 *
 */
-package org.springframework.cloud.netflix.feign.ribbon;
+package org.springframework.cloud.openfeign.ribbon;

 import java.lang.reflect.Field;
 import javax.net.ssl.SSLContextSpi;
@@ -14,7 +14,7 @@
 * limitations under the License.
 *
 */
-package org.springframework.cloud.netflix.feign.ribbon;
+package org.springframework.cloud.openfeign.ribbon;

 import okhttp3.OkHttpClient;

@@ -23,6 +23,7 @@ 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;
@@ -32,7 +33,6 @@ 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() {
-		addEnvironment(this.context, "feign.httpclient.maxConnections=2",
+		TestPropertyValues.of("feign.httpclient.maxConnections=2",
 				"feign.httpclient.connectionTimeout=2",
 				"feign.httpclient.maxConnectionsPerRoute=2",
 				"feign.httpclient.timeToLive=2",
 				"feign.httpclient.disableSslValidation=true",
-				"feign.httpclient.followRedirects=false");
+				"feign.httpclient.followRedirects=false").applyTo(this.context);
 		setupContext();
 		assertEquals(2, getProperties().getMaxConnections());
 		assertEquals(2, getProperties().getConnectionTimeout());
@@ -40,9 +40,11 @@ import org.springframework.http.converter.AbstractGenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.annotation.DirtiesContext;
 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.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -50,6 +52,7 @@ import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;

 import feign.RequestTemplate;
+import feign.codec.EncodeException;

 /**
 * @author Spencer Gibb
@@ -96,6 +99,31 @@ public class SpringEncoderTests {

 		assertThat("request charset is not null", request.charset(), is(nullValue()));
 	}
+
+	@Test(expected = EncodeException.class)
+	public void testMultipartFile1() {
+		SpringEncoder encoder = this.context.getInstance("foo", SpringEncoder.class);
+		assertThat(encoder, is(notNullValue()));
+		RequestTemplate request = new RequestTemplate();
+
+		MultipartFile multipartFile = new MockMultipartFile("test_multipart_file", "hi".getBytes());
+		encoder.encode(multipartFile, MultipartFile.class, request);
+
+		assertThat("request charset is not null", request.charset(), is(nullValue()));
+	}
+
+	@Test
+	public void testMultipartFile2() {
+		SpringEncoder encoder = this.context.getInstance("foo", SpringEncoder.class);
+		assertThat(encoder, is(notNullValue()));
+		RequestTemplate request = new RequestTemplate();
+		request = request.header("Content-Type", MediaType.MULTIPART_FORM_DATA_VALUE);
+
+		MultipartFile multipartFile = new MockMultipartFile("test_multipart_file", "hi".getBytes());
+		encoder.encode(multipartFile, MultipartFile.class, request);
+
+		assertThat("request charset is not null", request.charset(), is(nullValue()));
+	}
 	
 	class MediaTypeMatcher implements ArgumentMatcher<MediaType> {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,12 +18,25 @@ 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 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;
@@ -48,6 +61,8 @@ import feign.MethodMetadata;

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

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

 	@Test
@@ -255,6 +275,47 @@ 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");
@@ -429,6 +490,20 @@ public class SpringMvcContractTests {
 		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", 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(expected = IllegalStateException.class)
 	public void testProcessQueryMapMoreThanOnce() throws Exception {
 		Method method = TestTemplate_QueryMap.class.getDeclaredMethod(
@@ -514,6 +589,11 @@ 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
@@ -539,6 +619,24 @@ 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 {

@@ -0,0 +1,33 @@
+/*
+ * 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,6 +20,7 @@ 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;
@@ -47,10 +48,13 @@ 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;
@@ -66,6 +70,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.netflix.hystrix.HystrixCommand;
 import com.netflix.hystrix.HystrixCommandGroupKey;
 import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.exception.HystrixRuntimeException;
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;

@@ -93,6 +98,7 @@ 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 = {
@@ -129,6 +135,12 @@ public class FeignClientTests {
 	@Autowired
 	private HystrixClientWithFallBackFactory hystrixClientWithFallBackFactory;

+	@Autowired
+	private InvalidTypeHystrixClientWithFallBackFactory invalidTypeHystrixClientWithFallBackFactory;
+
+	@Autowired
+	private NullHystrixClientWithFallBackFactory nullHystrixClientWithFallBackFactory;
+
 	@Autowired
 	@Qualifier("localapp3FeignClient")
 	HystrixClient namedHystrixClient;
@@ -187,6 +199,11 @@ 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();

@@ -275,6 +292,20 @@ public class FeignClientTests {
 		Hello fail();
 	}

+	@FeignClient(name = "localapp6", fallbackFactory = InvalidTypeHystrixClientFallbackFactory.class)
+	protected interface InvalidTypeHystrixClientWithFallBackFactory {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Hello fail();
+	}
+
+	@FeignClient(name = "localapp7", fallbackFactory = NullHystrixClientFallbackFactory.class)
+	protected interface NullHystrixClientWithFallBackFactory {
+
+		@RequestMapping(method = RequestMethod.GET, path = "/fail")
+		Hello fail();
+	}
+
 	static class HystrixClientFallbackFactory implements FallbackFactory<HystrixClientWithFallBackFactory> {

 		@Override
@@ -289,6 +320,22 @@ public class FeignClientTests {
 		}
 	}

+	static class InvalidTypeHystrixClientFallbackFactory implements FallbackFactory<String> {
+
+		@Override
+		public String create(final Throwable cause) {
+			return "hello";
+		}
+	}
+
+	static class NullHystrixClientFallbackFactory implements FallbackFactory<String> {
+
+		@Override
+		public String create(final Throwable cause) {
+			return null;
+		}
+	}
+
 	static class HystrixClientFallback implements HystrixClient {
 		@Override
 		public Hello fail() {
@@ -348,7 +395,8 @@ public class FeignClientTests {
 	@RestController
 	@EnableFeignClients(clients = { TestClientServiceId.class, TestClient.class,
 		DecodingTestClient.class, HystrixClient.class, HystrixClientWithFallBackFactory.class,
-		HystrixSetterFactoryClient.class},
+		HystrixSetterFactoryClient.class, InvalidTypeHystrixClientWithFallBackFactory.class,
+	NullHystrixClientWithFallBackFactory.class},
 		defaultConfiguration = TestDefaultFeignConfig.class)
 	@RibbonClients({
 		@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class),
@@ -356,8 +404,11 @@ public class FeignClientTests {
 		@RibbonClient(name = "localapp2", configuration = LocalRibbonClientConfiguration.class),
 		@RibbonClient(name = "localapp3", configuration = LocalRibbonClientConfiguration.class),
 		@RibbonClient(name = "localapp4", configuration = LocalRibbonClientConfiguration.class),
-		@RibbonClient(name = "localapp5", configuration = LocalRibbonClientConfiguration.class)
+		@RibbonClient(name = "localapp5", configuration = LocalRibbonClientConfiguration.class),
+			@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
@@ -371,6 +422,16 @@ public class FeignClientTests {
 			return new HystrixClientFallbackFactory();
 		}

+		@Bean
+		public InvalidTypeHystrixClientFallbackFactory invalidTypeHystrixClientFallbackFactory() {
+			return new InvalidTypeHystrixClientFallbackFactory();
+		}
+
+		@Bean
+		public NullHystrixClientFallbackFactory nullHystrixClientFallbackFactory() {
+			return new NullHystrixClientFallbackFactory();
+		}
+
 		@Bean
 		FeignFormatterRegistrar feignFormatterRegistrar() {
 			return new FeignFormatterRegistrar() {
@@ -441,6 +502,13 @@ 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();
@@ -583,6 +651,15 @@ 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();
@@ -722,6 +799,16 @@ public class FeignClientTests {
 			hello.getMessage().contains("500"));
 	}

+	@Test(expected = HystrixRuntimeException.class)
+	public void testInvalidTypeHystrixFallbackFactory() throws Exception {
+		invalidTypeHystrixClientWithFallBackFactory.fail();
+	}
+
+	@Test(expected = HystrixRuntimeException.class)
+	public void testNullHystrixFallbackFactory() throws Exception {
+		nullHystrixClientWithFallBackFactory.fail();
+	}
+
 	@Test
 	public void namedFeignClientWorks() {
 		assertNotNull("namedHystrixClient was null", this.namedHystrixClient);
@@ -25,13 +25,16 @@ 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;
@@ -95,7 +98,7 @@ public class FeignHttpClientTests {
 		User getUser(@PathVariable("id") long id);
 	}

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

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

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -24,13 +24,16 @@ 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;
@@ -96,7 +99,7 @@ public class FeignOkHttpTests {
 		User getUser(@PathVariable("id") long id);
 	}

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

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

 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
@@ -24,11 +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.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;
@@ -66,6 +68,7 @@ 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() {
@@ -23,12 +23,15 @@ 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.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;
@@ -65,7 +68,7 @@ public class FeignClientScanningTests {
 	@SuppressWarnings("unused")
 	private Client feignClient;

-	@FeignClient("localapp")
+	@FeignClient("localapp123")
 	protected interface TestClient {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		String getHello();
@@ -81,7 +84,8 @@ public class FeignClientScanningTests {
 	@EnableAutoConfiguration
 	@RestController
 	@EnableFeignClients // NO clients attribute. That's what this class is testing!
-	@RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class)
+	@RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class)
+	@Import(NoSecurityConfiguration.class)
 	protected static class Application {
 		@RequestMapping(method = RequestMethod.GET, value = "/hello")
 		public String getHello() {
@@ -5,16 +5,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.1.RELEASE</version>
-		<relativePath/>
+		<version>2.1.0.RC2</version>		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.0.0.RC2</version>
+	<version>2.1.0.RC1</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
-		<feign.version>9.5.1</feign.version>
+		<feign.version>9.7.0</feign.version>
+		<feign-form.version>3.3.0</feign-form.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -33,6 +33,11 @@
 				<artifactId>feign-core</artifactId>
 				<version>${feign.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.github.openfeign.form</groupId>
+				<artifactId>feign-form-spring</artifactId>
+				<version>${feign-form.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>io.github.openfeign</groupId>
 				<artifactId>feign-slf4j</artifactId>
@@ -73,11 +78,6 @@
 				<artifactId>feign-jackson</artifactId>
 				<version>${feign.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>io.github.openfeign</groupId>
-				<artifactId>feign-java8</artifactId>
-				<version>${feign.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>io.github.openfeign</groupId>
 				<artifactId>feign-jaxb</artifactId>
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.0.0.RC2</version>
+		<version>2.1.0.RC1</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -54,10 +54,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+			<optional>true</optional>
 		</dependency>
 	</dependencies>
 </project>
Author	SHA1	Message	Date
buildmaster	61afb5dcd6	Update SNAPSHOT to 2.1.0.RC1	2018-12-11 16:37:40 +00:00
Ryan Baxter	20017afdca	Merge remote-tracking branch 'origin/2.0.x'	2018-12-11 10:04:16 -05:00
wzslw	88a6682f46	Update pom.xml (#88 ) Remove duplicate dependency	2018-12-11 10:02:58 -05:00
Ryan Baxter	f267c2255b	Merge remote-tracking branch 'origin/2.0.x'	2018-12-11 09:12:30 -05:00
Ryan Baxter	dd7b869a12	Uncommenting assert	2018-12-10 12:30:03 -05:00
Momo	d46fb3a92e	Add support for feign's QueryMap annotation for Object mapping (#79 ) * Add QueryMapParameterProcessor * Add license to QueryMapParameterProcessor * Use SpringQueryMap instead of QueryMap. Add test. * Add documentation and license to SpringQueryMap * SpringQueryMap docs * Fix typos	2018-12-06 21:26:36 +01:00
buildmaster	cc2fe823c3	Going back to snapshots	2018-11-18 09:42:08 +00:00
buildmaster	f1975e5200	Update SNAPSHOT to 2.1.0.M2	2018-11-18 09:41:37 +00:00
buildmaster	5ddd771ed5	Bumping versions to 2.0.3.BUILD-SNAPSHOT after release	2018-10-23 18:11:07 +00:00
buildmaster	9f9c41ab59	Going back to snapshots	2018-10-23 18:11:06 +00:00
buildmaster	4dd68ca2f2	Update SNAPSHOT to 2.0.2.RELEASE	2018-10-23 18:08:54 +00:00
Ryan Baxter	af094d0bfc	Remove rogue content in docs	2018-10-02 16:41:14 -04:00
Ryan Baxter	e85e74e311	Merge remote-tracking branch 'origin/2.0.x'	2018-10-02 13:08:37 -04:00
Ryan Baxter	77cdd40f7d	Add missing properties to additional-spring-configuration-metadata. Fixes #61	2018-10-02 13:07:19 -04:00
buildmaster	71675455a3	Going back to snapshots	2018-09-21 21:40:58 +00:00
buildmaster	a39e6316b5	Update SNAPSHOT to Greenwich.M1	2018-09-21 21:40:12 +00:00
sdoeringNew	750cb35e6a	Add builder for feign clients. (#56 ) Utilizes the logic from the registrar and the factory bean. The changes to them have been made minimal invasive. Fixes gh-42	2018-09-19 09:37:51 -04:00
Kerwin Bryant	b512c451fd	optimized automatic configuration (#70 )	2018-09-19 09:35:01 -04:00
Ryan Baxter	da6a51778f	Merge branch '2.0.x' of github.com:spring-cloud/spring-cloud-openfeign into 2.0.x	2018-09-12 15:00:42 -04:00
Ryan Baxter	9fc19bb6fe	Updating dependencies. Fixes #68	2018-09-12 14:56:33 -04:00
Kerwin Bryant	3e3e486648	Support to set loadBalancerKey (#50 ) * Support to override CachingSpringLoadBalancerFactory to customize the FeignLoadBalancer instance.	2018-09-12 14:38:15 -04:00
Spencer Gibb	15bda96e91	Merge branch '2.0.x'	2018-09-05 16:09:38 -04:00
Eugene	e0bf63bed1	Added support for MultipartFile (#66 ) Fixes gh-62 ### Notes The solution is based on ``` <dependency> <groupId>io.github.openfeign.form</groupId> <artifactId>feign-form-spring</artifactId> <version>3.3.0</version> </dependency> ``` Class `feign.form.spring.SpringFormEncoder` was added inside `org.springframework.cloud.openfeign.support.SpringEncoder` because it's doesn't has some checks: 1. Check of `bodyType` on null. `org.springframework.cloud.openfeign.support.SpringEncoder#encode` don't handle situation when `bodyType` is null. 2. No check for content type `multipart/form-data` in header. `feign.form.FormEncoder` requires `multipart/form-data` in header for proper processing. All this checks added and tests are passed.	2018-09-05 16:07:56 -04:00
Nicklas Holm	a33fd6d869	Add spring boot configuration processor. Fixes #63 (#64 )	2018-09-05 10:01:53 -04:00
Ryan Baxter	06ccb9d1e5	Remove code which was calling FallbackFactory with RuntimeException. Fixes #41 (#58 )	2018-08-17 10:23:37 -04:00
Halvdan Hoem Grelland	52bea35160	Support Spring formatting annotations for params (#48 ) * Add factory for Param.Expander using ConversionService. Instances use ConversionService and passes annotations (through TypeDescriptor) - ConversionService can now pick up @DateTimeFormat and @NumberFormat and convert the params applying those.	2018-08-15 07:19:24 -04:00
Ryan Baxter	d57cea265e	Fix invalid URI error when Feign request URI does not end in /. See sc-netflix #3136	2018-08-13 14:26:24 -04:00
Spencer Gibb	7148cce790	Upgrades to openfeign 9.7.0 fixes gh-53	2018-08-06 11:52:45 -04:00
Spencer Gibb	88fae41f02	Updates to work with boot 2.1.0	2018-08-03 15:04:17 -04:00
buildmaster	34cb91bc4c	Bumping versions to 2.0.2.BUILD-SNAPSHOT after release	2018-07-31 19:06:45 +00:00
buildmaster	58dc45d230	Going back to snapshots	2018-07-31 19:06:45 +00:00
buildmaster	80af701ccf	Update SNAPSHOT to 2.0.1.RELEASE	2018-07-31 19:04:57 +00:00
Ryan Baxter	46bc5da424	Make netflix starters optional. Fixes #35 (#36 )	2018-07-25 20:11:00 -04:00
Ryan Baxter	7dcb696ec4	Use OK Http client bean instead of instance variable. Fixes #46	2018-07-24 09:44:45 -04:00
Ryan Baxter	69461d4385	Adding spring boot autoconfigure processor. Fixes #43 .	2018-07-09 09:31:35 -04:00
Matt Benson	8364b16b8e	expose configuration metadata for property 'feign.hystrix.enabled' (#40 )	2018-06-28 07:28:32 -04:00
Ian Hu	6d4686624e	Fix typo in comments (#38 )	2018-06-26 07:10:51 -04:00
buildmaster	51ad63231d	Bumping versions to 2.0.1.BUILD-SNAPSHOT after release	2018-06-18 20:33:23 +00:00
buildmaster	6c09501d77	Going back to snapshots	2018-06-18 20:33:22 +00:00
buildmaster	7e1c91c8b8	Update SNAPSHOT to 2.0.0.RELEASE	2018-06-18 20:31:53 +00:00
Spencer Gibb	674b88b467	Updates to s-c-build 2.0.2.BUILD-SNAPSHOT	2018-06-05 15:42:52 -04:00
Fernando F D Bittencourt	a57c416d4a	Explaining the return in case of exception. (#32 )	2018-06-01 16:44:09 -04:00
Karl Nicholas	ffd4290e06	Update package to correct package in two test files. (#30 )	2018-05-31 15:58:09 -04:00
Ryan Baxter	804ef91620	Merge branch 'master' of github.com:spring-cloud/spring-cloud-openfeign	2018-05-31 07:54:28 -04:00
Ryan Baxter	48e2f70757	Updating sc-build to 2.0.2.BUILD-SNAPSHOT	2018-05-31 07:54:04 -04:00
Rafael Renan Pacheco	569628689b	Format "Creating Feign Clients Manually" snippet (#29 )	2018-05-29 11:09:05 -04:00
buildmaster	af02a8c692	Going back to snapshots	2018-05-24 23:56:03 +00:00