From 1c9b40124869f350c84a953fd62d7582965b8ca5 Mon Sep 17 00:00:00 2001
From: michaelisvy <misvy@gopivotal,com>
Date: Fri, 16 Jan 2015 09:22:40 +0800
Subject: [PATCH] cleaned up if statement in controller
---
.../samples/petclinic/web/OwnerController.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
index f311110..ecbbce5 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
@@ -92,22 +92,23 @@ public class OwnerController {
// find owners by last name
Collection<Owner> results = this.clinicService.findOwnerByLastName(owner.getLastName());
- if (results.size() < 1) {
+ if (results.isEmpty()) {
// no owners found
result.rejectValue("lastName", "notFound", "not found");
return "owners/findOwners";
}
- if (results.size() > 1) {
+ else if (results.size() == 1) {
+ // 1 owner found
+ owner = results.iterator().next();
+ return "redirect:/owners/" + owner.getId();
+ }
+ else {
// multiple owners found
model.put("selections", results);
return "owners/ownersList";
- } else {
- // 1 owner found
- owner = results.iterator().next();
- return "redirect:/owners/" + owner.getId();
}
}
-
+
@RequestMapping(value = "/owners/{ownerId}/edit", method = RequestMethod.GET)
public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) {
Owner owner = this.clinicService.findOwnerById(ownerId);
--
GitLab