Browse Source

Move ReactorResourceFactory to org.springframework.http.client package

Closes gh-31399
pull/31413/head
Sébastien Deleuze 1 year ago
parent
commit
e0ba42a80c
  1. 1
      spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java
  2. 2
      spring-web/src/main/java/org/springframework/http/client/ReactorResourceFactory.java
  3. 1
      spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
  4. 1
      spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ResourceFactory.java
  5. 1
      spring-web/src/test/java/org/springframework/http/client/ReactorNettyClientHttpRequestFactoryTests.java
  6. 2
      spring-web/src/test/java/org/springframework/http/client/reactive/ReactorClientHttpConnectorTests.java
  7. 2
      spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java
  8. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java

1
spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java

@ -30,7 +30,6 @@ import reactor.netty.resources.LoopResources; @@ -30,7 +30,6 @@ import reactor.netty.resources.LoopResources;
import org.springframework.context.SmartLifecycle;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.reactive.ReactorResourceFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;

2
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorResourceFactory.java → spring-web/src/main/java/org/springframework/http/client/ReactorResourceFactory.java

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.http.client.reactive;
package org.springframework.http.client;
import java.time.Duration;
import java.util.function.Consumer;

1
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java

@ -31,6 +31,7 @@ import reactor.netty.resources.LoopResources; @@ -31,6 +31,7 @@ import reactor.netty.resources.LoopResources;
import org.springframework.context.SmartLifecycle;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.ReactorResourceFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;

1
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorNetty2ResourceFactory.java

@ -26,6 +26,7 @@ import reactor.netty5.resources.LoopResources; @@ -26,6 +26,7 @@ import reactor.netty5.resources.LoopResources;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.http.client.ReactorResourceFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;

1
spring-web/src/test/java/org/springframework/http/client/ReactorNettyClientHttpRequestFactoryTests.java

@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test; @@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
import reactor.netty.http.client.HttpClient;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.reactive.ReactorResourceFactory;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-web/src/test/java/org/springframework/http/client/reactive/ReactorClientHttpConnectorTests.java

@ -21,6 +21,8 @@ import java.util.function.Function; @@ -21,6 +21,8 @@ import java.util.function.Function;
import org.junit.jupiter.api.Test;
import reactor.netty.http.client.HttpClient;
import org.springframework.http.client.ReactorResourceFactory;
import static org.assertj.core.api.Assertions.assertThat;
/**

2
spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java

@ -24,6 +24,8 @@ import reactor.netty.http.HttpResources; @@ -24,6 +24,8 @@ import reactor.netty.http.HttpResources;
import reactor.netty.resources.ConnectionProvider;
import reactor.netty.resources.LoopResources;
import org.springframework.http.client.ReactorResourceFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java

@ -38,8 +38,8 @@ import org.springframework.core.testfixture.io.buffer.AbstractDataBufferAllocati @@ -38,8 +38,8 @@ import org.springframework.core.testfixture.io.buffer.AbstractDataBufferAllocati
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ReactorResourceFactory;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.http.client.reactive.ReactorResourceFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;

Loading…
Cancel
Save