Merge branch 'spring-cloud:main' into fix-url-validation

Author: HyeongDo-Myeong

pom.xml

@@ -25,7 +25,7 @@
 	</scm>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
-		<jackson.version>2.18.3</jackson.version>
+		<jackson.version>2.19.0</jackson.version>
 		<spring-cloud-commons.version>4.3.0-SNAPSHOT</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->

spring-cloud-openfeign-core/pom.xml

@@ -174,7 +174,7 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.25.5</version>
+			<version>3.25.7</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -191,7 +191,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.18.0</version>
+			<version>2.19.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import feign.Client;
 import feign.Feign;
 import feign.Logger;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -65,7 +64,7 @@ void testBuilderCustomizer() {
 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		clientFactoryBean.getTarget();
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
+		assertThat(feignBuilderCaptor.getValue()).isNotNull();
 		Feign.Builder builder = feignBuilderCaptor.getValue();
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.HEADERS);
 		assertFeignBuilderField(builder, "dismiss404", true);
@@ -92,7 +91,7 @@ void testBuildCustomizerOrdered() {
 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		clientFactoryBean.getTarget();
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
+		assertThat(feignBuilderCaptor.getValue()).isNotNull();
 		Feign.Builder builder = feignBuilderCaptor.getValue();
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.FULL);
 		assertFeignBuilderField(builder, "dismiss404", true);
@@ -113,7 +112,7 @@ void testBuildCustomizerOrderedWithAdditional() {
 		clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode);
 		clientFactoryBean.getTarget();
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
+		assertThat(feignBuilderCaptor.getValue()).isNotNull();
 		Feign.Builder builder = feignBuilderCaptor.getValue();
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.BASIC);
 		assertFeignBuilderField(builder, "dismiss404", true);
@@ -134,7 +133,7 @@ void testBuildCustomizerWithCustomHttpClient(Class configClass) {
 		clientFactoryBean.addCustomizer(builder -> builder.client(customClientMock));
 		clientFactoryBean.getTarget();
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
+		assertThat(feignBuilderCaptor.getValue()).isNotNull();
 		Feign.Builder builder = feignBuilderCaptor.getValue();
 		assertFeignBuilderField(builder, "client", customClientMock);
 

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/proto/ProtobufTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,40 +15,12 @@
  */
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: protobuf_test.proto
+// source: request.proto
 
 package org.springframework.cloud.openfeign.encoding.proto;
 
 public final class ProtobufTest {
 
-	static final com.google.protobuf.Descriptors.Descriptor internal_static_Request_descriptor;
-	static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_Request_fieldAccessorTable;
-
-	private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-	static {
-		String[] descriptorData = { """
-
-				\023protobuf_test.proto""
-				\007Request\022
-
-				\002id\030\001 \001(\005\022\013
-				\003msg\030\002 \001(\tB\024
-				\020feign.httpclientP\001b\006proto3""" };
-		com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-			public com.google.protobuf.ExtensionRegistry assignDescriptors(
-					com.google.protobuf.Descriptors.FileDescriptor root) {
-				descriptor = root;
-				return null;
-			}
-		};
-		com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
-				new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
-		internal_static_Request_descriptor = getDescriptor().getMessageTypes().get(0);
-		internal_static_Request_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-				internal_static_Request_descriptor, new String[] { "Id", "Msg", });
-	}
-
 	private ProtobufTest() {
 	}
 
@@ -59,10 +31,30 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
 		registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
 	}
 
+	static final com.google.protobuf.Descriptors.Descriptor internal_static_org_springframework_cloud_openfeign_encoding_proto_Request_descriptor;
+	static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_org_springframework_cloud_openfeign_encoding_proto_Request_fieldAccessorTable;
+
 	public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 		return descriptor;
 	}
 
+	private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
+
+	static {
+		String[] descriptorData = {
+				"\n\rrequest.proto\0222org.springframework.clo" + "ud.openfeign.encoding.proto\"\"\n\007Request\022\n"
+						+ "\n\002id\030\001 \001(\005\022\013\n\003msg\030\002 \001(\tBD\n2org.springfra"
+						+ "mework.cloud.openfeign.encoding.protoB\014P" + "rotobufTestP\001b\006proto3" };
+		descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
+				new com.google.protobuf.Descriptors.FileDescriptor[] {});
+		internal_static_org_springframework_cloud_openfeign_encoding_proto_Request_descriptor = getDescriptor()
+			.getMessageTypes()
+			.get(0);
+		internal_static_org_springframework_cloud_openfeign_encoding_proto_Request_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+				internal_static_org_springframework_cloud_openfeign_encoding_proto_Request_descriptor,
+				new String[] { "Id", "Msg", });
+	}
+
 	// @@protoc_insertion_point(outer_class_scope)
 
 }