Remove HibernateTemplate dependency from AbstractHibernateDao

Author: hirokiterashima

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

@@ -75,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

@@ -26,11 +26,6 @@
 public class HibernateAnnotationDao extends AbstractHibernateDao<Annotation>
     implements AnnotationDao<Annotation> {
 
-  @Override
-  protected String getFindAllQuery() {
-    return null;
-  }
-
   @Override
   protected Class<? extends Annotation> getDataObjectClass() {
     return null;

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

@@ -90,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

@@ -42,18 +42,11 @@
 public class HibernateAclSidDao extends AbstractHibernateDao<MutableAclSid>
     implements AclSidDao<MutableAclSid> {
 
-  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) {
     CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentAclSid> cq = cb.createQuery(PersistentAclSid.class);

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

@@ -42,18 +42,11 @@
 public class HibernateAclTargetObjectDao extends AbstractHibernateDao<MutableAclTargetObject>
     implements AclTargetObjectDao<MutableAclTargetObject> {
 
-  private static final String FIND_ALL_QUERY = "from PersistentAclTargetObject";
-
   @Override
   protected Class<PersistentAclTargetObject> getDataObjectClass() {
     return PersistentAclTargetObject.class;
   }
 
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
-
   public MutableAclTargetObject retrieveByClassname(String classname) {
     CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentAclTargetObject> cq = cb.createQuery(PersistentAclTargetObject.class);

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

@@ -48,8 +48,6 @@ public class HibernateAclTargetObjectIdentityDao
     extends AbstractHibernateDao<MutableAclTargetObjectIdentity>
     implements AclTargetObjectIdentityDao<MutableAclTargetObjectIdentity> {
 
-  private static final String FIND_ALL_QUERY = "from PersistentAclTargetObjectIdentity";
-
   public MutableAclTargetObjectIdentity retrieveByObjectIdentity(ObjectIdentity objectIdentity) {
     CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentAclTargetObjectIdentity> cq = cb
@@ -85,9 +83,4 @@ public MutableAclTargetObjectIdentity[] findChildren(ObjectIdentity parentIdenti
   protected Class<PersistentAclTargetObjectIdentity> getDataObjectClass() {
     return PersistentAclTargetObjectIdentity.class;
   }
-
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
 }

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

@@ -41,8 +41,6 @@
 public class HibernateGrantedAuthorityDao extends AbstractHibernateDao<MutableGrantedAuthority>
     implements GrantedAuthorityDao<MutableGrantedAuthority> {
 
-  private static final String FIND_ALL_QUERY = "from PersistentGrantedAuthority";
-
   public MutableGrantedAuthority retrieveByName(String authority) {
     CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentGrantedAuthority> cq = cb.createQuery(PersistentGrantedAuthority.class);
@@ -58,11 +56,6 @@ public boolean hasRole(String authority) {
     return (this.retrieveByName(authority) != null);
   }
 
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
-
   @Override
   protected Class<PersistentGrantedAuthority> getDataObjectClass() {
     return PersistentGrantedAuthority.class;

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

@@ -45,8 +45,6 @@
 public class HibernateUserDetailsDao extends AbstractHibernateDao<MutableUserDetails>
     implements UserDetailsDao<MutableUserDetails> {
 
-  private static final String FIND_ALL_QUERY = "from PersistentUserDetails";
-
   public PersistentUserDetails retrieveByName(String username) {
     CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<PersistentUserDetails> cq = cb.createQuery(PersistentUserDetails.class);
@@ -103,11 +101,6 @@ public boolean hasUsername(String username) {
     return this.retrieveByName(username) != null;
   }
 
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
-
   @Override
   protected Class<PersistentUserDetails> getDataObjectClass() {
     return PersistentUserDetails.class;

src/main/java/org/wise/portal/dao/group/impl/HibernateGroupDao.java

@@ -33,18 +33,7 @@
  * @author Hiroki Terashima
  */
 @Repository
-public class HibernateGroupDao extends AbstractHibernateDao<Group> implements
-    GroupDao<Group> {
-
-  private static final String FIND_ALL_QUERY = "from PersistentGroup";
-
-  /**
-   * @see org.wise.portal.dao.impl.AbstractHibernateDao#getFindAllQuery()
-   */
-  @Override
-  protected String getFindAllQuery() {
-    return FIND_ALL_QUERY;
-  }
+public class HibernateGroupDao extends AbstractHibernateDao<Group> implements GroupDao<Group> {
 
   /**
    * @see org.wise.portal.dao.impl.AbstractHibernateDao#getDataObjectClass()