From 4fe6c914e33e7290ed91f84e41a88bd3e674bd3d Mon Sep 17 00:00:00 2001
From: Alexandre Touret <alexandre.touret@free.fr>
Date: Tue, 15 Feb 2022 18:38:43 +0100
Subject: [PATCH] Fix @arey comments
---
pom.xml | 2 --
.../petclinic/rest/controller/OwnerRestController.java | 2 +-
.../petclinic/rest/controller/PetRestController.java | 6 +++---
.../petclinic/rest/controller/PetTypeRestController.java | 8 ++++----
.../rest/controller/SpecialtyRestController.java | 8 ++++----
.../petclinic/rest/controller/UserRestController.java | 2 +-
.../petclinic/rest/controller/VetRestController.java | 8 ++++----
.../petclinic/rest/controller/VisitRestController.java | 8 ++++----
8 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce7e8e2b..b936a371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,6 @@
<docker.jib-maven-plugin.version>1.3.0</docker.jib-maven-plugin.version>
<docker.image.prefix>springcommunity</docker.image.prefix>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
- <spring-boot-maven-plugin.version>2.6.2</spring-boot-maven-plugin.version>
</properties>
<dependencies>
@@ -166,7 +165,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot-maven-plugin.version}</version>
<executions>
<execution>
<!-- Spring Boot Actuator displays build-related information
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java
index 80ce1e5a..fab71415 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java
@@ -124,7 +124,7 @@ public class OwnerRestController implements OwnersApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Transactional
@Override
- public ResponseEntity<OwnerDto> deleteOwner(@Min(0) @ApiParam(value = "The ID of the owner.", required = true) @PathVariable("ownerId") Integer ownerId) {
+ public ResponseEntity<OwnerDto> deleteOwner(Integer ownerId) {
Owner owner = this.clinicService.findOwnerById(ownerId);
if (owner == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java
index 10311d24..ecee18cf 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java
@@ -53,7 +53,7 @@ public class PetRestController implements PetsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Override
- public ResponseEntity<PetDto> getPet(@Min(0) @ApiParam(value = "The ID of the pet.", required = true) @PathVariable("petId") Integer petId) {
+ public ResponseEntity<PetDto> getPet(Integer petId) {
PetDto pet = petMapper.toPetDto(this.clinicService.findPetById(petId));
if (pet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -74,7 +74,7 @@ public class PetRestController implements PetsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Override
- public ResponseEntity<PetDto> updatePet(@Min(0) @ApiParam(value = "The ID of the pet.", required = true) @PathVariable("petId") Integer petId, @ApiParam(value = "The pet", required = true) @Valid @RequestBody PetDto petDto) {
+ public ResponseEntity<PetDto> updatePet(Integer petId, PetDto petDto) {
Pet currentPet = this.clinicService.findPetById(petId);
if (currentPet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -89,7 +89,7 @@ public class PetRestController implements PetsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Transactional
@Override
- public ResponseEntity<PetDto> deletePet(@Min(0) @ApiParam(value = "The ID of the pet.", required = true) @PathVariable("petId") Integer petId) {
+ public ResponseEntity<PetDto> deletePet(Integer petId) {
Pet pet = this.clinicService.findPetById(petId);
if (pet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java
index 98fdb53c..213e9698 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java
@@ -61,7 +61,7 @@ public class PetTypeRestController implements PettypesApi {
@PreAuthorize("hasAnyRole(@roles.OWNER_ADMIN, @roles.VET_ADMIN)")
@Override
- public ResponseEntity<PetTypeDto> getPetType(@Min(0) @ApiParam(value = "The ID of the pet type.", required = true) @PathVariable("petTypeId") Integer petTypeId) {
+ public ResponseEntity<PetTypeDto> getPetType(Integer petTypeId) {
PetType petType = this.clinicService.findPetTypeById(petTypeId);
if (petType == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -71,7 +71,7 @@ public class PetTypeRestController implements PettypesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<PetTypeDto> addPetType(@RequestBody @Valid PetTypeDto petTypeDto) {
+ public ResponseEntity<PetTypeDto> addPetType(PetTypeDto petTypeDto) {
HttpHeaders headers = new HttpHeaders();
final PetType type = petTypeMapper.toPetType(petTypeDto);
this.clinicService.savePetType(type);
@@ -81,7 +81,7 @@ public class PetTypeRestController implements PettypesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<PetTypeDto> updatePetType(@Min(0) @ApiParam(value = "The ID of the pet type.", required = true) @PathVariable("petTypeId") Integer petTypeId, @ApiParam(value = "The pet type", required = true) @Valid @RequestBody PetTypeDto petTypeDto) {
+ public ResponseEntity<PetTypeDto> updatePetType(Integer petTypeId, PetTypeDto petTypeDto) {
PetType currentPetType = this.clinicService.findPetTypeById(petTypeId);
if (currentPetType == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -94,7 +94,7 @@ public class PetTypeRestController implements PettypesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Transactional
@Override
- public ResponseEntity<PetTypeDto> deletePetType(@Min(0) @ApiParam(value = "The ID of the pet type.", required = true) @PathVariable("petTypeId") Integer petTypeId) {
+ public ResponseEntity<PetTypeDto> deletePetType(Integer petTypeId) {
PetType petType = this.clinicService.findPetTypeById(petTypeId);
if (petType == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java
index 51f8dfa8..b01ccc21 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java
@@ -66,7 +66,7 @@ public class SpecialtyRestController implements SpecialtiesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<SpecialtyDto> getSpecialty(@Min(0) @ApiParam(value = "The ID of the pet.", required = true) @PathVariable("specialtyId") Integer specialtyId) {
+ public ResponseEntity<SpecialtyDto> getSpecialty(Integer specialtyId) {
Specialty specialty = this.clinicService.findSpecialtyById(specialtyId);
if (specialty == null) {
return new ResponseEntity<SpecialtyDto>(HttpStatus.NOT_FOUND);
@@ -76,7 +76,7 @@ public class SpecialtyRestController implements SpecialtiesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<SpecialtyDto> addSpecialty(@ApiParam(value = "The specialty", required = true) @Valid @RequestBody SpecialtyDto specialtyDto) {
+ public ResponseEntity<SpecialtyDto> addSpecialty(SpecialtyDto specialtyDto) {
HttpHeaders headers = new HttpHeaders();
Specialty specialty = specialtyMapper.toSpecialty(specialtyDto);
this.clinicService.saveSpecialty(specialty);
@@ -86,7 +86,7 @@ public class SpecialtyRestController implements SpecialtiesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<SpecialtyDto> updateSpecialty(@Min(0) @ApiParam(value = "The ID of the specialty.", required = true) @PathVariable("specialtyId") Integer specialtyId, @ApiParam(value = "The pet", required = true) @Valid @RequestBody SpecialtyDto specialtyDto) {
+ public ResponseEntity<SpecialtyDto> updateSpecialty(Integer specialtyId, SpecialtyDto specialtyDto) {
Specialty currentSpecialty = this.clinicService.findSpecialtyById(specialtyId);
if (currentSpecialty == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -99,7 +99,7 @@ public class SpecialtyRestController implements SpecialtiesApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Transactional
@Override
- public ResponseEntity<SpecialtyDto> deleteSpecialty(@Min(0) @ApiParam(value = "The ID of the specialty.", required = true) @PathVariable("specialtyId") Integer specialtyId) {
+ public ResponseEntity<SpecialtyDto> deleteSpecialty(Integer specialtyId) {
Specialty specialty = this.clinicService.findSpecialtyById(specialtyId);
if (specialty == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/UserRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/UserRestController.java
index 2a5d024f..f9a7d96d 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/UserRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/UserRestController.java
@@ -48,7 +48,7 @@ public class UserRestController implements UsersApi {
@PreAuthorize( "hasRole(@roles.ADMIN)" )
@Override
- public ResponseEntity<UserDto> addUser(@RequestBody @Valid UserDto userDto) {
+ public ResponseEntity<UserDto> addUser(UserDto userDto) {
HttpHeaders headers = new HttpHeaders();
User user = userMapper.toUser(userDto);
this.userService.saveUser(user);
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/VetRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/VetRestController.java
index 78e6e783..8a0732c1 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/VetRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/VetRestController.java
@@ -68,7 +68,7 @@ public class VetRestController implements VetsApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<VetDto> getVet(@Min(0)@ApiParam(value = "The ID of the vet.",required=true) @PathVariable("vetId") Integer vetId) {
+ public ResponseEntity<VetDto> getVet(Integer vetId) {
Vet vet = this.clinicService.findVetById(vetId);
if (vet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -78,7 +78,7 @@ public class VetRestController implements VetsApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<VetDto> addVet(@ApiParam(value = "The vet" ,required=true ) @Valid @RequestBody VetDto vetDto) {
+ public ResponseEntity<VetDto> addVet(VetDto vetDto) {
HttpHeaders headers = new HttpHeaders();
Vet vet = vetMapper.toVet(vetDto);
this.clinicService.saveVet(vet);
@@ -88,7 +88,7 @@ public class VetRestController implements VetsApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Override
- public ResponseEntity<VetDto> updateVet(@Min(0)@ApiParam(value = "The ID of the vet.",required=true) @PathVariable("vetId") Integer vetId,@ApiParam(value = "The vet" ,required=true ) @Valid @RequestBody VetDto vetDto) {
+ public ResponseEntity<VetDto> updateVet(Integer vetId,VetDto vetDto) {
Vet currentVet = this.clinicService.findVetById(vetId);
if (currentVet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -106,7 +106,7 @@ public class VetRestController implements VetsApi {
@PreAuthorize("hasRole(@roles.VET_ADMIN)")
@Transactional
@Override
- public ResponseEntity<VetDto> deleteVet(@Min(0)@ApiParam(value = "The ID of the vet.",required=true) @PathVariable("vetId") Integer vetId) {
+ public ResponseEntity<VetDto> deleteVet(Integer vetId) {
Vet vet = this.clinicService.findVetById(vetId);
if (vet == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/VisitRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/VisitRestController.java
index e0c0b2ad..c99382d0 100644
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/VisitRestController.java
+++ b/src/main/java/org/springframework/samples/petclinic/rest/controller/VisitRestController.java
@@ -66,7 +66,7 @@ public class VisitRestController implements VisitsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Override
- public ResponseEntity<VisitDto> getVisit(@Min(0) @ApiParam(value = "The ID of the visit.", required = true) @PathVariable("visitId") Integer visitId) {
+ public ResponseEntity<VisitDto> getVisit( Integer visitId) {
Visit visit = this.clinicService.findVisitById(visitId);
if (visit == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -76,7 +76,7 @@ public class VisitRestController implements VisitsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Override
- public ResponseEntity<VisitDto> addVisit(@ApiParam(value = "The visit", required = true) @Valid @RequestBody VisitDto visitDto) {
+ public ResponseEntity<VisitDto> addVisit(VisitDto visitDto) {
HttpHeaders headers = new HttpHeaders();
Visit visit = visitMapper.toVisit(visitDto);
this.clinicService.saveVisit(visit);
@@ -87,7 +87,7 @@ public class VisitRestController implements VisitsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Override
- public ResponseEntity<VisitDto> updateVisit(@Min(0) @ApiParam(value = "The ID of the visit.", required = true) @PathVariable("visitId") Integer visitId, @ApiParam(value = "The visit", required = true) @Valid @RequestBody VisitDto visitDto) {
+ public ResponseEntity<VisitDto> updateVisit(Integer visitId, VisitDto visitDto) {
Visit currentVisit = this.clinicService.findVisitById(visitId);
if (currentVisit == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
@@ -101,7 +101,7 @@ public class VisitRestController implements VisitsApi {
@PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
@Transactional
@Override
- public ResponseEntity<VisitDto> deleteVisit(@Min(0) @ApiParam(value = "The ID of the visit.", required = true) @PathVariable("visitId") Integer visitId) {
+ public ResponseEntity<VisitDto> deleteVisit(Integer visitId) {
Visit visit = this.clinicService.findVisitById(visitId);
if (visit == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
--
GitLab