From ebd80b51153ca1efead5a04717fa8dc9bf67df7a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jul 2019 10:51:04 +0000 Subject: [PATCH] Bumping versions --- README.adoc | 3 ++- .../cloud/openfeign/FeignClientsConfiguration.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index 6039625d..78003e90 100644 --- a/README.adoc +++ b/README.adoc @@ -55,7 +55,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://compose.docker.io/[Docker Compose] to run the middeware servers +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, @@ -245,6 +245,7 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java index 7a84b393..e44970ab 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java @@ -91,11 +91,15 @@ public class FeignClientsConfiguration { @ConditionalOnClass(name = "org.springframework.data.domain.Pageable") @ConditionalOnMissingBean public Encoder feignEncoderPageable() { - PageableSpringEncoder encoder = new PageableSpringEncoder(new SpringEncoder(this.messageConverters)); + PageableSpringEncoder encoder = new PageableSpringEncoder( + new SpringEncoder(this.messageConverters)); if (springDataWebProperties != null) { - encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter()); - encoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter()); - encoder.setSortParameter(springDataWebProperties.getSort().getSortParameter()); + encoder.setPageParameter( + springDataWebProperties.getPageable().getPageParameter()); + encoder.setSizeParameter( + springDataWebProperties.getPageable().getSizeParameter()); + encoder.setSortParameter( + springDataWebProperties.getSort().getSortParameter()); } return encoder; }