Skip to content

Commit 6bd5aa8

Browse files
committed
More logging
1 parent 17aa0df commit 6bd5aa8

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.data.domain.Page;
2626
import org.springframework.data.domain.PageRequest;
2727
import org.springframework.data.domain.Pageable;
28-
import org.springframework.samples.petclinic.clm.ClmController;
2928
import org.springframework.stereotype.Controller;
3029
import org.springframework.ui.Model;
3130
import org.springframework.validation.BindingResult;

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.stereotype.Controller;
2626
import org.springframework.ui.Model;
2727
import org.springframework.web.bind.annotation.GetMapping;
28+
import org.springframework.web.bind.annotation.PathVariable;
2829
import org.springframework.web.bind.annotation.RequestParam;
2930
import org.springframework.web.bind.annotation.ResponseBody;
3031

@@ -57,6 +58,7 @@ public String showVetList(@RequestParam(defaultValue = "1") int page, Model mode
5758
throw RandomExceptionGenerator.generateRandomException();
5859
}
5960
Page<Vet> paginated = findPaginated(page);
61+
logger.info("Getting Vets for Page={}", page);
6062
vets.getVetList().addAll(paginated.toList());
6163
return addPaginationModel(page, paginated, model);
6264

@@ -84,11 +86,21 @@ private Page<Vet> findPaginated(int page) {
8486
Vets vets = new Vets();
8587
Collection<Vet> vetList = this.vetRepository.findAll();
8688
for (Vet vet : vetList) {
87-
String speciality = vet.getSpecialties().get(0).getName();
88-
logger.info("Vet {} has speciality {}", vet.getFirstName(), speciality);
89+
logger.info("Vet='{}' has specialities='{}'", vet.getFirstName(), vet.getSpecialties());
8990
}
9091
vets.getVetList().addAll(vetList);
9192
return vets;
9293
}
9394

95+
@GetMapping("/vets/{lastName}")
96+
public @ResponseBody Vets showResourcesVetList(@PathVariable(name = "lastName") String lastName) {
97+
// This will throw when exercised from tester.sh as the Vet we send in has no specialties. Poor guy.
98+
Vets vets = new Vets();
99+
Collection<Vet> vetList = this.vetRepository.findByLastName(lastName);
100+
for (Vet vet : vetList) {
101+
logger.info("Vet Speciality='{}'", vet.getSpecialties().get(0).getName());
102+
}
103+
vets.getVetList().addAll(vetList);
104+
return vets;
105+
}
94106
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
import org.springframework.dao.DataAccessException;
2020
import org.springframework.data.domain.Page;
2121
import org.springframework.data.domain.Pageable;
22+
import org.springframework.data.jpa.repository.Query;
2223
import org.springframework.data.repository.Repository;
24+
import org.springframework.data.repository.query.Param;
2325
import org.springframework.transaction.annotation.Transactional;
2426

2527
import java.util.Collection;
28+
import java.util.List;
2629

2730
/**
2831
* Repository class for <code>Vet</code> domain objects All method names are compliant
@@ -55,4 +58,7 @@ public interface VetRepository extends Repository<Vet, Integer> {
5558
@Cacheable("vets")
5659
Page<Vet> findAll(Pageable pageable) throws DataAccessException;
5760

61+
@Query("SELECT DISTINCT vet FROM Vet vet WHERE vet.lastName LIKE :lastName% ")
62+
@Transactional(readOnly = true)
63+
List<Vet> findByLastName(@Param("lastName") String lastName);
5864
}

tester.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ while true; do
3131
sleep 1
3232
curl -s -o /dev/null http://localhost:8081/vets
3333
sleep 1
34+
curl -s -o /dev/null http://localhost:8081/vets/carter
35+
sleep 1
3436
# curl -s -o /dev/null http://localhost:8081/oups
3537
# sleep 1
3638
curl -s -o /dev/null http://localhost:8081/clm/error

0 commit comments

Comments
 (0)