Skip to content

Commit 974bf01

Browse files
committed
Rename classes and methods
1 parent d18b7ab commit 974bf01

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
4141
import org.springframework.cloud.openfeign.support.PageJacksonModule;
4242
import org.springframework.cloud.openfeign.support.PageableSpringEncoder;
43-
import org.springframework.cloud.openfeign.support.PojoSerializationWriter;
43+
import org.springframework.cloud.openfeign.support.PojoFormWriter;
4444
import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
4545
import org.springframework.cloud.openfeign.support.SpringDecoder;
4646
import org.springframework.cloud.openfeign.support.SpringEncoder;
@@ -76,7 +76,7 @@ public class FeignClientsConfiguration {
7676
private SpringDataWebProperties springDataWebProperties;
7777

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

8181
@Bean
8282
@ConditionalOnMissingBean
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Darren Foong
2929
*/
3030
@Component
31-
public class PojoJsonSerializationWriter extends PojoSerializationWriter {
31+
public class JsonPojoFormWriter extends PojoFormWriter {
3232

3333
@Autowired
3434
private ObjectMapper objectMapper;
@@ -39,7 +39,7 @@ protected MediaType getContentType() {
3939
}
4040

4141
@Override
42-
protected String serialize(Object object) throws IOException {
42+
protected String writePojoAsString(Object object) throws IOException {
4343
return objectMapper.writeValueAsString(object);
4444
}
4545

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/**
3535
* @author Darren Foong
3636
*/
37-
public abstract class PojoSerializationWriter extends AbstractWriter {
37+
public abstract class PojoFormWriter extends AbstractWriter {
3838

3939
@Override
4040
public boolean isApplicable(Object object) {
@@ -50,7 +50,7 @@ public void write(Output output, String key, Object object) throws EncodeExcepti
5050
.append('"').append(CRLF).append("Content-Type: ")
5151
.append(getContentType()).append("; charset=")
5252
.append(output.getCharset().name()).append(CRLF).append(CRLF)
53-
.append(serialize(object)).toString();
53+
.append(writePojoAsString(object)).toString();
5454

5555
output.write(string);
5656
}
@@ -61,7 +61,7 @@ public void write(Output output, String key, Object object) throws EncodeExcepti
6161

6262
protected abstract MediaType getContentType();
6363

64-
protected abstract String serialize(Object object) throws IOException;
64+
protected abstract String writePojoAsString(Object object) throws IOException;
6565

6666
private boolean isTypeOrCollection(Object object, Predicate<Object> isType) {
6767
if (object.getClass().isArray()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
6969
this.messageConverters = messageConverters;
7070
}
7171

72-
public SpringEncoder(PojoSerializationWriter writer,
72+
public SpringEncoder(PojoFormWriter writer,
7373
ObjectFactory<HttpMessageConverters> messageConverters) {
7474
this.springFormEncoder = new SpringPojoFormEncoder(writer);
7575
this.messageConverters = messageConverters;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
public class SpringPojoFormEncoder extends SpringFormEncoder {
2828

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

3232
MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
import org.springframework.cloud.openfeign.FeignFormatterRegistrar;
7676
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
7777
import org.springframework.cloud.openfeign.support.FallbackCommand;
78-
import org.springframework.cloud.openfeign.support.PojoJsonSerializationWriter;
79-
import org.springframework.cloud.openfeign.support.PojoSerializationWriter;
78+
import org.springframework.cloud.openfeign.support.JsonPojoFormWriter;
79+
import org.springframework.cloud.openfeign.support.PojoFormWriter;
8080
import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
8181
import org.springframework.context.annotation.Bean;
8282
import org.springframework.context.annotation.Configuration;
@@ -979,8 +979,8 @@ public OtherArg parse(String text, Locale locale)
979979
}
980980

981981
@Bean
982-
public PojoSerializationWriter pojoSerializationWriter() {
983-
return new PojoJsonSerializationWriter();
982+
public PojoFormWriter pojoSerializationWriter() {
983+
return new JsonPojoFormWriter();
984984
}
985985

986986
@RequestMapping(method = RequestMethod.GET, path = "/hello")

0 commit comments

Comments
 (0)