From 7106e4a41fcf65d635b030d730d5ec72a0bd371d Mon Sep 17 00:00:00 2001 From: XTiNCT Date: Sun, 8 Feb 2026 16:04:34 +0530 Subject: [PATCH] formatted the code --- .../service/FeatureFlagService.java | 4 ++-- .../petclinic/owner/OwnerController.java | 19 +++++++------------ .../petclinic/owner/PetController.java | 12 +++++++----- .../petclinic/owner/VisitController.java | 6 ++++-- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/featureflag/service/FeatureFlagService.java b/src/main/java/org/springframework/samples/petclinic/featureflag/service/FeatureFlagService.java index 92bad1c8a..7b73b3c2c 100644 --- a/src/main/java/org/springframework/samples/petclinic/featureflag/service/FeatureFlagService.java +++ b/src/main/java/org/springframework/samples/petclinic/featureflag/service/FeatureFlagService.java @@ -106,9 +106,9 @@ public class FeatureFlagService { case PERCENTAGE: return evaluatePercentage(flag, context); - + case GLOBAL_DISABLE: - return false; + return false; default: logger.warn("Unknown flag type for '{}': {}", flag.getFlagKey(), flag.getFlagType()); 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 ab4564bf6..1dcef5e8c 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -53,6 +53,7 @@ class OwnerController { private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; private final OwnerRepository owners; + private final FeatureFlagService featureFlagService; public OwnerController(OwnerRepository owners, FeatureFlagService featureFlagService) { @@ -94,24 +95,18 @@ class OwnerController { public String initFindForm(Model model) { model.addAttribute("owner", new Owner()); - boolean ownerSearchEnabled = - featureFlagService.isFeatureEnabled("OWNER_SEARCH", null); + boolean ownerSearchEnabled = featureFlagService.isFeatureEnabled("OWNER_SEARCH", null); - model.addAttribute("ownerSearchEnabled", ownerSearchEnabled); + model.addAttribute("ownerSearchEnabled", ownerSearchEnabled); return "owners/findOwners"; } - @FeatureToggle( - key = "OWNER_SEARCH", - disabledMessage = "Owner search is restricted", - disabledRedirect = "/owners/find" - ) + @FeatureToggle(key = "OWNER_SEARCH", disabledMessage = "Owner search is restricted", + disabledRedirect = "/owners/find") @GetMapping("/owners") public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, BindingResult result, Model model) { - - // allow parameterless GET request for /owners to return all records String lastName = owner.getLastName(); if (lastName == null) { @@ -190,8 +185,8 @@ class OwnerController { mav.addObject(owner); // displaying add pet button based on feature toggle - boolean addNewPetEnabled = featureFlagService.isFeatureEnabled("ADD_NEW_PET","addNewPetEnabled"); - boolean addVisitEnabled = featureFlagService.isFeatureEnabled("ADD_VISIT","addVisitEnabled"); + boolean addNewPetEnabled = featureFlagService.isFeatureEnabled("ADD_NEW_PET", "addNewPetEnabled"); + boolean addVisitEnabled = featureFlagService.isFeatureEnabled("ADD_VISIT", "addVisitEnabled"); mav.addObject("addVisitEnabled", addVisitEnabled); mav.addObject("addNewPetEnabled", addNewPetEnabled); return mav; 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 2da5efcf3..73fe03536 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java @@ -96,7 +96,8 @@ class PetController { dataBinder.setValidator(new PetValidator()); } - @FeatureToggle(key = "ADD_NEW_PET", disabledMessage = "Adding new pets is currently disabled", disabledRedirect = "/owners/{ownerId}") + @FeatureToggle(key = "ADD_NEW_PET", disabledMessage = "Adding new pets is currently disabled", + disabledRedirect = "/owners/{ownerId}") @GetMapping("/pets/new") public String initCreationForm(Owner owner, ModelMap model) { Pet pet = new Pet(); @@ -104,7 +105,8 @@ class PetController { return VIEWS_PETS_CREATE_OR_UPDATE_FORM; } - @FeatureToggle(key = "ADD_NEW_PET", disabledMessage = "Adding new pets is currently disabled", disabledRedirect = "/owners/{ownerId}") + @FeatureToggle(key = "ADD_NEW_PET", disabledMessage = "Adding new pets is currently disabled", + disabledRedirect = "/owners/{ownerId}") @PostMapping("/pets/new") public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult result, RedirectAttributes redirectAttributes) { @@ -162,9 +164,8 @@ class PetController { /** * Updates the pet details if it exists or adds a new pet to the owner. - * * @param owner The owner of the pet - * @param pet The pet with updated details + * @param pet The pet with updated details */ private void updatePetDetails(Owner owner, Pet pet) { Integer id = pet.getId(); @@ -175,7 +176,8 @@ class PetController { existingPet.setName(pet.getName()); existingPet.setBirthDate(pet.getBirthDate()); existingPet.setType(pet.getType()); - } else { + } + else { owner.addPet(pet); } this.owners.save(owner); diff --git a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java b/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java index a415d8f0f..59be0f3e3 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java @@ -82,7 +82,8 @@ class VisitController { // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is // called - @FeatureToggle(key = "ADD_VISIT", disabledMessage = "Adding visits is currently disabled", disabledRedirect = "/owners/{ownerId}") + @FeatureToggle(key = "ADD_VISIT", disabledMessage = "Adding visits is currently disabled", + disabledRedirect = "/owners/{ownerId}") @GetMapping("/owners/{ownerId}/pets/{petId}/visits/new") public String initNewVisitForm() { return "pets/createOrUpdateVisitForm"; @@ -90,7 +91,8 @@ class VisitController { // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is // called - @FeatureToggle(key = "ADD_VISIT", disabledMessage = "Adding visits is currently disabled", disabledRedirect = "/owners/{ownerId}") + @FeatureToggle(key = "ADD_VISIT", disabledMessage = "Adding visits is currently disabled", + disabledRedirect = "/owners/{ownerId}") @PostMapping("/owners/{ownerId}/pets/{petId}/visits/new") public String processNewVisitForm(@ModelAttribute Owner owner, @PathVariable int petId, @Valid Visit visit, BindingResult result, RedirectAttributes redirectAttributes) {