Update SNAPSHOT to 3.0.4

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 3.0.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ 3.0.x ]
 
 jobs:
   build:

README.adoc

@@ -66,9 +66,23 @@ the `.mvn` configuration, so if you find you have to do it to make a
 build succeed, please raise a ticket to get the settings added to
 source control.
 
-The projects that require middleware (i.e. Redis) for testing generally
-require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
+For hints on how to build the project look in `.travis.yml` if there
+is one. There should be a "script" and maybe "install" command. Also
+look at the "services" section to see if any services need to be
+running locally (e.g. mongo or rabbit).  Ignore the git-related bits
+that you might find in "before_install" since they're related to setting git
+credentials and you already have those.
 
+The projects that require middleware generally include a
+`docker-compose.yml`, so consider using
+https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
+in Docker containers. See the README in the
+https://github.com/spring-cloud-samples/scripts[scripts demo
+repository] for specific instructions about the common cases of mongo,
+rabbit and redis.
+
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).
 
 === Documentation
 

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.0-M2</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>

docs/src/main/asciidoc/_configprops.adoc

@@ -13,6 +13,7 @@
 |feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types.
 |feign.compression.request.min-request-size | `2048` | The minimum threshold content size.
 |feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed.
+|feign.compression.response.useGzipDecoder | `false` | Enables the default gzip decoder to be used.
 |feign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header.
 |feign.httpclient.connection-timeout | `2000` | 
 |feign.httpclient.connection-timer-repeat | `3000` | 

docs/src/main/asciidoc/index.adoc

@@ -1 +0,0 @@
-include::spring-cloud-openfeign.adoc[]

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+spring-cloud-openfeign.adoc

docs/src/main/asciidoc/spring-cloud-openfeign.adoc

@@ -52,9 +52,6 @@ public interface StoreClient {
 
 	@RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
 	Store update(@PathVariable("storeId") Long storeId, Store store);
-
-	@RequestMapping(method = RequestMethod.DELETE, value = "/stores/{storeId:\\d+}")
-	void delete(@PathVariable Long storeId);
 }
 ----
 
@@ -69,12 +66,12 @@ The load-balancer client above will want to discover the physical addresses
 for the "stores" service. If your application is a Eureka client then
 it will resolve the service in the Eureka service registry. If you
 don't want to use Eureka, you can configure a list of servers
-in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
+in your external configuration using https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
 
 Spring Cloud OpenFeign supports all the features available for the blocking mode of Spring Cloud LoadBalancer. You can read more about them in the https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer[project documentation].
 
 TIP: To use `@EnableFeignClients` annotation on `@Configuration`-annotated-classes, make sure to specify where the clients are located, for example:
-`@EnableFeignClients(basePackages = "com.example.clients")` 
+`@EnableFeignClients(basePackages = "com.example.clients")`
 or list them explicitly:
 `@EnableFeignClients(clients = InventoryServiceFeignClient.class)`
 
@@ -521,6 +518,14 @@ feign.compression.request.min-request-size=2048
 
 These properties allow you to be selective about the compressed media types and minimum request threshold length.
 
+For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding:
+
+[source,java]
+----
+feign.compression.response.enabled=true
+feign.compression.response.useGzipDecoder=true
+----
+
 === Feign logging
 
 A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level.

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.1.0-M2</version>
+	<version>3.0.4</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>3.1.0-M2</version>
+		<version>3.0.4</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.0-M2</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.0.4</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.0-M2</version>
+		<version>3.0.4</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>

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

@@ -58,6 +58,7 @@ import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
+import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
 import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
 import org.springframework.cloud.openfeign.support.PageJacksonModule;
@@ -86,6 +87,7 @@ import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResour
 @ConditionalOnClass(Feign.class)
 @EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class,
 		FeignEncoderProperties.class })
+@Import(DefaultGzipDecoderConfiguration.class)
 public class FeignAutoConfiguration {
 
 	private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class);

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

@@ -47,7 +47,6 @@ import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
 import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
 import org.springframework.cloud.openfeign.support.AbstractFormWriter;
 import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
-import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
 import org.springframework.cloud.openfeign.support.PageableSpringQueryMapEncoder;
 import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
@@ -71,7 +70,6 @@ import static feign.form.ContentType.MULTIPART;
  * @author Jonatan Ivanov
  * @author Olga Maciaszek-Sharma
  * @author Hyeonmin Park
- * @author Yanming Zhou
  */
 @Configuration(proxyBeanMethods = false)
 public class FeignClientsConfiguration {
@@ -99,25 +97,22 @@ public class FeignClientsConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Decoder feignDecoder(ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(messageConverters, customizers)));
+	public Decoder feignDecoder() {
+		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
-	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		return springEncoder(formWriterProvider, encoderProperties, customizers);
+	public Encoder feignEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		return springEncoder(formWriterProvider, encoderProperties);
 	}
 
 	@Bean
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
-	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
-		PageableSpringEncoder encoder = new PageableSpringEncoder(
-				springEncoder(formWriterProvider, encoderProperties, customizers));
+	public Encoder feignEncoderPageable(ObjectProvider<AbstractFormWriter> formWriterProvider) {
+		PageableSpringEncoder encoder = new PageableSpringEncoder(springEncoder(formWriterProvider, encoderProperties));
 
 		if (springDataWebProperties != null) {
 			encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
@@ -131,26 +126,20 @@ public class FeignClientsConfiguration {
 	@ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
 	@ConditionalOnMissingBean
 	public QueryMapEncoder feignQueryMapEncoderPageable() {
-		PageableSpringQueryMapEncoder queryMapEncoder = new PageableSpringQueryMapEncoder();
-		if (springDataWebProperties != null) {
-			queryMapEncoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter());
-			queryMapEncoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter());
-			queryMapEncoder.setSortParameter(springDataWebProperties.getSort().getSortParameter());
-		}
-		return queryMapEncoder;
+		return new PageableSpringQueryMapEncoder();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
 	public Contract feignContract(ConversionService feignConversionService) {
 		boolean decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash();
-		return new SpringMvcContract(parameterProcessors, feignConversionService, decodeSlash);
+		return new SpringMvcContract(this.parameterProcessors, feignConversionService, decodeSlash);
 	}
 
 	@Bean
 	public FormattingConversionService feignConversionService() {
 		FormattingConversionService conversionService = new DefaultFormattingConversionService();
-		for (FeignFormatterRegistrar feignFormatterRegistrar : feignFormatterRegistrars) {
+		for (FeignFormatterRegistrar feignFormatterRegistrar : this.feignFormatterRegistrars) {
 			feignFormatterRegistrar.registerFormatters(conversionService);
 		}
 		return conversionService;
@@ -165,7 +154,7 @@ public class FeignClientsConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(FeignLoggerFactory.class)
 	public FeignLoggerFactory feignLoggerFactory() {
-		return new DefaultFeignLoggerFactory(logger);
+		return new DefaultFeignLoggerFactory(this.logger);
 	}
 
 	@Bean
@@ -176,15 +165,14 @@ public class FeignClientsConfiguration {
 	}
 
 	private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
-			FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
+			FeignEncoderProperties encoderProperties) {
 		AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();
 
 		if (formWriter != null) {
-			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), messageConverters, encoderProperties,
-					customizers);
+			return new SpringEncoder(new SpringPojoFormEncoder(formWriter), this.messageConverters, encoderProperties);
 		}
 		else {
-			return new SpringEncoder(new SpringFormEncoder(), messageConverters, encoderProperties, customizers);
+			return new SpringEncoder(new SpringFormEncoder(), this.messageConverters, encoderProperties);
 		}
 	}
 

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

@@ -1,67 +0,0 @@
-/*
- * Copyright 2013-2021 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
- *
- *      https://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 java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import feign.MethodMetadata;
-
-import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.CookieValue;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-/**
- * @{link CookieValue} annotation processor.
- * @author Gong Yi
- *
- */
-public class CookieValueParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<CookieValue> ANNOTATION = CookieValue.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
-		int parameterIndex = context.getParameterIndex();
-		MethodMetadata data = context.getMethodMetadata();
-		CookieValue cookie = ANNOTATION.cast(annotation);
-		String name = cookie.value().trim();
-		checkState(emptyToNull(name) != null, "Cookie.name() was empty on parameter %s", parameterIndex);
-		context.setParameterName(name);
-		String cookieExpression = data.template().headers().getOrDefault(HttpHeaders.COOKIE, Arrays.asList("")).stream()
-				.findFirst().orElse("");
-		if (cookieExpression.length() == 0) {
-			cookieExpression = String.format("%s={%s}", name, name);
-		}
-		else {
-			cookieExpression += String.format("; %s={%s}", name, name);
-		}
-		data.template().removeHeader(HttpHeaders.COOKIE);
-		data.template().header(HttpHeaders.COOKIE, cookieExpression);
-		return true;
-	}
-
-}

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

@@ -34,7 +34,6 @@ import static feign.Util.emptyToNull;
  *
  * @author Jakub Narloch
  * @author Abhijit Sarkar
- * @author Yanming Zhou
  * @see AnnotatedParameterProcessor
  */
 public class PathVariableParameterProcessor implements AnnotatedParameterProcessor {
@@ -55,8 +54,7 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess
 
 		MethodMetadata data = context.getMethodMetadata();
 		String varName = '{' + name + '}';
-		String varNameRegex = ".*\\{" + name + "(:[^}]+)?\\}.*";
-		if (!data.template().url().matches(varNameRegex) && !searchMapValues(data.template().queries(), varName)
+		if (!data.template().url().contains(varName) && !searchMapValues(data.template().queries(), varName)
 				&& !searchMapValues(data.template().headers(), varName)) {
 			data.formParams().add(name);
 		}

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

@@ -16,18 +16,26 @@
 
 package org.springframework.cloud.openfeign.hateoas;
 
+import java.util.Collections;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.hateoas.config.HateoasConfiguration;
-import org.springframework.hateoas.config.WebConverters;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
 
 /**
  * @author Hector Espert
@@ -35,15 +43,23 @@ import org.springframework.hateoas.config.WebConverters;
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
-@ConditionalOnClass(WebConverters.class)
+@ConditionalOnClass(RepresentationModel.class)
 @AutoConfigureAfter({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
-		RepositoryRestMvcAutoConfiguration.class, HateoasConfiguration.class })
+		RepositoryRestMvcAutoConfiguration.class })
 public class FeignHalAutoConfiguration {
 
 	@Bean
-	@ConditionalOnBean(WebConverters.class)
-	HttpMessageConverterCustomizer webConvertersCustomizer(WebConverters webConverters) {
-		return new WebConvertersCustomizer(webConverters);
+	@ConditionalOnBean(HalMediaTypeConfiguration.class)
+	@ConditionalOnMissingBean
+	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
+			ObjectProvider<ObjectMapper> objectMapper, HalMediaTypeConfiguration halConfiguration) {
+		ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy();
+		halConfiguration.configureObjectMapper(mapper);
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter(
+				RepresentationModel.class);
+		converter.setSupportedMediaTypes(Collections.singletonList(HAL_JSON));
+		converter.setObjectMapper(mapper);
+		return converter;
 	}
 
 }

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

@@ -1,41 +0,0 @@
-/*
- * Copyright 2016-2021 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
- *
- *      https://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.hateoas;
-
-import java.util.List;
-
-import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
-import org.springframework.hateoas.config.WebConverters;
-import org.springframework.http.converter.HttpMessageConverter;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-public class WebConvertersCustomizer implements HttpMessageConverterCustomizer {
-
-	private final WebConverters webConverters;
-
-	public WebConvertersCustomizer(WebConverters webConverters) {
-		this.webConverters = webConverters;
-	}
-
-	@Override
-	public void accept(List<HttpMessageConverter<?>> httpMessageConverters) {
-		webConverters.augmentClient(httpMessageConverters);
-	}
-
-}

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013-2020 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
+ *
+ *      https://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.support;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.zip.GZIPInputStream;
+
+import feign.FeignException;
+import feign.Response;
+import feign.codec.Decoder;
+
+import org.springframework.cloud.openfeign.encoding.HttpEncoding;
+
+/**
+ * When response is compressed as gzip, this decompresses and uses {@link SpringDecoder}
+ * to decode.
+ *
+ * @author Jaesik Kim
+ */
+public class DefaultGzipDecoder implements Decoder {
+
+	private Decoder decoder;
+
+	public DefaultGzipDecoder(Decoder decoder) {
+		this.decoder = decoder;
+	}
+
+	@Override
+	public Object decode(final Response response, Type type) throws IOException, FeignException {
+		Collection<String> encoding = response.headers().containsKey(HttpEncoding.CONTENT_ENCODING_HEADER)
+				? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER) : null;
+
+		if (encoding != null) {
+			if (encoding.contains(HttpEncoding.GZIP_ENCODING)) {
+				String decompressedBody = decompress(response);
+				if (decompressedBody != null) {
+					Response decompressedResponse = response.toBuilder().body(decompressedBody.getBytes()).build();
+					return decoder.decode(decompressedResponse, type);
+				}
+			}
+		}
+		return decoder.decode(response, type);
+	}
+
+	private String decompress(Response response) throws IOException {
+		if (response.body() == null) {
+			return null;
+		}
+		try (GZIPInputStream gzipInputStream = new GZIPInputStream(response.body().asInputStream());
+				BufferedReader reader = new BufferedReader(
+						new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) {
+			String outputString = "";
+			String line;
+			while ((line = reader.readLine()) != null) {
+				outputString += line;
+			}
+			return outputString;
+		}
+	}
+
+}

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013-2020 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
+ *
+ *      https://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.support;
+
+import feign.codec.Decoder;
+import feign.optionals.OptionalDecoder;
+
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configures Default Gzip Decoder.
+ *
+ * @author Jaesik Kim
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty("feign.compression.response.enabled")
+// The OK HTTP client uses "transparent" compression.
+// If the accept-encoding header is present, it disables transparent compression
+@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient")
+@AutoConfigureAfter(FeignAutoConfiguration.class)
+public class DefaultGzipDecoderConfiguration {
+
+	private ObjectFactory<HttpMessageConverters> messageConverters;
+
+	public DefaultGzipDecoderConfiguration(ObjectFactory<HttpMessageConverters> messageConverters) {
+		this.messageConverters = messageConverters;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnProperty("feign.compression.response.useGzipDecoder")
+	public Decoder defaultGzipDecoder() {
+		return new OptionalDecoder(
+				new ResponseEntityDecoder(new DefaultGzipDecoder(new SpringDecoder(messageConverters))));
+	}
+
+}

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

@@ -1,54 +0,0 @@
-/*
- * Copyright 2013-2021 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
- *
- *      https://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.support;
-
-import java.util.function.Consumer;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ObjectProvider;
-
-/**
- * @author Olga Maciaszek-Sharma
- */
-class EmptyObjectProvider<T> implements ObjectProvider<T> {
-
-	@Override
-	public T getObject(Object... args) throws BeansException {
-		return null;
-	}
-
-	@Override
-	public T getIfAvailable() throws BeansException {
-		return null;
-	}
-
-	@Override
-	public T getIfUnique() throws BeansException {
-		return null;
-	}
-
-	@Override
-	public T getObject() throws BeansException {
-		return null;
-	}
-
-	@Override
-	public void forEach(Consumer action) {
-		// do nothing
-	}
-
-}

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

@@ -1,33 +0,0 @@
-/*
- * Copyright 2016-2021 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
- *
- *      https://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.support;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-import org.springframework.http.converter.HttpMessageConverter;
-
-/**
- * Allows customising {@link HttpMessageConverter} objects passed via {@link Consumer}
- * parameter.
- *
- * @author Olga Maciaszek-Sharma
- * @since 3.1.0
- */
-public interface HttpMessageConverterCustomizer extends Consumer<List<HttpMessageConverter<?>>> {
-
-}

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

@@ -32,7 +32,6 @@ import org.springframework.data.domain.Sort;
  * Provides support for encoding spring Pageable via composition.
  *
  * @author Pascal Büttiker
- * @author Yanming Zhou
  */
 public class PageableSpringEncoder implements Encoder {
 
@@ -83,8 +82,8 @@ public class PageableSpringEncoder implements Encoder {
 				Pageable pageable = (Pageable) object;
 
 				if (pageable.isPaged()) {
-					template.query(pageParameter, String.valueOf(pageable.getPageNumber()));
-					template.query(sizeParameter, String.valueOf(pageable.getPageSize()));
+					template.query(pageParameter, pageable.getPageNumber() + "");
+					template.query(sizeParameter, pageable.getPageSize() + "");
 				}
 
 				if (pageable.getSort() != null) {

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

@@ -31,38 +31,10 @@ import org.springframework.data.domain.Sort;
  * {@link org.springframework.cloud.openfeign.SpringQueryMap}.
  *
  * @author Hyeonmin Park
- * @author Yanming Zhou
  * @since 2.2.8
  */
 public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
 
-	/**
-	 * Page index parameter name.
-	 */
-	private String pageParameter = "page";
-
-	/**
-	 * Page size parameter name.
-	 */
-	private String sizeParameter = "size";
-
-	/**
-	 * Sort parameter name.
-	 */
-	private String sortParameter = "sort";
-
-	public void setPageParameter(String pageParameter) {
-		this.pageParameter = pageParameter;
-	}
-
-	public void setSizeParameter(String sizeParameter) {
-		this.sizeParameter = sizeParameter;
-	}
-
-	public void setSortParameter(String sortParameter) {
-		this.sortParameter = sortParameter;
-	}
-
 	@Override
 	public Map<String, Object> encode(Object object) {
 		if (supports(object)) {
@@ -72,8 +44,8 @@ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
 				Pageable pageable = (Pageable) object;
 
 				if (pageable.isPaged()) {
-					queryMap.put(pageParameter, pageable.getPageNumber());
-					queryMap.put(sizeParameter, pageable.getPageSize());
+					queryMap.put("page", pageable.getPageNumber());
+					queryMap.put("size", pageable.getPageSize());
 				}
 
 				if (pageable.getSort() != null) {
@@ -97,7 +69,7 @@ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder {
 			sortQueries.add(order.getProperty() + "%2C" + order.getDirection());
 		}
 		if (!sortQueries.isEmpty()) {
-			queryMap.put(sortParameter, sortQueries);
+			queryMap.put("sort", sortQueries);
 		}
 	}
 

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

@@ -21,7 +21,6 @@ import java.io.InputStream;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
-import java.util.List;
 
 import feign.FeignException;
 import feign.Response;
@@ -29,48 +28,31 @@ import feign.codec.DecodeException;
 import feign.codec.Decoder;
 
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.client.HttpMessageConverterExtractor;
 
 import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders;
 
 /**
  * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
  */
 public class SpringDecoder implements Decoder {
 
-	private final ObjectFactory<HttpMessageConverters> messageConverters;
+	private ObjectFactory<HttpMessageConverters> messageConverters;
 
-	private final ObjectProvider<HttpMessageConverterCustomizer> customizers;
-
-	/**
-	 * @deprecated in favour of
-	 * {@link SpringDecoder#SpringDecoder(ObjectFactory, ObjectProvider)}
-	 */
-	@Deprecated
 	public SpringDecoder(ObjectFactory<HttpMessageConverters> messageConverters) {
-		this(messageConverters, new EmptyObjectProvider<>());
-	}
-
-	public SpringDecoder(ObjectFactory<HttpMessageConverters> messageConverters,
-			ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		this.messageConverters = messageConverters;
-		this.customizers = customizers;
 	}
 
 	@Override
 	public Object decode(final Response response, Type type) throws IOException, FeignException {
 		if (type instanceof Class || type instanceof ParameterizedType || type instanceof WildcardType) {
-			List<HttpMessageConverter<?>> converters = messageConverters.getObject().getConverters();
-			customizers.forEach(customizer -> customizer.accept(converters));
 			@SuppressWarnings({ "unchecked", "rawtypes" })
-			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(type, converters);
+			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(type,
+					this.messageConverters.getObject().getConverters());
 
 			return extractor.extractData(new FeignResponseAdapter(response));
 		}
@@ -88,23 +70,23 @@ public class SpringDecoder implements Decoder {
 
 		@Override
 		public HttpStatus getStatusCode() throws IOException {
-			return HttpStatus.valueOf(response.status());
+			return HttpStatus.valueOf(this.response.status());
 		}
 
 		@Override
 		public int getRawStatusCode() throws IOException {
-			return response.status();
+			return this.response.status();
 		}
 
 		@Override
 		public String getStatusText() throws IOException {
-			return response.reason();
+			return this.response.reason();
 		}
 
 		@Override
 		public void close() {
 			try {
-				response.body().close();
+				this.response.body().close();
 			}
 			catch (IOException ex) {
 				// Ignore exception on close...
@@ -113,12 +95,12 @@ public class SpringDecoder implements Decoder {
 
 		@Override
 		public InputStream getBody() throws IOException {
-			return response.body().asInputStream();
+			return this.response.body().asInputStream();
 		}
 
 		@Override
 		public HttpHeaders getHeaders() {
-			return getHttpHeaders(response.headers());
+			return getHttpHeaders(this.response.headers());
 		}
 
 	}

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

@@ -24,7 +24,6 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -36,7 +35,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.encoding.HttpEncoding;
 import org.springframework.http.HttpHeaders;
@@ -76,37 +74,19 @@ public class SpringEncoder implements Encoder {
 
 	private final FeignEncoderProperties encoderProperties;
 
-	private final ObjectProvider<HttpMessageConverterCustomizer> customizers;
-
 	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
 		this(new SpringFormEncoder(), messageConverters);
 	}
 
-	/**
-	 * @deprecated in favour of
-	 * {@link SpringEncoder#SpringEncoder(SpringFormEncoder, ObjectFactory, FeignEncoderProperties, ObjectProvider)}
-	 */
-	@Deprecated
 	public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory<HttpMessageConverters> messageConverters) {
 		this(springFormEncoder, messageConverters, new FeignEncoderProperties());
 	}
 
-	/**
-	 * @deprecated in favour of
-	 * {@link SpringEncoder#SpringEncoder(SpringFormEncoder, ObjectFactory, FeignEncoderProperties, ObjectProvider)}
-	 */
-	@Deprecated
 	public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory<HttpMessageConverters> messageConverters,
 			FeignEncoderProperties encoderProperties) {
-		this(springFormEncoder, messageConverters, encoderProperties, new EmptyObjectProvider<>());
-	}
-
-	public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory<HttpMessageConverters> messageConverters,
-			FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
 		this.springFormEncoder = springFormEncoder;
 		this.messageConverters = messageConverters;
 		this.encoderProperties = encoderProperties;
-		this.customizers = customizers;
 	}
 
 	@Override
@@ -137,9 +117,7 @@ public class SpringEncoder implements Encoder {
 
 	private void encodeWithMessageConverter(Object requestBody, Type bodyType, RequestTemplate request,
 			MediaType requestContentType) {
-		List<HttpMessageConverter<?>> converters = messageConverters.getObject().getConverters();
-		customizers.forEach(customizer -> customizer.accept(converters));
-		for (HttpMessageConverter messageConverter : converters) {
+		for (HttpMessageConverter messageConverter : this.messageConverters.getObject().getConverters()) {
 			FeignOutputMessage outputMessage;
 			try {
 				if (messageConverter instanceof GenericHttpMessageConverter) {

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

@@ -38,7 +38,6 @@ import feign.Request;
 
 import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
 import org.springframework.cloud.openfeign.CollectionFormat;
-import org.springframework.cloud.openfeign.annotation.CookieValueParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor;
 import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor;
@@ -361,7 +360,6 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
 		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
 		annotatedArgumentResolvers.add(new QueryMapParameterProcessor());
 		annotatedArgumentResolvers.add(new RequestPartParameterProcessor());
-		annotatedArgumentResolvers.add(new CookieValueParameterProcessor());
 
 		return annotatedArgumentResolvers;
 	}

spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -44,6 +44,12 @@
 			"description": "Enables the response from Feign to be compressed.",
 			"defaultValue": "false"
 		},
+		{
+			"name": "feign.compression.response.useGzipDecoder",
+			"type": "java.lang.Boolean",
+			"description": "Enables the default gzip decoder to be used.",
+			"defaultValue": "false"
+		},
 		{
 			"name": "feign.compression.request.enabled",
 			"type": "java.lang.Boolean",

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

@@ -39,16 +39,15 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Jaesik Kim
- * @author Olga Maciaszek-Sharma
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = GzipDecodingTests.Application.class,
+@SpringBootTest(classes = DefaultGzipDecoderTests.Application.class,
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		value = { "spring.application.name=defaultGzipDecoderTests", "feign.compression.response.enabled=true",
-				"feign.client.config.default.loggerLevel=none", "feign.metrics.enabled=false",
+				"feign.compression.response.useGzipDecoder=true", "feign.client.config.default.loggerLevel=full",
 				"logging.level.org.springframework.cloud.openfeign=DEBUG" })
 @DirtiesContext
-public class GzipDecodingTests extends FeignClientFactoryBean {
+public class DefaultGzipDecoderTests extends FeignClientFactoryBean {
 
 	@Autowired
 	FeignContext context;
@@ -56,7 +55,7 @@ public class GzipDecodingTests extends FeignClientFactoryBean {
 	@Value("${local.server.port}")
 	private int port = 0;
 
-	public GzipDecodingTests() {
+	public DefaultGzipDecoderTests() {
 		setName("tests");
 		setContextId("test");
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationContextTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.cloud.openfeign.hateoas;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
@@ -27,20 +27,19 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
-import org.springframework.hateoas.config.WebConverters;
+import org.springframework.hateoas.RepresentationModel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Hector Espert
- * @author Olga Maciaszek-Sharma
  */
-class FeignHalAutoConfigurationContextTests {
+public class FeignHalAutoConfigurationContextTests {
 
 	private WebApplicationContextRunner contextRunner;
 
-	@BeforeEach
-	void setUp() {
+	@Before
+	public void setUp() {
 		contextRunner = new WebApplicationContextRunner()
 				.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
 						HttpMessageConvertersAutoConfiguration.class, HypermediaAutoConfiguration.class,
@@ -49,18 +48,23 @@ class FeignHalAutoConfigurationContextTests {
 	}
 
 	@Test
-	void shouldNotLoadWebConvertersCustomizerWhenNotWebConvertersNotInClasspath() {
+	public void testHalJacksonHttpMessageConverterIsNotLoaded() {
 		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(RepositoryRestMvcConfiguration.class,
-				WebConverters.class);
+				RepresentationModel.class);
 		contextRunner.withClassLoader(filteredClassLoader)
-				.run(context -> assertThat(context).doesNotHaveBean("webConvertersCustomizer"));
+				.run(context -> assertThat(context).doesNotHaveBean("halJacksonHttpMessageConverter"));
 	}
 
 	@Test
-	void shouldLoadWebConvertersCustomizer() {
+	public void testHalJacksonHttpMessageConverterIsLoaded() {
 		FilteredClassLoader filteredClassLoader = new FilteredClassLoader(RepositoryRestMvcConfiguration.class);
 		contextRunner.withClassLoader(filteredClassLoader)
-				.run(context -> assertThat(context).hasBean("webConvertersCustomizer"));
+				.run(context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
+	}
+
+	@Test
+	public void testHalJacksonHttpMessageConverterIsNotLoadedUseRestDataMessageConverterInstead() {
+		contextRunner.run(context -> assertThat(context).hasBean("halJacksonHttpMessageConverter"));
 	}
 
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationTests.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2016-2020 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
+ *
+ *      https://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.hateoas;
+
+import java.util.Collections;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.hateoas.mediatype.MessageResolver;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.HalConfiguration;
+import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.server.LinkRelationProvider;
+import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.springframework.hateoas.MediaTypes.HAL_JSON;
+
+/**
+ * @author Hector Espert
+ * @author Olga Maciaszek-Sharma
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class FeignHalAutoConfigurationTests {
+
+	@Mock
+	private ObjectProvider<HalConfiguration> halConfiguration;
+
+	@Mock
+	private ObjectProvider<ObjectMapper> objectMapper;
+
+	@Mock
+	private LinkRelationProvider relProvider;
+
+	@Mock
+	private ObjectProvider<CurieProvider> curieProvider;
+
+	@Mock
+	private MessageResolver messageResolver;
+
+	@InjectMocks
+	private FeignHalAutoConfiguration feignHalAutoConfiguration;
+
+	@Test
+	public void halJacksonHttpMessageConverter() {
+		ObjectMapper mapper = new ObjectMapper();
+		when(objectMapper.getIfAvailable(any())).thenReturn(mapper);
+
+		when(halConfiguration.getIfAvailable(any())).thenReturn(mock(HalConfiguration.class));
+		when(curieProvider.getIfAvailable(any())).thenReturn(mock(CurieProvider.class));
+
+		HalMediaTypeConfiguration halMediaTypeConfiguration = new HalMediaTypeConfiguration(relProvider, curieProvider,
+				halConfiguration, messageResolver, new DefaultListableBeanFactory());
+
+		TypeConstrainedMappingJackson2HttpMessageConverter converter = feignHalAutoConfiguration
+				.halJacksonHttpMessageConverter(objectMapper, halMediaTypeConfiguration);
+
+		assertThat(converter).isNotNull();
+		assertThat(converter.getObjectMapper()).isNotNull();
+		assertThat(converter.getSupportedMediaTypes()).isEqualTo(Collections.singletonList(HAL_JSON));
+
+		assertThat(Jackson2HalModule.isAlreadyRegisteredIn(converter.getObjectMapper())).isTrue();
+	}
+
+}

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

@@ -16,9 +16,7 @@
 
 package org.springframework.cloud.openfeign.loadbalancer;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
@@ -107,7 +105,8 @@ class FeignBlockingLoadBalancerClientTests {
 		Response response = feignBlockingLoadBalancerClient.execute(request, new Request.Options());
 
 		assertThat(response.status()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE.value());
-		assertThat(read(response)).isEqualTo("Load balancer does not contain an instance for the service test");
+		assertThat(response.body().toString())
+				.isEqualTo("Load balancer does not contain an instance for the service test");
 	}
 
 	@Test
@@ -168,17 +167,6 @@ class FeignBlockingLoadBalancerClientTests {
 				.contains(HttpStatus.OK);
 	}
 
-	private String read(Response response) throws IOException {
-		BufferedReader reader = new BufferedReader(
-				new InputStreamReader(response.body().asInputStream(), StandardCharsets.UTF_8));
-		String outputString = "";
-		String line;
-		while ((line = reader.readLine()) != null) {
-			outputString += line;
-		}
-		return outputString;
-	}
-
 	private Request testRequest() {
 		return testRequest("test");
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderTests.java

@@ -37,7 +37,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  * Tests the pagination encoding and sorting.
  *
  * @author Charlie Mordant.
- * @author Yanming Zhou
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT,
@@ -56,18 +55,6 @@ public class PageableEncoderTests {
 	@Autowired
 	private FeignContext context;
 
-	protected String getPageParameter() {
-		return "page";
-	}
-
-	protected String getSizeParameter() {
-		return "size";
-	}
-
-	protected String getSortParameter() {
-		return "sort";
-	}
-
 	@Test
 	public void testPaginationAndSortingRequest() {
 		Encoder encoder = this.context.getInstance("foo", Encoder.class);
@@ -78,11 +65,11 @@ public class PageableEncoderTests {
 		// Request queries shall contain three entries
 		assertThat(request.queries()).hasSize(3);
 		// Request page shall contain page
-		assertThat(request.queries().get(getPageParameter())).contains(String.valueOf(PAGE));
+		assertThat(request.queries().get("page")).contains(String.valueOf(PAGE));
 		// Request size shall contain size
-		assertThat(request.queries().get(getSizeParameter())).contains(String.valueOf(SIZE));
+		assertThat(request.queries().get("size")).contains(String.valueOf(SIZE));
 		// Request sort size shall contain sort entries
-		assertThat(request.queries().get(getSortParameter())).hasSize(2);
+		assertThat(request.queries().get("sort")).hasSize(2);
 	}
 
 	private Pageable createPageAndSortRequest() {
@@ -97,11 +84,11 @@ public class PageableEncoderTests {
 		encoder.encode(createPageAndRequest(), null, request);
 		assertThat(request.queries().size()).isEqualTo(2);
 		// Request page shall contain page
-		assertThat(request.queries().get(getPageParameter())).contains(String.valueOf(PAGE));
+		assertThat(request.queries().get("page")).contains(String.valueOf(PAGE));
 		// Request size shall contain size
-		assertThat(request.queries().get(getSizeParameter())).contains(String.valueOf(SIZE));
+		assertThat(request.queries().get("size")).contains(String.valueOf(SIZE));
 		// Request sort size shall contain sort entries
-		assertThat(request.queries()).doesNotContainKey(getSortParameter());
+		assertThat(request.queries()).doesNotContainKey("sort");
 	}
 
 	private Pageable createPageAndRequest() {
@@ -118,7 +105,7 @@ public class PageableEncoderTests {
 		// Request queries shall contain three entries
 		assertThat(request.queries().size()).isEqualTo(1);
 		// Request sort size shall contain sort entries
-		assertThat(request.queries().get(getSortParameter())).hasSize(2);
+		assertThat(request.queries().get("sort")).hasSize(2);
 	}
 
 	private Sort createSort() {

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderWithSpringDataWebTests.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2013-2020 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
- *
- *      https://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.support;
-
-import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * Tests the pagination encoding and sorting.
- *
- * @author Yanming Zhou
- */
-@EnableConfigurationProperties(SpringDataWebProperties.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=springencodertest", "spring.jmx.enabled=false",
-				"spring.data.web.pageable.pageParameter=pageNo", "spring.data.web.pageable.sizeParameter=pageSize",
-				"spring.data.web.sort.sortParameter=orderBy" })
-public class PageableEncoderWithSpringDataWebTests extends PageableEncoderTests {
-
-	@Override
-	protected String getPageParameter() {
-		return "pageNo";
-	}
-
-	@Override
-	protected String getSizeParameter() {
-		return "pageSize";
-	}
-
-	@Override
-	protected String getSortParameter() {
-		return "orderBy";
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderTests.java

@@ -1,127 +0,0 @@
-/*
- * Copyright 2013-2020 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
- *
- *      https://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.support;
-
-import java.util.List;
-import java.util.Map;
-
-import feign.QueryMapEncoder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.openfeign.FeignContext;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * Tests the pagination encoding and sorting.
- *
- * @author Yanming Zhou
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=springencodertest", "spring.jmx.enabled=false" })
-@DirtiesContext
-public class PageableSpringQueryMapEncoderTests {
-
-	public static final int PAGE = 1;
-
-	public static final int SIZE = 10;
-
-	public static final String SORT_2 = "sort2";
-
-	public static final String SORT_1 = "sort1";
-
-	@Autowired
-	private FeignContext context;
-
-	protected String getPageParameter() {
-		return "page";
-	}
-
-	protected String getSizeParameter() {
-		return "size";
-	}
-
-	protected String getSortParameter() {
-		return "sort";
-	}
-
-	@Test
-	public void testPaginationAndSortingRequest() {
-		QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class);
-		assertThat(encoder).isNotNull();
-
-		Map<String, Object> map = encoder.encode(createPageAndSortRequest());
-		assertThat(map).hasSize(3);
-		assertThat((Integer) map.get(getPageParameter())).isEqualTo(PAGE);
-		assertThat((Integer) map.get(getSizeParameter())).isEqualTo(SIZE);
-		assertThat((List<?>) map.get(getSortParameter())).hasSize(2);
-	}
-
-	private Pageable createPageAndSortRequest() {
-		return PageRequest.of(PAGE, SIZE, Sort.Direction.ASC, SORT_1, SORT_2);
-	}
-
-	@Test
-	public void testPaginationRequest() {
-		QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class);
-		assertThat(encoder).isNotNull();
-
-		Map<String, Object> map = encoder.encode(createPageAndRequest());
-		assertThat(map).hasSize(2);
-		assertThat((Integer) map.get(getPageParameter())).isEqualTo(PAGE);
-		assertThat((Integer) map.get(getSizeParameter())).isEqualTo(SIZE);
-		assertThat(map).doesNotContainKey(getSortParameter());
-	}
-
-	private Pageable createPageAndRequest() {
-		return PageRequest.of(PAGE, SIZE);
-	}
-
-	@Test
-	public void testSortingRequest() {
-		QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class);
-		assertThat(encoder).isNotNull();
-
-		Map<String, Object> map = encoder.encode(createSort());
-		assertThat(map).hasSize(1);
-		assertThat((List<?>) map.get(getSortParameter())).hasSize(2);
-	}
-
-	private Sort createSort() {
-		return Sort.by(SORT_1, SORT_2).ascending();
-	}
-
-	@Test
-	public void testUnpagedRequest() {
-		QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class);
-		assertThat(encoder).isNotNull();
-
-		Map<String, Object> map = encoder.encode(Pageable.unpaged());
-		assertThat(map).isEmpty();
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderWithSpringDataWebTests.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2013-2020 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
- *
- *      https://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.support;
-
-import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-/**
- * Tests the pagination encoding and sorting.
- *
- * @author Yanming Zhou
- */
-@EnableConfigurationProperties(SpringDataWebProperties.class)
-@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT,
-		value = { "spring.application.name=springencodertest", "spring.jmx.enabled=false",
-				"spring.data.web.pageable.pageParameter=pageNo", "spring.data.web.pageable.sizeParameter=pageSize",
-				"spring.data.web.sort.sortParameter=orderBy" })
-public class PageableSpringQueryMapEncoderWithSpringDataWebTests extends PageableSpringQueryMapEncoderTests {
-
-	@Override
-	protected String getPageParameter() {
-		return "pageNo";
-	}
-
-	@Override
-	protected String getSizeParameter() {
-		return "pageSize";
-	}
-
-	@Override
-	protected String getSortParameter() {
-		return "orderBy";
-	}
-
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java

@@ -45,7 +45,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.MatrixVariable;
@@ -131,16 +130,6 @@ public class SpringMvcContractTests {
 		assertThat(data.template().decodeSlash()).isTrue();
 	}
 
-	@Test
-	public void testProcessAnnotationOnMethod_Simple_RegexPathVariable() throws Exception {
-		Method method = TestTemplate_Simple.class.getDeclaredMethod("getTestWithDigitalId", String.class);
-		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-
-		assertThat(data.template().url()).isEqualTo("/test/{id:\\d+}");
-		assertThat(data.template().method()).isEqualTo("GET");
-		assertThat(data.formParams()).isEmpty();
-	}
-
 	@Test
 	public void testProcessAnnotationOnMethod_Simple_SlashEncoded() throws Exception {
 		contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false);
@@ -588,24 +577,6 @@ public class SpringMvcContractTests {
 		assertThat(data.formParams()).contains("file", "id");
 	}
 
-	@Test
-	public void testSingleCookieAnnotation() throws NoSuchMethodException {
-		Method method = TestTemplate_Cookies.class.getDeclaredMethod("singleCookie", String.class, String.class);
-
-		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-		assertThat(data.template().headers().get("cookie").iterator().next()).isEqualTo("cookie1={cookie1}");
-	}
-
-	@Test
-	public void testMultipleCookiesAnnotation() throws NoSuchMethodException {
-		Method method = TestTemplate_Cookies.class.getDeclaredMethod("multipleCookies", String.class, String.class,
-				String.class);
-
-		MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-		assertThat(data.template().headers().get("cookie").iterator().next())
-				.isEqualTo("cookie1={cookie1}; cookie2={cookie2}");
-	}
-
 	private ConversionService getConversionService() {
 		FormattingConversionServiceFactoryBean conversionServiceFactoryBean = new FormattingConversionServiceFactoryBean();
 		conversionServiceFactoryBean.afterPropertiesSet();
@@ -617,9 +588,6 @@ public class SpringMvcContractTests {
 		@RequestMapping(value = "/test/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 		ResponseEntity<TestObject> getTest(@PathVariable("id") String id);
 
-		@GetMapping("/test/{id:\\d+}")
-		ResponseEntity<TestObject> getTestWithDigitalId(@PathVariable("id") String id);
-
 		@GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject getTest();
 
@@ -656,17 +624,6 @@ public class SpringMvcContractTests {
 
 	}
 
-	public interface TestTemplate_Cookies {
-
-		@GetMapping("/test/{id}")
-		ResponseEntity<TestObject> singleCookie(@PathVariable("id") String id, @CookieValue("cookie1") String cookie1);
-
-		@GetMapping("/test/{id}")
-		ResponseEntity<TestObject> multipleCookies(@PathVariable("id") String id,
-				@CookieValue("cookie1") String cookie1, @CookieValue("cookie2") String cookie2);
-
-	}
-
 	public interface TestTemplate_HeadersWithoutValues {
 
 		@GetMapping(value = "/test/{id}", headers = { "X-Foo", "!X-Bar", "X-Baz!=fooBar" })

spring-cloud-openfeign-dependencies/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.0-M2</version>
+		<version>3.0.4</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.0-M2</version>
+	<version>3.0.4</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
-		<feign.version>11.6</feign.version>
+		<feign.version>10.12</feign.version>
 		<feign-form.version>3.8.0</feign-form.version>
 		<spring-security-oauth2-autoconfigure.version>2.1.2.RELEASE</spring-security-oauth2-autoconfigure.version>
 	</properties>

spring-cloud-starter-openfeign/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.0-M2</version>
+		<version>3.0.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>