From fe31de529beb69da60ce8dcf110423132865e069 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 21 Jan 2009 22:13:00 +0000
Subject: [PATCH] SPR-5326: HibernateClinic in PetClinic sample should use
 constructor-injection instead of field injection

---
 .../samples/petclinic/hibernate/HibernateClinic.java     | 9 ++++++---
 .../petclinic/hibernate/HibernateClinicTests-context.xml | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java
index 4d199f05cf..4116385628 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java
@@ -5,6 +5,7 @@ import java.util.Collection;
 import org.hibernate.SessionFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.samples.petclinic.Clinic;
 import org.springframework.samples.petclinic.Owner;
 import org.springframework.samples.petclinic.Pet;
@@ -13,7 +14,6 @@ import org.springframework.samples.petclinic.Vet;
 import org.springframework.samples.petclinic.Visit;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.dao.DataAccessException;
 
 /**
  * Hibernate implementation of the Clinic interface.
@@ -35,9 +35,12 @@ import org.springframework.dao.DataAccessException;
 @Transactional
 public class HibernateClinic implements Clinic {
 
-	@Autowired
 	private SessionFactory sessionFactory;
-
+	
+	@Autowired
+	public HibernateClinic(SessionFactory sessionFactory) {
+		this.sessionFactory = sessionFactory;
+	}
 
 	@Transactional(readOnly = true)
 	@SuppressWarnings("unchecked")
diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml
index 190823e610..7320035cec 100644
--- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml
+++ b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml
@@ -3,7 +3,9 @@
 	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean class="org.springframework.samples.petclinic.hibernate.HibernateClinic" />
+	<bean class="org.springframework.samples.petclinic.hibernate.HibernateClinic">
+		<constructor-arg ref="sessionFactory"/>
+	</bean>
 
 	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
 		p:dataSource-ref="dataSource" p:mappingResources="petclinic.hbm.xml">