Skip to content

Commit 5afbec7

Browse files
committed
Correct package in spring-boot-resttestclient to match module name
See gh-46356 See gh-47322
1 parent fd2b29d commit 5afbec7

File tree

96 files changed

+172
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+172
-173
lines changed

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/springbootapplications/withmockenvironment/MyMockMvcTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.beans.factory.annotation.Autowired;
22+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient;
2223
import org.springframework.boot.test.context.SpringBootTest;
23-
import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureRestTestClient;
2424
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
2525
import org.springframework.test.web.reactive.server.WebTestClient;
2626
import org.springframework.test.web.servlet.MockMvc;

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/springbootapplications/withrunningserver/MyRandomPortRestTestClientTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.beans.factory.annotation.Autowired;
22+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient;
2223
import org.springframework.boot.test.context.SpringBootTest;
2324
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
24-
import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureRestTestClient;
2525
import org.springframework.test.web.servlet.client.RestTestClient;
2626

2727
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/springbootapplications/withrunningserver/MyRandomPortTestRestTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.beans.factory.annotation.Autowired;
22+
import org.springframework.boot.resttestclient.TestRestTemplate;
2223
import org.springframework.boot.test.context.SpringBootTest;
2324
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
24-
import org.springframework.boot.testrestclient.TestRestTemplate;
2525

2626
import static org.assertj.core.api.Assertions.assertThat;
2727

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/utilities/testresttemplate/MySpringBootTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.boot.restclient.RestTemplateBuilder;
25+
import org.springframework.boot.resttestclient.TestRestTemplate;
26+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
2527
import org.springframework.boot.test.context.SpringBootTest;
2628
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2729
import org.springframework.boot.test.context.TestConfiguration;
28-
import org.springframework.boot.testrestclient.TestRestTemplate;
29-
import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureTestRestTemplate;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.http.HttpHeaders;
3232

documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/testing/utilities/testresttemplate/MyTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.junit.jupiter.api.Test;
2020

21-
import org.springframework.boot.testrestclient.TestRestTemplate;
21+
import org.springframework.boot.resttestclient.TestRestTemplate;
2222
import org.springframework.http.ResponseEntity;
2323

2424
import static org.assertj.core.api.Assertions.assertThat;

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/springbootapplications/withmockenvironment/MyMockMvcTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.springframework.beans.factory.annotation.Autowired
2222
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
23-
import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureRestTestClient
23+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient
2424
import org.springframework.boot.test.context.SpringBootTest
2525
import org.springframework.test.web.reactive.server.WebTestClient
2626
import org.springframework.test.web.reactive.server.expectBody

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/springbootapplications/withrunningserver/MyRandomPortTestRestTemplateTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test
2121
import org.springframework.beans.factory.annotation.Autowired
2222
import org.springframework.boot.test.context.SpringBootTest
2323
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment
24-
import org.springframework.boot.testrestclient.TestRestTemplate
24+
import org.springframework.boot.resttestclient.TestRestTemplate
2525

2626
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
2727
class MyRandomPortTestRestTemplateTests {

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/utilities/testresttemplate/MySpringBootTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import org.springframework.boot.test.context.SpringBootTest
2323
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment
2424
import org.springframework.boot.test.context.TestConfiguration
2525
import org.springframework.boot.restclient.RestTemplateBuilder
26-
import org.springframework.boot.testrestclient.TestRestTemplate
27-
import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureTestRestTemplate
26+
import org.springframework.boot.resttestclient.TestRestTemplate
27+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate
2828
import org.springframework.context.annotation.Bean
2929
import java.time.Duration
3030

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/testing/utilities/testresttemplate/MyTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.springframework.boot.docs.testing.utilities.testresttemplate
1818

1919
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
21-
import org.springframework.boot.testrestclient.TestRestTemplate
21+
import org.springframework.boot.resttestclient.TestRestTemplate
2222

2323
class MyTests {
2424

integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.beans.factory.annotation.Value;
26+
import org.springframework.boot.resttestclient.TestRestTemplate;
27+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
2628
import org.springframework.boot.test.context.SpringBootTest;
2729
import org.springframework.boot.test.web.server.LocalServerPort;
28-
import org.springframework.boot.testrestclient.TestRestTemplate;
29-
import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureTestRestTemplate;
3030
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
3131
import org.springframework.boot.web.context.reactive.ReactiveWebApplicationContext;
3232
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;

0 commit comments

Comments
 (0)