Skip to content

Commit 6b0a962

Browse files
amit2103amit2103
committed
[BAEL-14088] - Moved code for RequestBody and ResponseBody annotations article
1 parent 9df9056 commit 6b0a962

File tree

9 files changed

+26
-23
lines changed

9 files changed

+26
-23
lines changed

spring-rest/src/main/java/com/baeldung/sampleapp/config/RestClientConfig.java renamed to spring-boot-rest/src/main/java/com/baeldung/config/RestClientConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.sampleapp.config;
1+
package com.baeldung.config;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -9,7 +9,7 @@
99
import org.springframework.util.CollectionUtils;
1010
import org.springframework.web.client.RestTemplate;
1111

12-
import com.baeldung.sampleapp.interceptors.RestTemplateHeaderModifierInterceptor;
12+
import com.baeldung.interceptors.RestTemplateHeaderModifierInterceptor;
1313

1414
@Configuration
1515
public class RestClientConfig {

spring-rest/src/main/java/com/baeldung/sampleapp/interceptors/RestTemplateHeaderModifierInterceptor.java renamed to spring-boot-rest/src/main/java/com/baeldung/interceptors/RestTemplateHeaderModifierInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.sampleapp.interceptors;
1+
package com.baeldung.interceptors;
22

33
import java.io.IOException;
44

spring-rest/src/main/java/com/baeldung/services/ExampleService.java renamed to spring-boot-rest/src/main/java/com/baeldung/services/ExampleService.java

File renamed without changes.

spring-rest/src/main/java/com/baeldung/transfer/LoginForm.java renamed to spring-boot-rest/src/main/java/com/baeldung/transfer/LoginForm.java

File renamed without changes.

spring-rest/src/main/java/com/baeldung/transfer/ResponseTransfer.java renamed to spring-boot-rest/src/main/java/com/baeldung/transfer/ResponseTransfer.java

File renamed without changes.

spring-rest/src/main/java/com/baeldung/controllers/ExamplePostController.java renamed to spring-boot-rest/src/main/java/com/baeldung/web/controller/ExamplePostController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.controllers;
1+
package com.baeldung.web.controller;
22

33
import com.baeldung.services.ExampleService;
44
import com.baeldung.transfer.ResponseTransfer;

spring-rest/src/test/java/com/baeldung/controllers/ExamplePostControllerRequestIntegrationTest.java renamed to spring-boot-rest/src/test/java/com/baeldung/controllers/ExamplePostControllerRequestIntegrationTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.baeldung.controllers;
22

3-
import com.baeldung.sampleapp.config.MainApplication;
4-
import com.baeldung.services.ExampleService;
5-
import com.baeldung.transfer.LoginForm;
3+
import static org.mockito.Mockito.when;
4+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
5+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
6+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
7+
68
import org.junit.Before;
79
import org.junit.Test;
810
import org.junit.runner.RunWith;
@@ -14,13 +16,13 @@
1416
import org.springframework.test.web.servlet.MockMvc;
1517
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
1618

17-
import static org.mockito.Mockito.when;
18-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
19-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
20-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
19+
import com.baeldung.SpringBootRestApplication;
20+
import com.baeldung.services.ExampleService;
21+
import com.baeldung.transfer.LoginForm;
22+
import com.baeldung.web.controller.ExamplePostController;
2123

2224
@RunWith(SpringRunner.class)
23-
@SpringBootTest(classes = MainApplication.class)
25+
@SpringBootTest(classes = SpringBootRestApplication.class)
2426
public class ExamplePostControllerRequestIntegrationTest {
2527

2628
MockMvc mockMvc;

spring-rest/src/test/java/com/baeldung/controllers/ExamplePostControllerResponseIntegrationTest.java renamed to spring-boot-rest/src/test/java/com/baeldung/controllers/ExamplePostControllerResponseIntegrationTest.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.baeldung.controllers;
22

3-
import com.baeldung.sampleapp.config.MainApplication;
4-
import com.baeldung.services.ExampleService;
5-
import com.baeldung.transfer.LoginForm;
3+
import static org.mockito.Mockito.when;
4+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
5+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
6+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
7+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
8+
69
import org.junit.Before;
710
import org.junit.Test;
811
import org.junit.runner.RunWith;
@@ -11,18 +14,16 @@
1114
import org.mockito.MockitoAnnotations;
1215
import org.springframework.boot.test.context.SpringBootTest;
1316
import org.springframework.test.context.junit4.SpringRunner;
14-
1517
import org.springframework.test.web.servlet.MockMvc;
1618
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
1719

18-
import static org.mockito.Mockito.when;
19-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
20-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
21-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
22-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
20+
import com.baeldung.SpringBootRestApplication;
21+
import com.baeldung.services.ExampleService;
22+
import com.baeldung.transfer.LoginForm;
23+
import com.baeldung.web.controller.ExamplePostController;
2324

2425
@RunWith(SpringRunner.class)
25-
@SpringBootTest(classes = MainApplication.class)
26+
@SpringBootTest(classes = SpringBootRestApplication.class)
2627
public class ExamplePostControllerResponseIntegrationTest {
2728

2829
MockMvc mockMvc;

spring-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java renamed to spring-boot-rest/src/test/java/com/baeldung/resttemplate/RestTemplateLiveTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1717
import org.springframework.web.client.RestTemplate;
1818

19-
import com.baeldung.sampleapp.config.RestClientConfig;
19+
import com.baeldung.config.RestClientConfig;
2020
import com.baeldung.transfer.LoginForm;
2121

2222
@RunWith(SpringJUnit4ClassRunner.class)

0 commit comments

Comments
 (0)