build(Hibernate): Remove dependency on HibernateDaoSupport and HibernateTemplate

src/main/java/org/wise/portal/dao/achievement/HibernateAchievementDao.java

@@ -26,15 +26,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.Session;
 import org.springframework.stereotype.Repository;
 import org.wise.portal.dao.impl.AbstractHibernateDao;
 import org.wise.portal.domain.run.Run;
@@ -49,15 +46,11 @@
 public class HibernateAchievementDao extends AbstractHibernateDao<Achievement>
     implements AchievementDao<Achievement> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   @SuppressWarnings("unchecked")
   public List<Achievement> getAchievementsByParams(Integer id, Run run, Workgroup workgroup,
       String achievementId, String type) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<Achievement> cq = cb.createQuery(Achievement.class);
     Root<Achievement> achievementRoot = cq.from(Achievement.class);
     List<Predicate> predicates = new ArrayList<>();
@@ -82,11 +75,6 @@ public List<Achievement> getAchievementsByParams(Integer id, Run run, Workgroup
     return (List<Achievement>) (Object) query.getResultList();
   }
 
-  @Override
-  protected String getFindAllQuery() {
-    return null;
-  }
-
   @Override
   protected Class<? extends Achievement> getDataObjectClass() {
     return Achievement.class;

src/main/java/org/wise/portal/dao/annotation/wise5/impl/HibernateAnnotationDao.java

@@ -4,15 +4,12 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.Session;
 import org.springframework.stereotype.Repository;
 import org.wise.portal.dao.annotation.wise5.AnnotationDao;
 import org.wise.portal.dao.impl.AbstractHibernateDao;
@@ -29,14 +26,6 @@
 public class HibernateAnnotationDao extends AbstractHibernateDao<Annotation>
     implements AnnotationDao<Annotation> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
-  @Override
-  protected String getFindAllQuery() {
-    return null;
-  }
-
   @Override
   protected Class<? extends Annotation> getDataObjectClass() {
     return null;
@@ -47,8 +36,7 @@ protected Class<? extends Annotation> getDataObjectClass() {
   public List<Annotation> getAnnotationsByParams(Integer id, Run run, Group period,
       Workgroup fromWorkgroup, Workgroup toWorkgroup, String nodeId, String componentId,
       StudentWork studentWork, String localNotebookItemId, NotebookItem notebookItem, String type) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<Annotation> cq = cb.createQuery(Annotation.class);
     Root<Annotation> annotationRoot = cq.from(Annotation.class);
     List<Predicate> predicates = new ArrayList<>();
@@ -95,8 +83,7 @@ public List<Annotation> getAnnotations(Run run, String nodeId, String componentI
   }
 
   public List<Annotation> getAnnotations(Run run, Group period, String nodeId, String componentId) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<Annotation> cq = cb.createQuery(Annotation.class);
     Root<Annotation> annotationRoot = cq.from(Annotation.class);
     Root<RunImpl> runImplRoot = cq.from(RunImpl.class);
@@ -117,8 +104,7 @@ public List<Annotation> getAnnotations(Run run, Group period, String nodeId, Str
 
   public List<Annotation> getAnnotationsToWorkgroups(Set<Workgroup> workgroups, String nodeId,
       String componentId) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<Annotation> cq = cb.createQuery(Annotation.class);
     Root<Annotation> annotationRoot = cq.from(Annotation.class);
     List<Predicate> predicates = new ArrayList<Predicate>();

src/main/java/org/wise/portal/dao/attendance/impl/HibernateStudentAttendanceDao.java

@@ -28,15 +28,12 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.Session;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import org.wise.portal.dao.attendance.StudentAttendanceDao;
@@ -48,14 +45,10 @@
 public class HibernateStudentAttendanceDao extends AbstractHibernateDao<StudentAttendance>
     implements StudentAttendanceDao<StudentAttendance> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
-  @Transactional(readOnly=true)
+  @Transactional(readOnly = true)
   @SuppressWarnings("unchecked")
   public List<StudentAttendance> getStudentAttendanceByRunId(Long runId) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<StudentAttendanceImpl> cq = cb.createQuery(StudentAttendanceImpl.class);
     Root<StudentAttendanceImpl> studentAttendanceRoot = cq.from(StudentAttendanceImpl.class);
     cq.select(studentAttendanceRoot).where(cb.equal(studentAttendanceRoot.get("runId"), runId))
@@ -66,11 +59,10 @@ public List<StudentAttendance> getStudentAttendanceByRunId(Long runId) {
 
   @SuppressWarnings("unchecked")
   @Override
-  @Transactional(readOnly=true)
-  public List<StudentAttendance> getStudentAttendanceByRunIdAndPeriod(
-      Long runId, int lookBackNumDays) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+  @Transactional(readOnly = true)
+  public List<StudentAttendance> getStudentAttendanceByRunIdAndPeriod(Long runId,
+      int lookBackNumDays) {
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<StudentAttendanceImpl> cq = cb.createQuery(StudentAttendanceImpl.class);
     Root<StudentAttendanceImpl> studentAttendanceRoot = cq.from(StudentAttendanceImpl.class);
     List<Predicate> predicates = new ArrayList<>();
@@ -81,8 +73,8 @@ public List<StudentAttendance> getStudentAttendanceByRunIdAndPeriod(
     this.roundDownCalendar(c, Calendar.SECOND);
     this.roundDownCalendar(c, Calendar.MILLISECOND);
     Date compareDate = c.getTime();
-    predicates.add(
-        cb.greaterThanOrEqualTo(studentAttendanceRoot.get("loginTimestamp"), compareDate));
+    predicates
+        .add(cb.greaterThanOrEqualTo(studentAttendanceRoot.get("loginTimestamp"), compareDate));
     predicates.add(cb.equal(studentAttendanceRoot.get("runId"), runId));
     cq.select(studentAttendanceRoot).where(predicates.toArray(new Predicate[predicates.size()]))
         .orderBy(cb.desc(studentAttendanceRoot.get("loginTimestamp")));
@@ -98,9 +90,4 @@ private void roundDownCalendar(Calendar c, int timeUnit) {
   protected Class<? extends StudentAttendance> getDataObjectClass() {
     return null;
   }
-
-  @Override
-  protected String getFindAllQuery() {
-    return null;
-  }
 }

src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclEntryDao.java

@@ -32,10 +32,8 @@
  * @author Cynick Young
  */
 @Repository
-public class HibernateAclEntryDao extends AbstractHibernateDao<ImmutableAclEntry> implements
-  AclEntryDao<ImmutableAclEntry> {
-
-  private static final String FIND_ALL_QUERY = "from PersistentAclEntry";
+public class HibernateAclEntryDao extends AbstractHibernateDao<ImmutableAclEntry>
+    implements AclEntryDao<ImmutableAclEntry> {
 
   /**
    * @see org.wise.portal.dao.impl.AbstractHibernateDao#getDataObjectClass()
@@ -44,12 +42,4 @@ public class HibernateAclEntryDao extends AbstractHibernateDao<ImmutableAclEntry
   protected Class<? extends ImmutableAclEntry> getDataObjectClass() {
     return PersistentAclEntry.class;
   }
-
-  /**
-   * @see org.wise.portal.dao.impl.AbstractHibernateDao#getFindAllQuery()
-   */
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
 }

src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclSidDao.java

@@ -20,15 +20,11 @@
  */
 package org.wise.portal.dao.authentication.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.Session;
 import org.springframework.stereotype.Repository;
 import org.wise.portal.dao.authentication.AclSidDao;
 import org.wise.portal.dao.impl.AbstractHibernateDao;
@@ -46,24 +42,13 @@
 public class HibernateAclSidDao extends AbstractHibernateDao<MutableAclSid>
     implements AclSidDao<MutableAclSid> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
-  private static final String FIND_ALL_QUERY = "from PersistentAclSid";
-
   @Override
   protected Class<PersistentAclSid> getDataObjectClass() {
     return PersistentAclSid.class;
   }
 
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
-
   public MutableAclSid retrieveBySidName(String sidName) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentAclSid> cq = cb.createQuery(PersistentAclSid.class);
     Root<PersistentAclSid> persistentAclSidRoot = cq.from(PersistentAclSid.class);
     cq.select(persistentAclSidRoot).where(cb.equal(persistentAclSidRoot.get("sidName"), sidName));

src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclTargetObjectDao.java

@@ -20,15 +20,11 @@
  */
 package org.wise.portal.dao.authentication.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.Session;
 import org.springframework.stereotype.Repository;
 import org.wise.portal.dao.authentication.AclTargetObjectDao;
 import org.wise.portal.dao.impl.AbstractHibernateDao;
@@ -43,33 +39,21 @@
  * @author Cynick Young
  */
 @Repository
-public class HibernateAclTargetObjectDao extends
-    AbstractHibernateDao<MutableAclTargetObject> implements
-    AclTargetObjectDao<MutableAclTargetObject> {
+public class HibernateAclTargetObjectDao extends AbstractHibernateDao<MutableAclTargetObject>
+    implements AclTargetObjectDao<MutableAclTargetObject> {
 
-  private static final String FIND_ALL_QUERY = "from PersistentAclTargetObject";
-
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected Class<PersistentAclTargetObject> getDataObjectClass() {
     return PersistentAclTargetObject.class;
   }
 
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
-
   public MutableAclTargetObject retrieveByClassname(String classname) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentAclTargetObject> cq = cb.createQuery(PersistentAclTargetObject.class);
-    Root<PersistentAclTargetObject> persistentAclTargetObjectRoot = 
-        cq.from(PersistentAclTargetObject.class);
-    cq.select(persistentAclTargetObjectRoot).where(
-        cb.equal(persistentAclTargetObjectRoot.get("classname"), classname));
+    Root<PersistentAclTargetObject> persistentAclTargetObjectRoot = cq
+        .from(PersistentAclTargetObject.class);
+    cq.select(persistentAclTargetObjectRoot)
+        .where(cb.equal(persistentAclTargetObjectRoot.get("classname"), classname));
     TypedQuery<PersistentAclTargetObject> query = entityManager.createQuery(cq);
     return query.getResultStream().findFirst().orElse(null);
   }

src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclTargetObjectIdentityDao.java

@@ -3,7 +3,7 @@
  *
  * This software is distributed under the GNU General Public License, v3,
  * or (at your option) any later version.
- * 
+ *
  * Permission is hereby granted, without written agreement and without license
  * or royalty fees, to use, copy, modify, and distribute this software and its
  * documentation for any purpose, provided that the above copyright notice and
@@ -23,15 +23,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.hibernate.Session;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.stereotype.Repository;
 import org.wise.portal.dao.authentication.AclTargetObjectIdentityDao;
@@ -43,22 +40,16 @@
  * This class is not being used. Tried to implement Hibernate versions of the acl
  * services and became bogged down, so went back to jdbc versions. Keeping this
  * class around in case we want to try again later.
- * 
+ *
  * @author Cynick Young
  */
 @Repository
 public class HibernateAclTargetObjectIdentityDao
     extends AbstractHibernateDao<MutableAclTargetObjectIdentity>
     implements AclTargetObjectIdentityDao<MutableAclTargetObjectIdentity> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
-  private static final String FIND_ALL_QUERY = "from PersistentAclTargetObjectIdentity";
-
   public MutableAclTargetObjectIdentity retrieveByObjectIdentity(ObjectIdentity objectIdentity) {
-    Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
-    CriteriaBuilder cb = session.getCriteriaBuilder();
+    CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentAclTargetObjectIdentity> cq = cb
         .createQuery(PersistentAclTargetObjectIdentity.class);
     Root<PersistentAclTargetObjectIdentity> persistentAclTargetObjectIdentityRoot = cq
@@ -92,9 +83,4 @@ public MutableAclTargetObjectIdentity[] findChildren(ObjectIdentity parentIdenti
   protected Class<PersistentAclTargetObjectIdentity> getDataObjectClass() {
     return PersistentAclTargetObjectIdentity.class;
   }
-
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
-}
+}