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

Refactor.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2023-03-06 14:10:45 +01:00
parent a8bcc5c4ed
commit 5bc28fa1dd
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,11 +299,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
} }
} }
if (! if (!isMultipartFormData(data) && isHttpAnnotation && data.indexToExpander().get(paramIndex) == null) {
isMultipartFormData(data) && isHttpAnnotation && data.indexToExpander().
get(paramIndex) == null) {
TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex); TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
if (conversionService.canConvert(typeDescriptor, STRING_TYPE_DESCRIPTOR)) { if (conversionService.canConvert(typeDescriptor, STRING_TYPE_DESCRIPTOR)) {
Param.Expander expander = convertingExpanderFactory.getExpander(typeDescriptor); Param.Expander expander = convertingExpanderFactory.getExpander(typeDescriptor);

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

@@ -631,20 +631,20 @@ class SpringMvcContractTests {
void shouldNotFailWhenBothPageableAndRequestBodyParamsInPostRequest() { void shouldNotFailWhenBothPageableAndRequestBodyParamsInPostRequest() {
List<MethodMetadata> data = contract.parseAndValidateMetadata(TestTemplate_PageablePost.class); List<MethodMetadata> data = contract.parseAndValidateMetadata(TestTemplate_PageablePost.class);
assertThat(data.get(2).queryMapIndex()).isEqualTo(1); assertThat(data.get(0).queryMapIndex()).isEqualTo(0);
assertThat(data.get(2).bodyIndex()).isEqualTo(0); assertThat(data.get(0).bodyIndex()).isEqualTo(1);
assertThat(data.get(3).queryMapIndex()).isEqualTo(0); assertThat(data.get(1).queryMapIndex()).isEqualTo(1);
assertThat(data.get(3).bodyIndex()).isEqualTo(1); assertThat(data.get(1).bodyIndex()).isEqualTo(0);
} }
@Test @Test
void shouldSetPageableAsBodyWhenQueryMapParamPresent() { void shouldSetPageableAsBodyWhenQueryMapParamPresent() {
List<MethodMetadata> data = contract.parseAndValidateMetadata(TestTemplate_PageablePost.class); List<MethodMetadata> data = contract.parseAndValidateMetadata(TestTemplate_PageablePostWithQueryMap.class);
assertThat(data.get(0).queryMapIndex()).isEqualTo(1); assertThat(data.get(0).queryMapIndex()).isEqualTo(0);
assertThat(data.get(0).bodyIndex()).isEqualTo(0); assertThat(data.get(0).bodyIndex()).isEqualTo(1);
assertThat(data.get(1).queryMapIndex()).isEqualTo(0); assertThat(data.get(1).queryMapIndex()).isEqualTo(1);
assertThat(data.get(1).bodyIndex()).isEqualTo(1); assertThat(data.get(1).bodyIndex()).isEqualTo(0);
} }
private ConversionService getConversionService() { private ConversionService getConversionService() {
@@ -848,7 +848,7 @@ class SpringMvcContractTests {
} }
public interface TestTemplate_PageablePost { interface TestTemplate_PageablePost {
@PostMapping @PostMapping
Page<String> getPage(Pageable pageable, @RequestBody String body); Page<String> getPage(Pageable pageable, @RequestBody String body);
@@ -856,6 +856,10 @@ class SpringMvcContractTests {
@PostMapping @PostMapping
Page<String> getPage(@RequestBody String body, Pageable pageable); Page<String> getPage(@RequestBody String body, Pageable pageable);
}
interface TestTemplate_PageablePostWithQueryMap {
@PostMapping @PostMapping
Page<String> getPage(@SpringQueryMap TestObject pojo, Pageable pageable); Page<String> getPage(@SpringQueryMap TestObject pojo, Pageable pageable);