Skip to content

Commit

Permalink
Merge pull request #1042 from pascalgrimaud/spring-boot-3
Browse files Browse the repository at this point in the history
Upgrade to Spring Boot v3
  • Loading branch information
pascalgrimaud authored Mar 17, 2022
2 parents 573aff1 + 4b67274 commit 49cfdbb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.0-M2</version>
<version>3.0.0-M1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -47,7 +47,7 @@
<maven.version>3.8.4</maven.version>
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>

<spring-boot.version>2.7.0-M2</spring-boot.version>
<spring-boot.version>3.0.0-M1</spring-boot.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<assertj.version>3.22.0</assertj.version>
<mockito.version>4.4.0</mockito.version>
Expand All @@ -58,7 +58,7 @@
<guava.version>31.1-jre</guava.version>
<jgit.version>6.1.0.202203080745-r</jgit.version>
<archunit-junit5.version>0.23.1</archunit-junit5.version>
<springdoc-openapi-ui.version>1.6.6</springdoc-openapi-ui.version>
<springdoc-openapi-starter-webmvc-ui.version>2.0.0-M1</springdoc-openapi-starter-webmvc-ui.version>
<problem-spring.version>0.27.0</problem-spring.version>
<problem-spring-web.version>${problem-spring.version}</problem-spring-web.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
Expand Down Expand Up @@ -105,8 +105,8 @@
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc-openapi-ui.version}</version>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc-openapi-starter-webmvc-ui.version}</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package tech.jhipster.lite.technical.infrastructure.primary.exception;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Null;
import java.net.URI;
import java.util.*;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -45,7 +45,7 @@ public class ExceptionTranslator implements ProblemHandling {
* Post-process the Problem payload to add the message key for the front-end if needed.
*/
@Override
public ResponseEntity<Problem> process(@Nullable ResponseEntity<Problem> entity, NativeWebRequest request) {
public ResponseEntity<Problem> process(@Null ResponseEntity<Problem> entity, NativeWebRequest request) {
if (entity == null) {
return null;
}
Expand Down Expand Up @@ -80,7 +80,7 @@ private Integer getStatusCode(Problem problem) {
}

@Override
public ResponseEntity<Problem> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, @Nonnull NativeWebRequest request) {
public ResponseEntity<Problem> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, @NotNull NativeWebRequest request) {
BindingResult result = ex.getBindingResult();
List<FieldErrorDTO> fieldErrors = result
.getFieldErrors()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
import org.springdoc.core.GroupedOpenApi;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tech.jhipster.lite.technical.infrastructure.primary.exception;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import org.springframework.http.HttpStatus;
import org.springframework.http.converter.HttpMessageConversionException;
import org.springframework.web.bind.annotation.*;
Expand Down

0 comments on commit 49cfdbb

Please sign in to comment.