From 535cdc013705760b30ce31e646b749745fcb3bbe Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
Date: Thu, 13 Mar 2025 13:43:34 +0100
Subject: [PATCH] Simplify private method signatures and checks.

---
 .../openfeign/support/SpringMvcContract.java  | 28 ++++++++-----------
 .../support/SpringMvcContractTests.java       |  8 +-----
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java
index 5bf64653..2b536cc0 100644
--- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java
+++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java
@@ -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 -> {
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java
index 0266a5ec..67df1df1 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java
@@ -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 + "}";
 		}
 
 	}