Notes/sfg-restdocs-example
1
0
Fork 0
mirror of https://github.com/robindhole/sfg-restdocs-example.git synced 2025-03-15 22:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating to Java 17 and Spring Boot 3.x

Browse Source
This commit is contained in:
John 2022-07-09 08:33:19 -04:00
parent 3649dcfcc9
commit 9ddf8d191c
No known key found for this signature in database
GPG Key ID: 6A4463F9D9A16338
6 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.5.RELEASE</version> <version>3.0.0-M3</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>guru.springframework</groupId> <groupId>guru.springframework</groupId>
@ -17,11 +17,11 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version> <java.version>17</java.version>
<jaxb.version>2.3.0</jaxb.version> <jaxb.version>2.3.0</jaxb.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<org.mapstruct.version>1.3.0.Final</org.mapstruct.version> <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
</properties> </properties>
<dependencies> <dependencies>
@ -33,6 +33,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
@ -123,5 +127,24 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>

3
src/main/java/guru/springframework/sfgrestdocsexample/domain/Beer.java
View File

@ -1,11 +1,12 @@
package guru.springframework.sfgrestdocsexample.domain; package guru.springframework.sfgrestdocsexample.domain;
import jakarta.persistence.*;
import lombok.*; import lombok.*;
import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.UpdateTimestamp; import org.hibernate.annotations.UpdateTimestamp;
import javax.persistence.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.UUID; import java.util.UUID;

3
src/main/java/guru/springframework/sfgrestdocsexample/repositories/BeerRepository.java
View File

@ -1,6 +1,7 @@
package guru.springframework.sfgrestdocsexample.repositories; package guru.springframework.sfgrestdocsexample.repositories;
import guru.springframework.sfgrestdocsexample.domain.Beer; import guru.springframework.sfgrestdocsexample.domain.Beer;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.UUID; import java.util.UUID;
@ -8,5 +9,5 @@ import java.util.UUID;
/** /**
* Created by jt on 2019-05-17. * Created by jt on 2019-05-17.
*/ */
public interface BeerRepository extends PagingAndSortingRepository<Beer, UUID> { public interface BeerRepository extends PagingAndSortingRepository<Beer, UUID>, CrudRepository<Beer, UUID> {
} }

1
src/main/java/guru/springframework/sfgrestdocsexample/web/controller/BeerController.java
View File

@ -25,6 +25,7 @@ public class BeerController {
@GetMapping("/{beerId}") @GetMapping("/{beerId}")
public ResponseEntity<BeerDto> getBeerById(@PathVariable("beerId") UUID beerId){ public ResponseEntity<BeerDto> getBeerById(@PathVariable("beerId") UUID beerId){
return new ResponseEntity<>(beerMapper.BeerToBeerDto(beerRepository.findById(beerId).get()), HttpStatus.OK); return new ResponseEntity<>(beerMapper.BeerToBeerDto(beerRepository.findById(beerId).get()), HttpStatus.OK);
} }

2
src/main/java/guru/springframework/sfgrestdocsexample/web/controller/MvcExceptionHandler.java
View File

@ -1,11 +1,11 @@
package guru.springframework.sfgrestdocsexample.web.controller; package guru.springframework.sfgrestdocsexample.web.controller;
import jakarta.validation.ConstraintViolationException;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import javax.validation.ConstraintViolationException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

8
src/main/java/guru/springframework/sfgrestdocsexample/web/model/BeerDto.java
View File

@ -5,10 +5,10 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import javax.validation.constraints.Null; import jakarta.validation.constraints.Null;
import javax.validation.constraints.Positive; import jakarta.validation.constraints.Positive;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.UUID; import java.util.UUID;