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

Simplify private method signatures and checks.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2025-03-13 13:43:34 +01:00
parent 312dcff688
commit 535cdc0137
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,16 +237,16 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
}
// produces
parseProduces(data, method, methodMapping);
parseProduces(data, methodMapping);
// consumes
parseConsumes(data, method, methodMapping);
parseConsumes(data, methodMapping);
// headers
parseHeaders(data, method, methodMapping);
parseHeaders(data, methodMapping);
// params
parseParams(data, method, methodMapping);
parseParams(data, methodMapping);
data.indexToExpander(new LinkedHashMap<>());
}
@@ -329,7 +329,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
return false;
}
private void parseProduces(MethodMetadata md, Method method, RequestMapping annotation) {
private void parseProduces(MethodMetadata md, RequestMapping annotation) {
String[] serverProduces = annotation.produces();
String clientAccepts = serverProduces.length == 0 ? null : emptyToNull(serverProduces[0]);
if (clientAccepts != null) {
@@ -337,7 +337,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
}
}
private void parseConsumes(MethodMetadata md, Method method, RequestMapping annotation) {
private void parseConsumes(MethodMetadata md, RequestMapping annotation) {
String[] serverConsumes = annotation.consumes();
String clientProduces = serverConsumes.length == 0 ? null : emptyToNull(serverConsumes[0]);
if (clientProduces != null) {
@@ -345,9 +345,9 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
}
}
private void parseHeaders(MethodMetadata md, Method method, RequestMapping annotation) {
private void parseHeaders(MethodMetadata md, RequestMapping annotation) {
// TODO: only supports one header value per key
if (annotation.headers() != null && annotation.headers().length > 0) {
if (annotation.headers() != null) {
for (String header : annotation.headers()) {
int index = header.indexOf('=');
if (!header.contains("!=") && index >= 0) {
@@ -358,9 +358,9 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
}
}
private void parseParams(MethodMetadata data, Method method, RequestMapping methodMapping) {
private void parseParams(MethodMetadata data, RequestMapping methodMapping) {
String[] params = methodMapping.params();
if (params == null || params.length == 0) {
if (params == null) {
return;
}
for (String param : params) {
@@ -438,13 +438,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource
return false;
}
private static class ConvertingExpanderFactory {
private final ConversionService conversionService;
ConvertingExpanderFactory(ConversionService conversionService) {
this.conversionService = conversionService;
}
private record ConvertingExpanderFactory(ConversionService conversionService) {
Param.Expander getExpander(TypeDescriptor typeDescriptor) {
return value -> {

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

@@ -1003,13 +1003,7 @@ class SpringMvcContractTests {
@Override
public String toString() {
return new StringBuilder("TestObject{").append("something='")
.append(something)
.append("', ")
.append("number=")
.append(number)
.append("}")
.toString();
return "TestObject{" + "something='" + something + "', " + "number=" + number + "}";
}
}