Skip to content

Commit 535cdc0

Browse files
committed
Simplify private method signatures and checks.
1 parent 312dcff commit 535cdc0

File tree

2 files changed

+12
-24
lines changed

2 files changed

+12
-24
lines changed

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,16 @@ protected void processAnnotationOnMethod(MethodMetadata data, Annotation methodA
237237
}
238238

239239
// produces
240-
parseProduces(data, method, methodMapping);
240+
parseProduces(data, methodMapping);
241241

242242
// consumes
243-
parseConsumes(data, method, methodMapping);
243+
parseConsumes(data, methodMapping);
244244

245245
// headers
246-
parseHeaders(data, method, methodMapping);
246+
parseHeaders(data, methodMapping);
247247

248248
// params
249-
parseParams(data, method, methodMapping);
249+
parseParams(data, methodMapping);
250250

251251
data.indexToExpander(new LinkedHashMap<>());
252252
}
@@ -329,25 +329,25 @@ private boolean queryMapParamPresent(MethodMetadata data) {
329329
return false;
330330
}
331331

332-
private void parseProduces(MethodMetadata md, Method method, RequestMapping annotation) {
332+
private void parseProduces(MethodMetadata md, RequestMapping annotation) {
333333
String[] serverProduces = annotation.produces();
334334
String clientAccepts = serverProduces.length == 0 ? null : emptyToNull(serverProduces[0]);
335335
if (clientAccepts != null) {
336336
md.template().header(ACCEPT, clientAccepts);
337337
}
338338
}
339339

340-
private void parseConsumes(MethodMetadata md, Method method, RequestMapping annotation) {
340+
private void parseConsumes(MethodMetadata md, RequestMapping annotation) {
341341
String[] serverConsumes = annotation.consumes();
342342
String clientProduces = serverConsumes.length == 0 ? null : emptyToNull(serverConsumes[0]);
343343
if (clientProduces != null) {
344344
md.template().header(CONTENT_TYPE, clientProduces);
345345
}
346346
}
347347

348-
private void parseHeaders(MethodMetadata md, Method method, RequestMapping annotation) {
348+
private void parseHeaders(MethodMetadata md, RequestMapping annotation) {
349349
// TODO: only supports one header value per key
350-
if (annotation.headers() != null && annotation.headers().length > 0) {
350+
if (annotation.headers() != null) {
351351
for (String header : annotation.headers()) {
352352
int index = header.indexOf('=');
353353
if (!header.contains("!=") && index >= 0) {
@@ -358,9 +358,9 @@ private void parseHeaders(MethodMetadata md, Method method, RequestMapping annot
358358
}
359359
}
360360

361-
private void parseParams(MethodMetadata data, Method method, RequestMapping methodMapping) {
361+
private void parseParams(MethodMetadata data, RequestMapping methodMapping) {
362362
String[] params = methodMapping.params();
363-
if (params == null || params.length == 0) {
363+
if (params == null) {
364364
return;
365365
}
366366
for (String param : params) {
@@ -438,13 +438,7 @@ private boolean isMultipartFormData(MethodMetadata data) {
438438
return false;
439439
}
440440

441-
private static class ConvertingExpanderFactory {
442-
443-
private final ConversionService conversionService;
444-
445-
ConvertingExpanderFactory(ConversionService conversionService) {
446-
this.conversionService = conversionService;
447-
}
441+
private record ConvertingExpanderFactory(ConversionService conversionService) {
448442

449443
Param.Expander getExpander(TypeDescriptor typeDescriptor) {
450444
return value -> {

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,13 +1003,7 @@ public int hashCode() {
10031003

10041004
@Override
10051005
public String toString() {
1006-
return new StringBuilder("TestObject{").append("something='")
1007-
.append(something)
1008-
.append("', ")
1009-
.append("number=")
1010-
.append(number)
1011-
.append("}")
1012-
.toString();
1006+
return "TestObject{" + "something='" + something + "', " + "number=" + number + "}";
10131007
}
10141008

10151009
}

0 commit comments

Comments
 (0)