petclinic-uncached

fixed naming issue in vet list

2/7/2013 12:31:18 AM

Mic

Commit: 0e60b03

Tree: 6381c89

Parents: 47ddd6f

Changes

src/main/java/org/springframework/samples/petclinic/Vet.java 4(+3 -1)

src/main/java/org/springframework/samples/petclinic/web/VetController.java 2(+1 -1)

src/main/webapp/WEB-INF/jsp/vets/vetList.jsp 4(+2 -2)

src/main/webapp/WEB-INF/mvc-view-config.xml 2(+1 -1)

Details

src/main/java/org/springframework/samples/petclinic/Vet.java 4(+3 -1)

diff --git a/src/main/java/org/springframework/samples/petclinic/Vet.java b/src/main/java/org/springframework/samples/petclinic/Vet.java
index 5ef56fe..744288b 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<Specialty> specialties;

src/main/java/org/springframework/samples/petclinic/web/VetController.java 2(+1 -1)

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 07bcaaa..50cefc7 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";
 	}

src/main/webapp/WEB-INF/mvc-view-config.xml 2(+1 -1)

diff --git a/src/main/webapp/WEB-INF/mvc-view-config.xml b/src/main/webapp/WEB-INF/mvc-view-config.xml
index a917998..94ca95f 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 @@
 	<!-- 	- The AtomView rendering a Atom feed of the visits  -->	 
 	<bean id="visitList" class="org.springframework.samples.petclinic.web.VisitsAtomView"/>
 
-	<bean id="vets/vetsList" class="org.springframework.web.servlet.view.xml.MarshallingView">
+	<bean id="vets/vetList" class="org.springframework.web.servlet.view.xml.MarshallingView">
 		<property name="marshaller" ref="marshaller"/>
 	</bean>