Browse Source

Allow setting ApiVersionInserter to null

It should be possible to reset this, e.g. after call to mutate
a client or a test client.
pull/35588/head
rstoyanchev 2 months ago
parent
commit
e0b8cb4fe2
  1. 2
      spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java
  2. 2
      spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
  3. 2
      spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java
  4. 2
      spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java
  5. 2
      spring-test/src/main/java/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilder.java
  6. 2
      spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
  7. 2
      spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
  8. 2
      spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java
  9. 2
      spring-web/src/main/java/org/springframework/web/client/RestClient.java
  10. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
  11. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java

2
spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClientBuilder.java

@ -215,7 +215,7 @@ class DefaultWebTestClientBuilder implements WebTestClient.Builder { @@ -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;
}

2
spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java

@ -453,7 +453,7 @@ public interface WebTestClient { @@ -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.

2
spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java

@ -118,7 +118,7 @@ class DefaultRestTestClientBuilder<B extends RestTestClient.Builder<B>> implemen @@ -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();
}

2
spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java

@ -268,7 +268,7 @@ public interface RestTestClient { @@ -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.

2
spring-test/src/main/java/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilder.java

@ -502,7 +502,7 @@ public abstract class AbstractMockHttpServletRequestBuilder<B extends AbstractMo @@ -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();
}

2
spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java

@ -111,7 +111,7 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B> @@ -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();
}

2
spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java

@ -86,7 +86,7 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder @@ -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

2
spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java

@ -279,7 +279,7 @@ final class DefaultRestClientBuilder implements RestClient.Builder { @@ -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;
}

2
spring-web/src/main/java/org/springframework/web/client/RestClient.java

@ -353,7 +353,7 @@ public interface RestClient { @@ -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.

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java

@ -205,7 +205,7 @@ final class DefaultWebClientBuilder implements WebClient.Builder { @@ -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;
}

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java

@ -271,7 +271,7 @@ public interface WebClient { @@ -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.

Loading…
Cancel
Save