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

@@ -98,7 +98,7 @@ class OwnerController {
 		}
 
 		// find owners by last name
-		Page<Owner> ownersResults = findPaginatedForOwnersLastName(page, owner.getLastName());
+		Page<Owner> ownersResults = findPaginatedForOwnersName(page, owner.getLastName());
 		if (ownersResults.isEmpty()) {
 			// no owners found
 			result.rejectValue("lastName", "notFound", "not found");
@@ -110,9 +110,9 @@ class OwnerController {
 			owner = ownersResults.iterator().next();
 			return "redirect:/owners/" + owner.getId();
 		}
+
 		// multiple owners found
 		return addPaginationModel(page, model, ownersResults);
-
 	}
 
 	private String addPaginationModel(int page, Model model, Page<Owner> paginated) {
@@ -124,10 +124,10 @@ class OwnerController {
 		return "owners/ownersList";
 	}
 
-	private Page<Owner> findPaginatedForOwnersLastName(int page, String lastname) {
+	private Page<Owner> findPaginatedForOwnersName(int page, String lastname) {
 		int pageSize = 5;
 		Pageable pageable = PageRequest.of(page - 1, pageSize);
-		return owners.findByLastNameStartingWith(lastname, pageable);
+		return owners.findByNameContaining(lastname, pageable);
 	}
 
 	@GetMapping("/owners/{ownerId}/edit")

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

@@ -27,6 +27,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
+
+
 /**
  * Repository class for <code>Owner</code> domain objects All method names are compliant
  * with Spring Data naming conventions so this interface can easily be extended for Spring
@@ -56,8 +58,9 @@ public interface OwnerRepository extends JpaRepository<Owner, Integer> {
 	 * found)
 	 */
 
-	@Query("SELECT o FROM Owner o WHERE LOWER(CONCAT(o.firstName, ' ', o.lastName)) LIKE LOWER(CONCAT('%', :namePart, '%'))")
-	Page<Owner> findByLastNameStartingWith(@Param("namePart") String namePart, Pageable pageable);
+	@Query("SELECT o FROM Owner o " + "WHERE LOWER(o.firstName) LIKE LOWER(CONCAT('%', :namePart, '%')) "
+			+ "OR LOWER(o.lastName) LIKE LOWER(CONCAT('%', :namePart, '%'))")
+	Page<Owner> findByNameContaining(@Param("namePart") String namePart, Pageable pageable);
 
 	/**
 	 * Retrieve an {@link Owner} from the data store by id.