SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2019-07-23 10:51:04 +00:00
parent 866d20d976
commit ebd80b5115
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.adoc
View File

@@ -55,7 +55,7 @@ credentials and you already have those.
The projects that require middleware generally include a The projects that require middleware generally include a
`docker-compose.yml`, so consider using `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 in Docker containers. See the README in the
https://github.com/spring-cloud-samples/scripts[scripts demo https://github.com/spring-cloud-samples/scripts[scripts demo
repository] for specific instructions about the common cases of mongo, repository] for specific instructions about the common cases of mongo,
@@ -245,6 +245,7 @@ $ touch .springformat
==== Intellij IDEA ==== Intellij IDEA
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. 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/ .spring-cloud-build-tools/
---- ----

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

@@ -91,11 +91,15 @@ public class FeignClientsConfiguration {
@ConditionalOnClass(name = "org.springframework.data.domain.Pageable") @ConditionalOnClass(name = "org.springframework.data.domain.Pageable")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public Encoder feignEncoderPageable() { public Encoder feignEncoderPageable() {
PageableSpringEncoder encoder = new PageableSpringEncoder(new SpringEncoder(this.messageConverters)); PageableSpringEncoder encoder = new PageableSpringEncoder(
new SpringEncoder(this.messageConverters));
if (springDataWebProperties != null) { if (springDataWebProperties != null) {
encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter()); encoder.setPageParameter(
encoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter()); springDataWebProperties.getPageable().getPageParameter());
encoder.setSortParameter(springDataWebProperties.getSort().getSortParameter()); encoder.setSizeParameter(
springDataWebProperties.getPageable().getSizeParameter());
encoder.setSortParameter(
springDataWebProperties.getSort().getSortParameter());
} }
return encoder; return encoder;
} }