Child Dao classes now use the EntityManager of parent (AbstractHibernateDao)

hirokiterashima · hirokiterashima · commit 258beb54937c · 2025-09-29T16:48:04.000-07:00
diff --git a/src/main/java/org/wise/portal/dao/achievement/HibernateAchievementDao.java b/src/main/java/org/wise/portal/dao/achievement/HibernateAchievementDao.java
@@ -26,8 +26,6 @@
 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;
@@ -48,9 +46,6 @@
 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,
diff --git a/src/main/java/org/wise/portal/dao/annotation/wise5/impl/HibernateAnnotationDao.java b/src/main/java/org/wise/portal/dao/annotation/wise5/impl/HibernateAnnotationDao.java
@@ -4,8 +4,6 @@
 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;
@@ -28,9 +26,6 @@
 public class HibernateAnnotationDao extends AbstractHibernateDao<Annotation>
     implements AnnotationDao<Annotation> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return null;
diff --git a/src/main/java/org/wise/portal/dao/attendance/impl/HibernateStudentAttendanceDao.java b/src/main/java/org/wise/portal/dao/attendance/impl/HibernateStudentAttendanceDao.java
@@ -28,8 +28,6 @@
 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;
@@ -47,9 +45,6 @@
 public class HibernateStudentAttendanceDao extends AbstractHibernateDao<StudentAttendance>
     implements StudentAttendanceDao<StudentAttendance> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Transactional(readOnly = true)
   @SuppressWarnings("unchecked")
   public List<StudentAttendance> getStudentAttendanceByRunId(Long runId) {
diff --git a/src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclSidDao.java b/src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclSidDao.java
@@ -20,8 +20,6 @@
  */
 package org.wise.portal.dao.authentication.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -44,9 +42,6 @@
 public class HibernateAclSidDao extends AbstractHibernateDao<MutableAclSid>
     implements AclSidDao<MutableAclSid> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from PersistentAclSid";
 
   @Override
diff --git a/src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclTargetObjectDao.java b/src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclTargetObjectDao.java
@@ -20,8 +20,6 @@
  */
 package org.wise.portal.dao.authentication.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -46,9 +44,6 @@ public class HibernateAclTargetObjectDao extends AbstractHibernateDao<MutableAcl
 
   private static final String FIND_ALL_QUERY = "from PersistentAclTargetObject";
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected Class<PersistentAclTargetObject> getDataObjectClass() {
     return PersistentAclTargetObject.class;
diff --git a/src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclTargetObjectIdentityDao.java b/src/main/java/org/wise/portal/dao/authentication/impl/HibernateAclTargetObjectIdentityDao.java
@@ -23,8 +23,6 @@
 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;
@@ -50,9 +48,6 @@ 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) {
diff --git a/src/main/java/org/wise/portal/dao/authentication/impl/HibernateGrantedAuthorityDao.java b/src/main/java/org/wise/portal/dao/authentication/impl/HibernateGrantedAuthorityDao.java
@@ -20,8 +20,6 @@
  */
 package org.wise.portal.dao.authentication.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -43,9 +41,6 @@
 public class HibernateGrantedAuthorityDao extends AbstractHibernateDao<MutableGrantedAuthority>
     implements GrantedAuthorityDao<MutableGrantedAuthority> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from PersistentGrantedAuthority";
 
   public MutableGrantedAuthority retrieveByName(String authority) {
diff --git a/src/main/java/org/wise/portal/dao/authentication/impl/HibernateUserDetailsDao.java b/src/main/java/org/wise/portal/dao/authentication/impl/HibernateUserDetailsDao.java
@@ -22,8 +22,6 @@
 
 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;
@@ -47,9 +45,6 @@
 public class HibernateUserDetailsDao extends AbstractHibernateDao<MutableUserDetails>
     implements UserDetailsDao<MutableUserDetails> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from PersistentUserDetails";
 
   public PersistentUserDetails retrieveByName(String username) {
diff --git a/src/main/java/org/wise/portal/dao/impl/AbstractHibernateDao.java b/src/main/java/org/wise/portal/dao/impl/AbstractHibernateDao.java
@@ -46,7 +46,7 @@
 public abstract class AbstractHibernateDao<T> extends HibernateDaoSupport implements SimpleDao<T> {
 
   @PersistenceContext
-  private EntityManager entityManager;
+  protected EntityManager entityManager;
 
   @Resource
   protected SessionFactory sessionFactory;
diff --git a/src/main/java/org/wise/portal/dao/newsitem/impl/HibernateNewsItemDao.java b/src/main/java/org/wise/portal/dao/newsitem/impl/HibernateNewsItemDao.java
@@ -25,8 +25,6 @@
 
 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;
@@ -45,9 +43,6 @@
 public class HibernateNewsItemDao extends AbstractHibernateDao<NewsItem>
     implements NewsItemDao<NewsItem> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from NewsItemImpl order by id desc";
 
   @Override
diff --git a/src/main/java/org/wise/portal/dao/notification/impl/HibernateNotificationDao.java b/src/main/java/org/wise/portal/dao/notification/impl/HibernateNotificationDao.java
@@ -26,8 +26,6 @@
 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;
@@ -50,9 +48,6 @@
 public class HibernateNotificationDao extends AbstractHibernateDao<Notification>
     implements NotificationDao<Notification> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return null;
diff --git a/src/main/java/org/wise/portal/dao/peergroup/impl/HibernatePeerGroupDao.java b/src/main/java/org/wise/portal/dao/peergroup/impl/HibernatePeerGroupDao.java
@@ -27,9 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -55,9 +53,6 @@
 public class HibernatePeerGroupDao extends AbstractHibernateDao<PeerGroup>
     implements PeerGroupDao<PeerGroup> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return "from PeerGroupImpl";
diff --git a/src/main/java/org/wise/portal/dao/peergrouping/impl/HibernatePeerGroupingDao.java b/src/main/java/org/wise/portal/dao/peergrouping/impl/HibernatePeerGroupingDao.java
@@ -26,8 +26,6 @@
 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;
@@ -48,9 +46,6 @@
 public class HibernatePeerGroupingDao extends AbstractHibernateDao<PeerGrouping>
     implements PeerGroupingDao<PeerGrouping> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return "from PeerGroupingImpl";
diff --git a/src/main/java/org/wise/portal/dao/portal/impl/HibernatePortalStatisticsDao.java b/src/main/java/org/wise/portal/dao/portal/impl/HibernatePortalStatisticsDao.java
@@ -25,8 +25,6 @@
 
 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;
@@ -42,9 +40,6 @@
 public class HibernatePortalStatisticsDao extends AbstractHibernateDao<PortalStatistics>
     implements PortalStatisticsDao<PortalStatistics> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected Class<? extends PortalStatistics> getDataObjectClass() {
     return null;
diff --git a/src/main/java/org/wise/portal/dao/project/impl/HibernateProjectDao.java b/src/main/java/org/wise/portal/dao/project/impl/HibernateProjectDao.java
@@ -28,9 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
-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;
@@ -57,9 +55,6 @@
 public class HibernateProjectDao extends AbstractHibernateDao<Project>
     implements ProjectDao<Project> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from ProjectImpl";
 
   @Override
diff --git a/src/main/java/org/wise/portal/dao/project/impl/HibernateTagDao.java b/src/main/java/org/wise/portal/dao/project/impl/HibernateTagDao.java
@@ -25,8 +25,6 @@
 
 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;
@@ -48,9 +46,6 @@ public class HibernateTagDao extends AbstractHibernateDao<Tag> implements TagDao
 
   private static final String FIND_ALL_QUERY = "from TagImpl";
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected Class<? extends Tag> getDataObjectClass() {
     return TagImpl.class;
diff --git a/src/main/java/org/wise/portal/dao/run/impl/HibernateRunDao.java b/src/main/java/org/wise/portal/dao/run/impl/HibernateRunDao.java
@@ -29,8 +29,6 @@
 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;
@@ -57,9 +55,6 @@
 @Repository
 public class HibernateRunDao extends AbstractHibernateDao<Run> implements RunDao<Run> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from RunImpl";
 
   @Override
diff --git a/src/main/java/org/wise/portal/dao/statistics/impl/HibernateVLEStatisticsDao.java b/src/main/java/org/wise/portal/dao/statistics/impl/HibernateVLEStatisticsDao.java
@@ -25,8 +25,6 @@
 
 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;
@@ -43,9 +41,6 @@
 public class HibernateVLEStatisticsDao extends AbstractHibernateDao<VLEStatistics>
     implements VLEStatisticsDao<VLEStatistics> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return null;
diff --git a/src/main/java/org/wise/portal/dao/status/impl/HibernateRunStatusDao.java b/src/main/java/org/wise/portal/dao/status/impl/HibernateRunStatusDao.java
@@ -23,8 +23,6 @@
  */
 package org.wise.portal.dao.status.impl;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -40,9 +38,6 @@
 public class HibernateRunStatusDao extends AbstractHibernateDao<RunStatus>
     implements RunStatusDao<RunStatus> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return null;
diff --git a/src/main/java/org/wise/portal/dao/status/impl/HibernateStudentStatusDao.java b/src/main/java/org/wise/portal/dao/status/impl/HibernateStudentStatusDao.java
@@ -25,8 +25,6 @@
 
 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;
@@ -42,9 +40,6 @@
 public class HibernateStudentStatusDao extends AbstractHibernateDao<StudentStatus>
     implements StudentStatusDao<StudentStatus> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   @Override
   protected String getFindAllQuery() {
     return null;
diff --git a/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java b/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java
@@ -25,8 +25,6 @@
 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;
@@ -50,9 +48,6 @@
 @Repository
 public class HibernateUserDao extends AbstractHibernateDao<User> implements UserDao<User> {
 
-  @PersistenceContext
-  private EntityManager entityManager;
-
   private static final String FIND_ALL_QUERY = "from UserImpl";
 
   @Override
diff --git a/src/main/java/org/wise/portal/dao/usertags/impl/HibernateUserTagsDao.java b/src/main/java/org/wise/portal/dao/usertags/impl/HibernateUserTagsDao.java
diff --git a/src/main/java/org/wise/portal/dao/work/impl/HibernateEventDao.java b/src/main/java/org/wise/portal/dao/work/impl/HibernateEventDao.java
diff --git a/src/main/java/org/wise/portal/dao/work/impl/HibernateNotebookItemDao.java b/src/main/java/org/wise/portal/dao/work/impl/HibernateNotebookItemDao.java
diff --git a/src/main/java/org/wise/portal/dao/work/impl/HibernateStudentAssetDao.java b/src/main/java/org/wise/portal/dao/work/impl/HibernateStudentAssetDao.java
diff --git a/src/main/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDao.java b/src/main/java/org/wise/portal/dao/work/impl/HibernateStudentWorkDao.java
diff --git a/src/main/java/org/wise/portal/dao/workgroup/impl/HibernateWorkgroupDao.java b/src/main/java/org/wise/portal/dao/workgroup/impl/HibernateWorkgroupDao.java
