Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-23 08:15:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed whitespacing and formatting issues

Browse source 
Ran mvn spring-javaformat:apply as shown from github's build failure
This commit is contained in:
Tom Ekshtein 2023-10-02 19:42:13 -07:00
parent 0d24bc4813
commit 15801e7140
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
View file

@ -86,7 +86,6 @@ class OwnerController {
return "owners/findOwners"; return "owners/findOwners";
} }
@GetMapping("/owners") @GetMapping("/owners")
public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, BindingResult result, public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, BindingResult result,
Model model) { Model model) {
@ -99,7 +98,7 @@ class OwnerController {
} }
// empty owner search for all records without n+1 queries // empty owner search for all records without n+1 queries
if (StringUtils.isEmpty(owner.getLastName())){ if (StringUtils.isEmpty(owner.getLastName())) {
List<Owner> ownerList = owners.findAllWithPetsAndVisits(); List<Owner> ownerList = owners.findAllWithPetsAndVisits();
Page<Owner> ownerPageNP1 = new PageImpl<>(ownerList); Page<Owner> ownerPageNP1 = new PageImpl<>(ownerList);
return addPaginationModel(0, model, ownerPageNP1); return addPaginationModel(0, model, ownerPageNP1);
@ -128,7 +127,7 @@ class OwnerController {
model.addAttribute("currentPage", page); model.addAttribute("currentPage", page);
model.addAttribute("totalPages", paginated.getTotalPages()); model.addAttribute("totalPages", paginated.getTotalPages());
model.addAttribute("totalItems", paginated.getTotalElements()); model.addAttribute("totalItems", paginated.getTotalElements());
model.addAttribute("listOwners",paginated); model.addAttribute("listOwners", paginated);
return "owners/ownersList"; return "owners/ownersList";
} }

1
src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
View file

@ -64,7 +64,6 @@ public interface OwnerRepository extends Repository<Owner, Integer> {
@Query("SELECT DISTINCT owner FROM Owner owner LEFT JOIN FETCH owner.pets LEFT JOIN FETCH pets.visits") @Query("SELECT DISTINCT owner FROM Owner owner LEFT JOIN FETCH owner.pets LEFT JOIN FETCH pets.visits")
List<Owner> findAllWithPetsAndVisits(); List<Owner> findAllWithPetsAndVisits();
/** /**
* Retrieve an {@link Owner} from the data store by id. * Retrieve an {@link Owner} from the data store by id.
* @param id the id to search for * @param id the id to search for