Removed the dependence on JpaTemplate

[utils] / mythtv / monitor / src / main / java / org / wamblee / mythtv / RecordingDatabase.java

diff --git a/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
index cbcf89d20caf4924fb176e2519d56c2ad1d5739f..aafa25378cc4259536cdf43af141efbe933995aa 100644 (file)
--- a/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
+++ b/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
@@ -16,48 +16,29 @@
 
 package org.wamblee.mythtv;
 
-import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.criterion.Expression;
-import org.springframework.orm.hibernate3.HibernateCallback;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-import org.springframework.orm.jpa.JpaTemplate;
-import org.springframework.orm.jpa.support.JpaDaoSupport;
 
 /**
  * 
  */
-public class RecordingDatabase extends JpaDaoSupport {
+public class RecordingDatabase {
     
     private static final Log LOG = LogFactory.getLog(RecordingDatabase.class);
-
-    public RecordingDatabase() { 
-        // Empty
-    }
     
-    public void init() {  
-        /* 
-        for (Recording recording: (List<Recording>)getHibernateTemplate().loadAll(Recording.class) ) { 
-            LOG.info("Found recording " + recording);
-        }
-        LOG.info("After listing recordings");
-        */
+    private EntityManager _entityManager; 
+
+    public RecordingDatabase(EntityManager aEntityManager) { 
+        _entityManager = aEntityManager; 
     }
     
     public Recording findRecording(final String aName) {
-        JpaTemplate jpaTemplate = getJpaTemplate();
-        EntityManager entityManager = jpaTemplate.getEntityManager();
-        Query query = entityManager.createQuery(
+        Query query = _entityManager.createQuery(
                 "select r from Recording r where r.basename = ?1");
         query.setParameter(1, aName);
         List<Recording> result = query.getResultList();
@@ -71,6 +52,6 @@ public class RecordingDatabase extends JpaDaoSupport {
     }
     
     public void update(Recording aRecording) { 
-        getJpaTemplate().getEntityManager().merge(aRecording);
+        _entityManager.merge(aRecording);
     }
 }