From 0aea5a67f4544299d14b75e088004481aabd7771 Mon Sep 17 00:00:00 2001 From: Roni Dover Date: Sun, 14 Apr 2024 17:19:14 -0700 Subject: [PATCH] format --- .../petclinic/PetClinicApplication.java | 2 -- .../PetVaccinationRequestMessage.java | 9 +++++---- .../petclinic/domain/OwnerValidation.java | 4 ++-- .../petclinic/owner/OwnerController.java | 4 ++-- .../petclinic/owner/PetController.java | 19 +++++++++++-------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index 0eb182d9b..d3377fa19 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -59,5 +59,3 @@ public class PetClinicApplication { } } - - diff --git a/src/main/java/org/springframework/samples/petclinic/adapters/PetVaccinationRequestMessage.java b/src/main/java/org/springframework/samples/petclinic/adapters/PetVaccinationRequestMessage.java index 72ac297d2..a46eb9dfb 100644 --- a/src/main/java/org/springframework/samples/petclinic/adapters/PetVaccinationRequestMessage.java +++ b/src/main/java/org/springframework/samples/petclinic/adapters/PetVaccinationRequestMessage.java @@ -8,13 +8,14 @@ public class PetVaccinationRequestMessage { private final KafkaTemplate kafkaTemplate; - public PetVaccinationRequestMessage(KafkaTemplate kafkaTemplate){ + public PetVaccinationRequestMessage(KafkaTemplate kafkaTemplate) { this.kafkaTemplate = kafkaTemplate; } - public void Send(){ - //template.convertAndSend("petVaccineRequests", "Hello, world!"); - kafkaTemplate.send("petVaccineRequests","test"); + + public void Send() { + // template.convertAndSend("petVaccineRequests", "Hello, world!"); + kafkaTemplate.send("petVaccineRequests", "test"); } } diff --git a/src/main/java/org/springframework/samples/petclinic/domain/OwnerValidation.java b/src/main/java/org/springframework/samples/petclinic/domain/OwnerValidation.java index ba5533627..49ae99bfa 100644 --- a/src/main/java/org/springframework/samples/petclinic/domain/OwnerValidation.java +++ b/src/main/java/org/springframework/samples/petclinic/domain/OwnerValidation.java @@ -94,11 +94,11 @@ public class OwnerValidation { } String usr; + String pswd; + String sysCode; - - @WithSpan private synchronized void AuthServiceValidateUser(Owner owner) { // This is the actual Root Cause!! diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java index ea2e49133..9d97e4e02 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -114,8 +114,8 @@ class OwnerController { } @GetMapping("/owners") - public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, - BindingResult result, Model model) { + public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, BindingResult result, + Model model) { validator.ValidateUserAccess("admin", "pwd", "fullaccess"); // if (owner.getLastName()!=null){ // throw new RuntimeException(); diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java index 374f32910..60973ed25 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java @@ -50,6 +50,7 @@ class PetController implements InitializingBean { private static final String VIEWS_PETS_CREATE_OR_UPDATE_FORM = "pets/createOrUpdatePetForm"; private final OwnerRepository owners; + private final PetVaccinationRequestMessage vaccinationRequestMessage; @Autowired @@ -57,8 +58,7 @@ class PetController implements InitializingBean { private ExecutorService executorService; - public PetController(OwnerRepository owners, - PetVaccinationRequestMessage petVaccinationRequestMessage) { + public PetController(OwnerRepository owners, PetVaccinationRequestMessage petVaccinationRequestMessage) { this.owners = owners; this.vaccinationRequestMessage = petVaccinationRequestMessage; } @@ -113,14 +113,17 @@ class PetController implements InitializingBean { this.owners.save(owner); // var pets = owner.getPets().toArray(Pet[]::new); -// var petRequests = owner.getPets() -// .stream() -// .map(x -> new PetVaccinationStatusService.UpdateVaccineStatusRequest(owner.getId(), x.getId())) -// .toList().subList(0,1); + // var petRequests = owner.getPets() + // .stream() + // .map(x -> new + // PetVaccinationStatusService.UpdateVaccineStatusRequest(owner.getId(), + // x.getId())) + // .toList().subList(0,1); // executorService.submit(() -> // petVaccinationStatus.updateVaccinationStatus(petRequests)).get(); - //executorService.submit(() -> petVaccinationStatus.updateVaccinationStatus(petRequests)); - //petVaccinationStatus.updateVaccinationStatus(petRequests.subList(0,1)); + // executorService.submit(() -> + // petVaccinationStatus.updateVaccinationStatus(petRequests)); + // petVaccinationStatus.updateVaccinationStatus(petRequests.subList(0,1)); // vaccinationRequestMessage.Send();