JAVA-29185 :- Upgrade Spring 5 to boot 3. (#16141)
This commit is contained in:
parent
bb3e43fdec
commit
68db1db5f0
|
@ -11,9 +11,9 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.baeldung</groupId>
|
<groupId>com.baeldung</groupId>
|
||||||
<artifactId>parent-boot-2</artifactId>
|
<artifactId>parent-boot-3</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
<relativePath>../parent-boot-2</relativePath>
|
<relativePath>../parent-boot-3</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -42,17 +42,25 @@
|
||||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.json.bind</groupId>
|
<groupId>jakarta.json.bind</groupId>
|
||||||
<artifactId>javax.json.bind-api</artifactId>
|
<artifactId>jakarta.json.bind-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.geronimo.specs</groupId>
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
<artifactId>geronimo-json_1.1_spec</artifactId>
|
<artifactId>geronimo-json_1.1_spec</artifactId>
|
||||||
<version>${geronimo-json_1.1_spec.version}</version>
|
<version>${geronimo-json_1.1_spec.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.json</groupId>
|
||||||
|
<artifactId>jakarta.json-api</artifactId>
|
||||||
|
<version>${jakarta.json-api.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.johnzon</groupId>
|
<groupId>org.apache.johnzon</groupId>
|
||||||
<artifactId>johnzon-jsonb</artifactId>
|
<artifactId>johnzon-jsonb</artifactId>
|
||||||
|
<version>${johnzon-jsonb.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- utils -->
|
<!-- utils -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -151,9 +159,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
|
<geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
|
||||||
<asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
|
<asciidoctor-plugin.version>2.2.6</asciidoctor-plugin.version>
|
||||||
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
|
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
|
||||||
<hikaricp.version>5.1.0</hikaricp.version>
|
<hikaricp.version>5.1.0</hikaricp.version>
|
||||||
|
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
|
||||||
|
<jakarta.json-api.version>2.0.1</jakarta.json-api.version>
|
||||||
|
<johnzon-jsonb.version>2.0.0</johnzon-jsonb.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
|
@ -109,11 +109,11 @@ public class Car {
|
||||||
car.startWithHasText("t");
|
car.startWithHasText("t");
|
||||||
car.startWithNotContain("132");
|
car.startWithNotContain("132");
|
||||||
|
|
||||||
List<String> repairPartsCollection = new ArrayList<String>();
|
List<String> repairPartsCollection = new ArrayList<>();
|
||||||
repairPartsCollection.add("part");
|
repairPartsCollection.add("part");
|
||||||
car.repair(repairPartsCollection);
|
car.repair(repairPartsCollection);
|
||||||
|
|
||||||
Map<String, String> repairPartsMap = new HashMap<String, String>();
|
Map<String, String> repairPartsMap = new HashMap<>();
|
||||||
repairPartsMap.put("1", "part");
|
repairPartsMap.put("1", "part");
|
||||||
car.repair(repairPartsMap);
|
car.repair(repairPartsMap);
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@ package com.baeldung.jsonb;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
import javax.json.bind.annotation.JsonbDateFormat;
|
import jakarta.json.bind.annotation.JsonbDateFormat;
|
||||||
import javax.json.bind.annotation.JsonbNumberFormat;
|
import jakarta.json.bind.annotation.JsonbNumberFormat;
|
||||||
import javax.json.bind.annotation.JsonbProperty;
|
import jakarta.json.bind.annotation.JsonbProperty;
|
||||||
import javax.json.bind.annotation.JsonbTransient;
|
import jakarta.json.bind.annotation.JsonbTransient;
|
||||||
|
|
||||||
public class Person {
|
public class Person {
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import jakarta.annotation.PostConstruct;
|
||||||
|
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
|
|
@ -5,7 +5,7 @@ import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
|
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
|
@ -53,7 +53,7 @@ public class CRUDController {
|
||||||
|
|
||||||
@PatchMapping("/{id}")
|
@PatchMapping("/{id}")
|
||||||
public List<CrudInput> patch(@PathVariable("id") long id, @RequestBody CrudInput crudInput) {
|
public List<CrudInput> patch(@PathVariable("id") long id, @RequestBody CrudInput crudInput) {
|
||||||
List<CrudInput> returnList = new ArrayList<CrudInput>();
|
List<CrudInput> returnList = new ArrayList<>();
|
||||||
crudInput.setId(id);
|
crudInput.setId(id);
|
||||||
returnList.add(crudInput);
|
returnList.add(crudInput);
|
||||||
return returnList;
|
return returnList;
|
||||||
|
|
|
@ -4,8 +4,8 @@ import java.net.URI;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import javax.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package com.baeldung.web;
|
package com.baeldung.web;
|
||||||
|
|
||||||
import javax.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import javax.persistence.GeneratedValue;
|
import jakarta.persistence.GeneratedValue;
|
||||||
import javax.persistence.GenerationType;
|
import jakarta.persistence.GenerationType;
|
||||||
import javax.persistence.Id;
|
import jakarta.persistence.Id;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
public class Foo {
|
public class Foo {
|
||||||
|
|
|
@ -7,9 +7,9 @@ import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import jakarta.annotation.PostConstruct;
|
||||||
import javax.validation.constraints.Max;
|
import jakarta.validation.constraints.Max;
|
||||||
import javax.validation.constraints.Min;
|
import jakarta.validation.constraints.Min;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@RestController("/foos")
|
@RestController("/foos")
|
||||||
|
|
|
@ -20,21 +20,21 @@ public class BeanRegistrationIntegrationTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenRegisterBean_thenOk() {
|
public void whenRegisterBean_thenOk() {
|
||||||
context.registerBean(MyService.class, () -> new MyService());
|
context.registerBean(MyService.class, MyService::new);
|
||||||
MyService myService = (MyService) context.getBean("com.baeldung.functional.MyService");
|
MyService myService = (MyService) context.getBean("com.baeldung.functional.MyService");
|
||||||
assertTrue(myService.getRandomNumber() < 10);
|
assertTrue(myService.getRandomNumber() < 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenRegisterBeanWithName_thenOk() {
|
public void whenRegisterBeanWithName_thenOk() {
|
||||||
context.registerBean("mySecondService", MyService.class, () -> new MyService());
|
context.registerBean("mySecondService", MyService.class, MyService::new);
|
||||||
MyService mySecondService = (MyService) context.getBean("mySecondService");
|
MyService mySecondService = (MyService) context.getBean("mySecondService");
|
||||||
assertTrue(mySecondService.getRandomNumber() < 10);
|
assertTrue(mySecondService.getRandomNumber() < 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenRegisterBeanWithCallback_thenOk() {
|
public void whenRegisterBeanWithCallback_thenOk() {
|
||||||
context.registerBean("myCallbackService", MyService.class, () -> new MyService(), bd -> bd.setAutowireCandidate(false));
|
context.registerBean("myCallbackService", MyService.class, MyService::new, bd -> bd.setAutowireCandidate(false));
|
||||||
MyService myCallbackService = (MyService) context.getBean("myCallbackService");
|
MyService myCallbackService = (MyService) context.getBean("myCallbackService");
|
||||||
assertTrue(myCallbackService.getRandomNumber() < 10);
|
assertTrue(myCallbackService.getRandomNumber() < 10);
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@ import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.boot.test.web.client.TestRestTemplate;
|
import org.springframework.boot.test.web.client.TestRestTemplate;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
|
|
@ -7,7 +7,7 @@ import static org.springframework.restdocs.operation.preprocess.Preprocessors.pr
|
||||||
import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
|
import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
|
||||||
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
|
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
|
||||||
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
||||||
import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
|
import static org.springframework.restdocs.request.RequestDocumentation.queryParameters;
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||||
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.setup.MockMvcBuilders.webAppContextSetup;
|
import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
|
||||||
|
@ -50,6 +50,6 @@ class BookControllerMvcIntegrationTest {
|
||||||
mockMvc.perform(get("/books?page=2"))
|
mockMvc.perform(get("/books?page=2"))
|
||||||
.andExpect(status().isOk())
|
.andExpect(status().isOk())
|
||||||
.andDo(document("books",
|
.andDo(document("books",
|
||||||
requestParameters(parameterWithName("page").description("The page to retrieve"))));
|
queryParameters(parameterWithName("page").description("The page to retrieve"))));
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2,7 +2,7 @@ package com.baeldung.queryparamdoc;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
||||||
import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
|
import static org.springframework.restdocs.request.RequestDocumentation.queryParameters;
|
||||||
import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.document;
|
import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.document;
|
||||||
import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
|
import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.documentationConfiguration;
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ class BookControllerReactiveIntegrationTest {
|
||||||
webTestClient.get().uri("/books?page=2")
|
webTestClient.get().uri("/books?page=2")
|
||||||
.exchange().expectStatus().isOk().expectBody()
|
.exchange().expectStatus().isOk().expectBody()
|
||||||
.consumeWith(document("books",
|
.consumeWith(document("books",
|
||||||
requestParameters(parameterWithName("page").description("The page to retrieve"))));
|
queryParameters(parameterWithName("page").description("The page to retrieve"))));
|
||||||
}
|
}
|
||||||
|
|
||||||
@TestConfiguration
|
@TestConfiguration
|
||||||
|
|
|
@ -3,9 +3,7 @@ package com.baeldung.queryparamdoc;
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.hamcrest.core.Is.is;
|
import static org.hamcrest.core.Is.is;
|
||||||
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
||||||
import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
|
import static org.springframework.restdocs.request.RequestDocumentation.queryParameters;
|
||||||
import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
|
|
||||||
import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
|
|
||||||
|
|
||||||
import io.restassured.RestAssured;
|
import io.restassured.RestAssured;
|
||||||
import io.restassured.builder.RequestSpecBuilder;
|
import io.restassured.builder.RequestSpecBuilder;
|
||||||
|
@ -19,6 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||||
import org.springframework.boot.test.web.server.LocalServerPort;
|
import org.springframework.boot.test.web.server.LocalServerPort;
|
||||||
import org.springframework.restdocs.RestDocumentationContextProvider;
|
import org.springframework.restdocs.RestDocumentationContextProvider;
|
||||||
import org.springframework.restdocs.RestDocumentationExtension;
|
import org.springframework.restdocs.RestDocumentationExtension;
|
||||||
|
import org.springframework.restdocs.restassured.RestAssuredRestDocumentation;
|
||||||
import org.springframework.security.test.context.support.WithMockUser;
|
import org.springframework.security.test.context.support.WithMockUser;
|
||||||
import org.springframework.test.context.junit.jupiter.SpringExtension;
|
import org.springframework.test.context.junit.jupiter.SpringExtension;
|
||||||
|
|
||||||
|
@ -31,7 +30,7 @@ class BookControllerRestAssuredIntegrationTest {
|
||||||
|
|
||||||
@BeforeEach
|
@BeforeEach
|
||||||
void setUp(RestDocumentationContextProvider restDocumentation, @LocalServerPort int port) {
|
void setUp(RestDocumentationContextProvider restDocumentation, @LocalServerPort int port) {
|
||||||
this.spec = new RequestSpecBuilder().addFilter(documentationConfiguration(restDocumentation))
|
this.spec = new RequestSpecBuilder().addFilter(RestAssuredRestDocumentation.documentationConfiguration(restDocumentation))
|
||||||
.setPort(port)
|
.setPort(port)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
@ -44,7 +43,7 @@ class BookControllerRestAssuredIntegrationTest {
|
||||||
@Test
|
@Test
|
||||||
@WithMockUser
|
@WithMockUser
|
||||||
void givenEndpoint_whenSendGetRequest_thenSuccessfulResponse() {
|
void givenEndpoint_whenSendGetRequest_thenSuccessfulResponse() {
|
||||||
RestAssured.given(this.spec).filter(document("users", requestParameters(
|
RestAssured.given(this.spec).filter(RestAssuredRestDocumentation.document("users", queryParameters(
|
||||||
parameterWithName("page").description("The page to retrieve"))))
|
parameterWithName("page").description("The page to retrieve"))))
|
||||||
.when().get("/books?page=2")
|
.when().get("/books?page=2")
|
||||||
.then().assertThat().statusCode(is(200));
|
.then().assertThat().statusCode(is(200));
|
||||||
|
|
Loading…
Reference in New Issue