iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10515 from freelansam/JAVA-4611 

JAVA-4611: Update deprecations in spring-boot-rest module
This commit is contained in:
Loredana Crusoveanu 2021-02-25 09:00:22 +02:00 committed by GitHub
parent ad391e8c24 9d7a90cab9
commit 5eeccb19cd
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-rest/src/main/java/com/baeldung/web/controller/CustomerController.java
View File

@ -50,7 +50,7 @@ public class CustomerController {
} }
Link link = linkTo(methodOn(CustomerController.class).getOrdersForCustomer(customerId)).withSelfRel(); Link link = linkTo(methodOn(CustomerController.class).getOrdersForCustomer(customerId)).withSelfRel();
CollectionModel<Order> result = new CollectionModel<>(orders, link); CollectionModel<Order> result = CollectionModel.of(orders, link);
return result; return result;
} }
@ -72,7 +72,7 @@ public class CustomerController {
} }
Link link = linkTo(CustomerController.class).withSelfRel(); Link link = linkTo(CustomerController.class).withSelfRel();
CollectionModel<Customer> result = new CollectionModel<>(allCustomers, link); CollectionModel<Customer> result = CollectionModel.of(allCustomers, link);
return result; return result;
} }

2
spring-boot-rest/src/test/java/com/baeldung/controllers/ExamplePostControllerRequestIntegrationTest.java
View File

@ -33,7 +33,7 @@ public class ExamplePostControllerRequestIntegrationTest {
@Before @Before
public void preTest() { public void preTest() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.openMocks(this);
mockMvc = MockMvcBuilders mockMvc = MockMvcBuilders
.standaloneSetup(exampleController) .standaloneSetup(exampleController)
.build(); .build();

2
spring-boot-rest/src/test/java/com/baeldung/controllers/ExamplePostControllerResponseIntegrationTest.java
View File

@ -34,7 +34,7 @@ public class ExamplePostControllerResponseIntegrationTest {
@Before @Before
public void preTest() { public void preTest() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.openMocks(this);
mockMvc = MockMvcBuilders mockMvc = MockMvcBuilders
.standaloneSetup(exampleController) .standaloneSetup(exampleController)
.build(); .build();

2
spring-boot-rest/src/test/java/com/baeldung/web/StudentControllerIntegrationTest.java
View File

@ -8,12 +8,10 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.server.MediaTypeNotSupportedStatusException;
import com.baeldung.web.controller.students.Student; import com.baeldung.web.controller.students.Student;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;