spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 22:19:03 +00:00
Code Issues Projects Releases Wiki Activity

Allow setting ApiVersionInserter to null

Browse Source 
It should be possible to reset this, e.g. after call to mutate
a client or a test client.
This commit is contained in:
rstoyanchev
2025-10-08 13:52:14 +01:00
parent 03e379b070
commit e0b8cb4fe2
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java
+1 -1
View File
@@ -215,7 +215,7 @@ class DefaultWebTestClientBuilder implements WebTestClient.Builder {
}
@Override
public WebTestClient.Builder apiVersionInserter(ApiVersionInserter apiVersionInserter) {
public WebTestClient.Builder apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter) {
this.apiVersionInserter = apiVersionInserter;
return this;
}
spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+1 -1
View File
@@ -453,7 +453,7 @@ public interface WebTestClient {
* @param apiVersionInserter the inserter to use
* @since 7.0
*/
Builder apiVersionInserter(ApiVersionInserter apiVersionInserter);
Builder apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter);
/**
* Add the given filter to the filter chain.
spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java
+1 -1
View File
@@ -118,7 +118,7 @@ class DefaultRestTestClientBuilder<B extends RestTestClient.Builder<B>> implemen
}
@Override
public <T extends B> T apiVersionInserter(ApiVersionInserter apiVersionInserter) {
public <T extends B> T apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter) {
this.restClientBuilder.apiVersionInserter(apiVersionInserter);
return self();
}
spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java
+1 -1
View File
@@ -268,7 +268,7 @@ public interface RestTestClient {
* of {@link ApiVersionInserter} for a list of choices.
* @param apiVersionInserter the inserter to use
*/
<T extends B> T apiVersionInserter(ApiVersionInserter apiVersionInserter);
<T extends B> T apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter);
/**
* Add the given request interceptor to the end of the interceptor chain.
spring-test/src/main/java/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilder.java
+1 -1
View File
@@ -502,7 +502,7 @@ public abstract class AbstractMockHttpServletRequestBuilder<B extends AbstractMo
* @param versionInserter the inserter to use
* @since 7.0
*/
public B apiVersionInserter(ApiVersionInserter versionInserter) {
public B apiVersionInserter(@Nullable ApiVersionInserter versionInserter) {
this.versionInserter = versionInserter;
return self();
}
spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
+1 -1
View File
@@ -111,7 +111,7 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>
}
@Override
public <T extends B> T apiVersionInserter(ApiVersionInserter versionInserter) {
public <T extends B> T apiVersionInserter(@Nullable ApiVersionInserter versionInserter) {
this.apiVersionInserter = versionInserter;
return self();
}
spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+1 -1
View File
@@ -86,7 +86,7 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
* @param versionInserter the inserter to use
* @since 7.0
*/
<T extends B> T apiVersionInserter(ApiVersionInserter versionInserter);
<T extends B> T apiVersionInserter(@Nullable ApiVersionInserter versionInserter);
/**
* Define default request properties that should be merged into all
spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java
+1 -1
View File
@@ -279,7 +279,7 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
}
@Override
public RestClient.Builder apiVersionInserter(ApiVersionInserter apiVersionInserter) {
public RestClient.Builder apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter) {
this.apiVersionInserter = apiVersionInserter;
return this;
}
spring-web/src/main/java/org/springframework/web/client/RestClient.java
+1 -1
View File
@@ -353,7 +353,7 @@ public interface RestClient {
* @param apiVersionInserter the inserter to use
* @since 7.0
*/
Builder apiVersionInserter(ApiVersionInserter apiVersionInserter);
Builder apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter);
/**
* Provide a consumer to customize every request being built.
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
+1 -1
View File
@@ -205,7 +205,7 @@ final class DefaultWebClientBuilder implements WebClient.Builder {
}
@Override
public WebClient.Builder apiVersionInserter(ApiVersionInserter apiVersionInserter) {
public WebClient.Builder apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter) {
this.apiVersionInserter = apiVersionInserter;
return this;
}
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+1 -1
View File
@@ -271,7 +271,7 @@ public interface WebClient {
* @param apiVersionInserter the inserter to use
* @since 7.0
*/
Builder apiVersionInserter(ApiVersionInserter apiVersionInserter);
Builder apiVersionInserter(@Nullable ApiVersionInserter apiVersionInserter);
/**
* Provide a consumer to customize every request being built.