Merge remote-tracking branch 'origin/4.2.x'

OlgaMaciaszek · OlgaMaciaszek · commit 81c16c9abb75 · 2025-03-18T14:58:51.000+01:00
# Conflicts:
#	README.adoc
diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/SpringQueryMap.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/SpringQueryMap.java
@@ -26,6 +26,8 @@
  *
  * @author Aram Peres
  * @see feign.QueryMap
+ * @see feign.QueryMapEncoder
+ * @see org.springframework.cloud.openfeign.FeignClientsConfiguration
  * @see org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor
  */
 @Retention(RetentionPolicy.RUNTIME)

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Aram Peres`
`28`	`28`	`* @see feign.QueryMap`
	`29`	`+ * @see feign.QueryMapEncoder`
	`30`	`+ * @see org.springframework.cloud.openfeign.FeignClientsConfiguration`
`29`	`31`	`* @see org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor`
`30`	`32`	`*/`
`31`	`33`	`@Retention(RetentionPolicy.RUNTIME)`