.github/dependabot.yml

@@ -10,6 +10,11 @@ updates:
     target-branch: "4.0.x" # oldest OSS supported branch
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "4.1.x"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     target-branch: "main"
@@ -37,6 +42,17 @@ updates:
         update-types:
           - version-update:semver-major
           - version-update:semver-minor
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 4.1.x
+    ignore:
+      # only upgrade patch versions for maintenance branch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
   - package-ecosystem: maven
     directory: /
     schedule:
@@ -47,3 +63,18 @@ updates:
       - dependency-name: "*"
         update-types:
           - version-update:semver-major
+  - package-ecosystem: npm
+    target-branch: docs-build
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: npm
+    target-branch: main
+    directory: /docs
+    schedule:
+      interval: weekly
+  - package-ecosystem: npm
+    target-branch: 4.1.x
+    directory: /docs
+    schedule:
+      interval: weekly

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 4.1.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 4.1.x ]
 
 jobs:
   build:

docs/modules/ROOT/pages/spring-cloud-openfeign.adoc

@@ -74,6 +74,8 @@ TIP: To use `@EnableFeignClients` annotation on `@Configuration`-annotated-class
 or list them explicitly:
 `@EnableFeignClients(clients = InventoryServiceFeignClient.class)`.
 
+In order to load Spring Feign client beans in a multi-module setup, you need to specify the packages directly.
+
 WARNING: Since `FactoryBean` objects may be instantiated before the initial context refresh should take place, and the instantiation of Spring Cloud OpenFeign Clients triggers a context refresh, they should not be declared within `FactoryBean` classes.
 
 [[attribute-resolution-mode]]
@@ -88,12 +90,12 @@ TIP: For Spring Cloud Contract test integration, lazy attribute resolution shoul
 [[spring-cloud-feign-overriding-defaults]]
 === Overriding Feign Defaults
 
-A central concept in Spring Cloud's Feign support is that of the named client. Each feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the `@FeignClient` annotation. Spring Cloud creates a new ensemble as an
+A central concept in Spring Cloud's Feign support is that of the named client. Each Feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the `@FeignClient` annotation. Spring Cloud creates a new ensemble as an
 `ApplicationContext` on demand for each named client using `FeignClientsConfiguration`. This contains (amongst other things) an `feign.Decoder`, a `feign.Encoder`, and a `feign.Contract`.
 It is possible to override the name of that ensemble by using the `contextId`
 attribute of the `@FeignClient` annotation.
 
-Spring Cloud lets you take full control of the feign client by declaring additional configuration (on top of the `FeignClientsConfiguration`) using `@FeignClient`. Example:
+Spring Cloud lets you take full control of the Feign client by declaring additional configuration (on top of the `FeignClientsConfiguration`) using `@FeignClient`. Example:
 
 [source,java,indent=0]
 ----
@@ -134,7 +136,7 @@ Spring Cloud OpenFeign provides the following beans by default for feign (`BeanT
 * `Contract` feignContract: `SpringMvcContract`
 * `Feign.Builder` feignBuilder: `FeignCircuitBreaker.Builder`
 * `Client` feignClient: If Spring Cloud LoadBalancer is on the classpath, `FeignBlockingLoadBalancerClient` is used.
-If none of them is on the classpath, the default feign client is used.
+If none of them is on the classpath, the default Feign client is used.
 
 NOTE: `spring-cloud-starter-openfeign` supports `spring-cloud-starter-loadbalancer`. However, as is an optional dependency, you need to make sure it has been added to your project if you want to use it.
 
@@ -148,7 +150,7 @@ If you can not configure Apache HttpClient 5 by using properties, there is an `H
 
 TIP: Starting with Spring Cloud OpenFeign 4, the Feign Apache HttpClient 4 is no longer supported. We suggest using Apache HttpClient 5 instead.
 
-Spring Cloud OpenFeign _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:
+Spring Cloud OpenFeign _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the Feign client:
 
 * `Logger.Level`
 * `Retryer`
@@ -221,7 +223,7 @@ spring:
 `feignName` in this example refers to `@FeignClient` `value`, that is also aliased with `@FeignClient` `name` and `@FeignClient` `contextId`. In a load-balanced scenario, it also corresponds to the `serviceId` of the server app that will be used to retrieve the instances. The specified classes for decoders, retryer and other ones must have a bean in the Spring context or have a default constructor.
 
 
-Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ feign clients.
+Default configurations can be specified in the `@EnableFeignClients` attribute `defaultConfiguration` in a similar manner as described above. The difference is that this configuration will apply to _all_ Feign clients.
 
 If you prefer using configuration properties to configure all `@FeignClient`, you can create configuration properties with `default` feign name.
 
@@ -245,7 +247,7 @@ If we create both `@Configuration` bean and configuration properties, configurat
 It will override `@Configuration` values. But if you want to change the priority to `@Configuration`,
 you can change `spring.cloud.openfeign.client.default-to-properties` to `false`.
 
-If we want to create multiple feign clients with the same name or url
+If we want to create multiple Feign clients with the same name or url
 so that they would point to the same server but each with a different custom configuration then
 we have to use `contextId` attribute of the `@FeignClient` in order to avoid name
 collision of these configuration beans.
@@ -351,7 +353,7 @@ NOTE: `PROD-SVC` is the name of the service the Clients will be making requests
 
 NOTE: The Feign `Contract` object defines what annotations and values are valid on interfaces. The
 autowired `Contract` bean provides supports for SpringMVC annotations, instead of
-the default Feign native annotations.
+the default Feign native annotations. It is not recommended to mix the Spring MVC annotations and the native Feign annotations together.
 
 You can also use the `Builder`to configure FeignClient not to inherit beans from the parent context.
 You can do this by overriding calling `inheritParentContext(false)` on the `Builder`.
@@ -562,7 +564,7 @@ public interface UserClient extends UserService {
 
 WARNING: `@FeignClient` interfaces should not be shared between server and client and annotating `@FeignClient` interfaces with `@RequestMapping` on class level is no longer supported.
 
-[[feign-request/response-compression]]
+[[feign-request-response-compression]]
 === Feign request/response compression
 
 You may consider enabling the request or response GZIP compression for your
@@ -585,6 +587,9 @@ spring.cloud.openfeign.compression.request.min-request-size=2048
 
 These properties allow you to be selective about the compressed media types and minimum request threshold length.
 
+When the request matches the mime type set in `spring.cloud.openfeign.compression.request.mime-types` and the size set in `spring.cloud.openfeign.compression.request.min-request-size`, `spring.cloud.openfeign.compression.request.enabled=true` results in compression headers being added to the request.
+The functionality of the headers is to signal to the server that a compressed body is expected by the client. It is the responsibility of the server-side app to provide the compressed body based on the headers provided by the client.
+
 TIP: Since the OkHttpClient uses "transparent" compression, that is disabled if the `content-encoding` or `accept-encoding` header is present, we do not enable compression when `feign.okhttp.OkHttpClient` is present on the classpath and `spring.cloud.openfeign.okhttp.enabled` is set to `true`.
 
 [[feign-logging]]
@@ -753,7 +758,7 @@ public class Params {
 }
 ----
 
-The following feign client uses the `Params` class by using the `@SpringQueryMap` annotation:
+The following Feign client uses the `Params` class by using the `@SpringQueryMap` annotation:
 
 [source,java,indent=0]
 ----
@@ -840,13 +845,10 @@ protected interface DemoFeignClient {
 
 [[reactive-support]]
 === Reactive Support
-As the https://github.com/OpenFeign/feign[OpenFeign project] does not currently support reactive clients, such as https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html[Spring WebClient], neither does Spring Cloud OpenFeign.
+As at the time of active development of Spring Cloud OpenFeign, the https://github.com/OpenFeign/feign[OpenFeign project] did not support reactive clients, such as https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html[Spring WebClient], such support could not be added to Spring Cloud OpenFeign either.
 
 Since Spring Cloud OpenFeign project is now considered feature-complete, we're not planning on adding support even if it becomes available in the upstream project. We suggest migrating over to https://docs.spring.io/spring-framework/reference/integration/rest-clients.html#rest-http-interface[Spring Interface Clients] instead. Both blocking and reactive stacks are supported there.
 
-
-Until that is done, we recommend using https://github.com/Playtika/feign-reactive[feign-reactive] for Spring WebClient support.
-
 [[early-initialization-errors]]
 ==== Early Initialization Errors
 

docs/modules/ROOT/partials/_configprops.adoc

@@ -65,14 +65,15 @@
 |spring.cloud.loadbalancer.subset.size | `+++100+++` | Max subset size of deterministic subsetting.
 |spring.cloud.loadbalancer.x-forwarded.enabled | `+++false+++` | To Enable X-Forwarded Headers.
 |spring.cloud.openfeign.autoconfiguration.jackson.enabled | `+++true+++` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
-|spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled | `+++false+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.
+|spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled | `+++true+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.
 |spring.cloud.openfeign.circuitbreaker.enabled | `+++false+++` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker.
 |spring.cloud.openfeign.circuitbreaker.group.enabled | `+++false+++` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with group.
 |spring.cloud.openfeign.client.config |  | 
 |spring.cloud.openfeign.client.decode-slash | `+++true+++` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`.
 |spring.cloud.openfeign.client.default-config | `+++default+++` | 
 |spring.cloud.openfeign.client.default-to-properties | `+++true+++` | 
 |spring.cloud.openfeign.client.refresh-enabled | `+++false+++` | Enables options value refresh capability for Feign.
+|spring.cloud.openfeign.compression.request.content-encoding-types |  | The list of content encodings (applicable encodings depend on the used client).
 |spring.cloud.openfeign.compression.request.enabled | `+++false+++` | Enables the request sent by Feign to be compressed.
 |spring.cloud.openfeign.compression.request.mime-types | `+++[text/xml, application/xml, application/json]+++` | The list of supported mime types.
 |spring.cloud.openfeign.compression.request.min-request-size | `+++2048+++` | The minimum threshold content size.

docs/package.json

@@ -1,10 +1,10 @@
 {
 	"dependencies": {
-		"antora": "3.2.0-alpha.4",
+		"antora": "3.2.0-alpha.6",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-alpha.3",
+		"@antora/collector-extension": "1.0.0-beta.5",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
-		"@springio/antora-extensions": "1.11.1",
-		"@springio/asciidoctor-extensions": "1.0.0-alpha.10"
+		"@springio/antora-extensions": "1.14.2",
+		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
 	}
 }

docs/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.1.3</version>
+		<version>4.1.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>
@@ -30,12 +30,14 @@
 		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
 		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</micrometer-docs-generator.outputPath>
 	</properties>
+	<!--
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 	</dependencies>
+	-->
 	<build>
 		<sourceDirectory>src/main/asciidoc</sourceDirectory>
 	</build>

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>4.1.3</version>
+	<version>4.1.4</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.3</version>
+		<version>4.1.4</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -25,8 +25,8 @@
 	</scm>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
-		<jackson.version>2.17.1</jackson.version>
-		<spring-cloud-commons.version>4.1.4</spring-cloud-commons.version>
+		<jackson.version>2.17.3</jackson.version>
+		<spring-cloud-commons.version>4.1.5</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>4.1.3</version>
+		<version>4.1.4</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
@@ -91,23 +91,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>io.github.openfeign.form</groupId>
+			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-form-spring</artifactId>
-			<exclusions>
-<!--				Vulnerable in 3.8.0-->
-				<exclusion>
-					<groupId>commons-io</groupId>
-					<artifactId>commons-io</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-fileupload</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
@@ -183,13 +168,13 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.25.3</version>
+			<version>3.25.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.vavr</groupId>
 			<artifactId>vavr</artifactId>
-			<version>0.10.4</version>
+			<version>0.10.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -266,14 +266,20 @@ public okhttp3.OkHttpClient okHttpClient(okhttp3.OkHttpClient.Builder builder, C
 			int connectTimeout = httpClientProperties.getConnectionTimeout();
 			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
 			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
-			List<Protocol> protocols = httpClientProperties.getOkHttp().getProtocols().stream().map(Protocol::valueOf)
-					.collect(Collectors.toList());
+			List<Protocol> protocols = httpClientProperties.getOkHttp()
+				.getProtocols()
+				.stream()
+				.map(Protocol::valueOf)
+				.collect(Collectors.toList());
 			if (disableSslValidation) {
 				disableSsl(builder);
 			}
 			this.okHttpClient = builder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
-					.followRedirects(followRedirects).readTimeout(readTimeout).connectionPool(connectionPool)
-					.protocols(protocols).build();
+				.followRedirects(followRedirects)
+				.readTimeout(readTimeout)
+				.connectionPool(connectionPool)
+				.protocols(protocols)
+				.build();
 			return this.okHttpClient;
 		}
 
@@ -415,11 +421,12 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 		if (!ClassUtils.isPresent("feign.Feign", classLoader)) {
 			return;
 		}
-		hints.reflection().registerTypes(
-				Set.of(TypeReference.of(FeignClientFactoryBean.class),
-						TypeReference.of(ResponseInterceptor.Chain.class), TypeReference.of(Capability.class)),
-				hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
-						MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
+		hints.reflection()
+			.registerTypes(
+					Set.of(TypeReference.of(FeignClientFactoryBean.class),
+							TypeReference.of(ResponseInterceptor.Chain.class), TypeReference.of(Capability.class)),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+							MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
 	}
 
 }

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

@@ -108,9 +108,10 @@ private <T> T getFromContext(String fallbackMechanism, String feignClientName, F
 	}
 
 	private FeignCircuitBreaker.Builder builder(String feignClientName, FeignCircuitBreaker.Builder builder) {
-		return builder.circuitBreakerFactory(circuitBreakerFactory).feignClientName(feignClientName)
-				.circuitBreakerGroupEnabled(circuitBreakerGroupEnabled)
-				.circuitBreakerNameResolver(circuitBreakerNameResolver);
+		return builder.circuitBreakerFactory(circuitBreakerFactory)
+			.feignClientName(feignClientName)
+			.circuitBreakerGroupEnabled(circuitBreakerGroupEnabled)
+			.circuitBreakerNameResolver(circuitBreakerNameResolver);
 	}
 
 }

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

@@ -71,9 +71,9 @@ public <T> T getInstance(String contextName, String beanName, Class<T> type) {
 	public FeignClientFactory withApplicationContextInitializers(Map<String, Object> applicationContextInitializers) {
 		Map<String, ApplicationContextInitializer<GenericApplicationContext>> convertedInitializers = new HashMap<>();
 		applicationContextInitializers.keySet()
-				.forEach(contextId -> convertedInitializers.put(contextId,
-						(ApplicationContextInitializer<GenericApplicationContext>) applicationContextInitializers
-								.get(contextId)));
+			.forEach(contextId -> convertedInitializers.put(contextId,
+					(ApplicationContextInitializer<GenericApplicationContext>) applicationContextInitializers
+						.get(contextId)));
 		return new FeignClientFactory(convertedInitializers);
 	}