diff --git a/src/main/java/org/springframework/samples/petclinic/Vet.java b/src/main/java/org/springframework/samples/petclinic/Vet.java index 5ef56fe8e..744288bfe 100644 --- a/src/main/java/org/springframework/samples/petclinic/Vet.java +++ b/src/main/java/org/springframework/samples/petclinic/Vet.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; @@ -27,7 +28,8 @@ import org.springframework.beans.support.PropertyComparator; @Entity @Table(name="vets") public class Vet extends Person { - @ManyToMany @JoinTable (name="vet_specialties",joinColumns = @JoinColumn(name = "vet_id"), + @ManyToMany(fetch=FetchType.EAGER) + @JoinTable (name="vet_specialties",joinColumns = @JoinColumn(name = "vet_id"), inverseJoinColumns= @JoinColumn(name = "specialty_id")) private Set specialties; diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetController.java b/src/main/java/org/springframework/samples/petclinic/web/VetController.java index 07bcaaa84..50cefc7d3 100644 --- a/src/main/java/org/springframework/samples/petclinic/web/VetController.java +++ b/src/main/java/org/springframework/samples/petclinic/web/VetController.java @@ -44,7 +44,7 @@ public class VetController { Vets vets = new Vets(); vets.getVetList().addAll(this.clinicService.findVets()); model.addAttribute("vets", vets); - return "vets/vetsList"; + return "vets/vetList"; } diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp similarity index 90% rename from src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp rename to src/main/webapp/WEB-INF/jsp/vets/vetList.jsp index 057454ab7..fc68b56d9 100644 --- a/src/main/webapp/WEB-INF/jsp/vets/vetsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp @@ -24,10 +24,10 @@ - ${vet.firstName} ${vet.lastName} + - ${specialty.name} + none diff --git a/src/main/webapp/WEB-INF/mvc-view-config.xml b/src/main/webapp/WEB-INF/mvc-view-config.xml index a91799871..94ca95fa0 100644 --- a/src/main/webapp/WEB-INF/mvc-view-config.xml +++ b/src/main/webapp/WEB-INF/mvc-view-config.xml @@ -56,7 +56,7 @@ - +