Skip to content

Commit 03618b5

Browse files
committed
Change variable names
1 parent 8234e7d commit 03618b5

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class FeignClientsConfiguration {
7676
private SpringDataWebProperties springDataWebProperties;
7777

7878
@Autowired(required = false)
79-
private PojoFormWriter pojoSerializationWriter;
79+
private PojoFormWriter pojoFormWriter;
8080

8181
@Bean
8282
@ConditionalOnMissingBean
@@ -89,9 +89,8 @@ public Decoder feignDecoder() {
8989
@ConditionalOnMissingBean
9090
@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
9191
public Encoder feignEncoder() {
92-
if (this.pojoSerializationWriter != null) {
93-
return new SpringEncoder(this.pojoSerializationWriter,
94-
this.messageConverters);
92+
if (this.pojoFormWriter != null) {
93+
return new SpringEncoder(this.pojoFormWriter, this.messageConverters);
9594
}
9695
else {
9796
return new SpringEncoder(this.messageConverters);
@@ -104,9 +103,9 @@ public Encoder feignEncoder() {
104103
public Encoder feignEncoderPageable() {
105104
PageableSpringEncoder encoder;
106105

107-
if (this.pojoSerializationWriter != null) {
108-
encoder = new PageableSpringEncoder(new SpringEncoder(
109-
this.pojoSerializationWriter, this.messageConverters));
106+
if (this.pojoFormWriter != null) {
107+
encoder = new PageableSpringEncoder(
108+
new SpringEncoder(this.pojoFormWriter, this.messageConverters));
110109
}
111110
else {
112111
encoder = new PageableSpringEncoder(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
*/
2727
public class SpringPojoFormEncoder extends SpringFormEncoder {
2828

29-
public SpringPojoFormEncoder(PojoFormWriter pojoSerializationWriter) {
29+
public SpringPojoFormEncoder(PojoFormWriter pojoFormWriter) {
3030
super();
3131

3232
MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(
3333
MULTIPART);
34-
processor.addFirstWriter(pojoSerializationWriter);
34+
processor.addFirstWriter(pojoFormWriter);
3535
}
3636

3737
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ public OtherArg parse(String text, Locale locale)
979979
}
980980

981981
@Bean
982-
public PojoFormWriter pojoSerializationWriter() {
982+
public PojoFormWriter pojoFormWriter() {
983983
return new JsonPojoFormWriter();
984984
}
985985

0 commit comments

Comments
 (0)