Add some more realistic exceptions using thrown exceptions for defense

Author: CalvinAllen

src/main/java/org/springframework/samples/petclinic/model/package-info.java

@@ -136,6 +136,10 @@ private String addPaginationModel(int page, Model model, Page<Owner> paginated)
 	}
 
 	private Page<Owner> findPaginatedForOwnersLastName(int page, String lastname) {
+		if(page < 1){
+			// defensive programming
+			throw new IllegalArgumentException("Page must be greater than 0");
+		}
 
 		int pageSize = 5;
 		Pageable pageable = PageRequest.of(page - 1, pageSize);

src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java

@@ -124,7 +124,13 @@ public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult res
 	@GetMapping("/pets/{petId}/edit")
 	public String initUpdateForm(Owner owner, @PathVariable("petId") int petId, ModelMap model,
 			RedirectAttributes redirectAttributes) {
+		if(owner == null){
+			throw new IllegalArgumentException("Owner not found!");
+		}
 		Pet pet = owner.getPet(petId);
+		if(pet == null){
+			throw new IllegalArgumentException("Pet not found!");
+		}
 		model.put("pet", pet);
 		return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
 	}

src/main/java/org/springframework/samples/petclinic/owner/PetController.java

@@ -69,6 +69,10 @@ private String addPaginationModel(int page, Page<Vet> paginated, Model model) {
 	}
 
 	private Page<Vet> findPaginated(int page) {
+		if(page < 1) {
+			// defensive programming
+			throw new IllegalArgumentException("Page must be greater than 0");
+		}
 		int pageSize = 5;
 		Pageable pageable = PageRequest.of(page - 1, pageSize);
 		return vetRepository.findAll(pageable);
@@ -89,7 +93,6 @@ private Page<Vet> findPaginated(int page) {
 
 	@GetMapping("/vets/{lastName}")
 	public @ResponseBody Vets showResourcesVetList(@PathVariable(name = "lastName") String lastName) {
-		// This will throw when exercised from tester.sh as the Vet we send in has no specialties. Poor guy.
 		Vets vets = new Vets();
 		Collection<Vet> vetList = this.vetRepository.findByLastName(lastName);
 		for (Vet vet : vetList) {

src/main/java/org/springframework/samples/petclinic/vet/VetController.java

@@ -54,13 +54,6 @@
             <span class="fa fa-th-list" aria-hidden="true"></span>
             <span>Veterinarians</span>
           </li>
-
-          <li
-            th:replace="~{::menuItem ('/oups','error','trigger a RuntimeException to see how it is handled','exclamation-triangle','Error')}">
-            <span class="fa exclamation-triangle" aria-hidden="true"></span>
-            <span>Error</span>
-          </li>
-
         </ul>
       </div>
     </div>

src/main/resources/templates/fragments/layout.html

@@ -27,8 +27,14 @@ while true; do
     sleep 1
     curl -s -o /dev/null http://localhost:8081/owners/4
     sleep 1
+    curl -s -o /dev/null http://localhost:8081/owners/10/pets/10/edit
+    sleep 1
+    curl -s -o /dev/null http://localhost:8081/owners?page=0
+    sleep 1
     curl -s -o /dev/null http://localhost:8081/vets.html
     sleep 1
+    curl -s -o /dev/null http://localhost:8081/vets.html?page=0
+    sleep 1
     curl -s -o /dev/null http://localhost:8081/vets
     sleep 1
     curl -s -o /dev/null http://localhost:8081/vets/Carter