[DS-3741] cleaned up code in comments

dspace-api/src/main/java/org/dspace/app/requestitem/dao/impl/RequestItemDAOImpl.java

@@ -37,10 +37,6 @@ public class RequestItemDAOImpl extends AbstractHibernateDAO<RequestItem> implem
 
     @Override
     public RequestItem findByToken(Context context, String token) throws SQLException {
-//        Criteria criteria = createCriteria(context, RequestItem.class);
-//        criteria.add(Restrictions.eq("token", token));
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, RequestItem.class);
         Root<RequestItem> requestItemRoot = criteriaQuery.from(RequestItem.class);

dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java

@@ -42,13 +42,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
 
     @Override
     public List<ResourcePolicy> findByDso(Context context, DSpaceObject dso) throws SQLException {
-//        Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("dSpaceObject", dso)
-//        ));
-//        return list(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
@@ -60,13 +53,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public List<ResourcePolicy> findByDsoAndType(Context context, DSpaceObject dso, String type) throws SQLException
     {
-//        Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("dSpaceObject", dso),
-//                Restrictions.eq("rptype", type)
-//        ));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
@@ -80,10 +66,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
 
     @Override
     public List<ResourcePolicy> findByGroup(Context context, Group group) throws SQLException {
-//        Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//        criteria.add(Restrictions.eq("epersonGroup", group));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
@@ -95,14 +77,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public List<ResourcePolicy> findByDSoAndAction(Context context, DSpaceObject dso, int actionId) throws SQLException
     {
-//        Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("dSpaceObject", dso),
-//                Restrictions.eq("actionId", actionId)
-//        ));
-//        return list(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
@@ -116,16 +90,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
 
     @Override
     public List<ResourcePolicy> findByTypeGroupAction(Context context, DSpaceObject dso, Group group, int action) throws SQLException {
-//        Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("dSpaceObject", dso),
-//                Restrictions.eq("epersonGroup", group),
-//                Restrictions.eq("actionId", action)
-//        ));
-//        criteria.setMaxResults(1);
-//        return list(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
@@ -140,16 +104,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     
     @Override
     public List<ResourcePolicy> findByTypeGroupActionExceptId(Context context, DSpaceObject dso, Group group, int action, int notPolicyID) throws SQLException {
-//        Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("dSpaceObject", dso),
-//                Restrictions.eq("epersonGroup", group),
-//                Restrictions.eq("actionId", action)
-//        ));
-//        criteria.add(Restrictions.and(Restrictions.not(Restrictions.eq("id", notPolicyID))));
-//        return list(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
@@ -165,18 +119,6 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     
      public List<ResourcePolicy> findByEPersonGroupTypeIdAction(Context context, EPerson e, List<Group> groups, int action, int type_id) throws SQLException
      {
-//         Criteria criteria = createCriteria(context, ResourcePolicy.class);
-//         criteria.add(Restrictions.and(
-//                  Restrictions.eq("resourceTypeId", type_id),
-//                  Restrictions.eq("actionId", action),
-//                  (Restrictions.or(
-//                    Restrictions.eq("eperson", e),
-//                    Restrictions.in("epersonGroup", groups)
-//                    ))
-//                 ));
-//         return list(criteria);
-//
-//
          //TODO Make sure you double check this
          CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
          CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);

dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumResultDAOImpl.java

@@ -39,10 +39,6 @@ public class ChecksumResultDAOImpl extends AbstractHibernateDAO<ChecksumResult>
 
     @Override
     public ChecksumResult findByCode(Context context, ChecksumResultCode code) throws SQLException {
-//        Criteria criteria = createCriteria(context, ChecksumResult.class);
-//        criteria.add(Restrictions.eq("resultCode", code));
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ChecksumResult.class);
         Root<ChecksumResult> checksumResultRoot = criteriaQuery.from(ChecksumResult.class);

dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java

@@ -80,10 +80,6 @@ public class MostRecentChecksumDAOImpl extends AbstractHibernateDAO<MostRecentCh
 
     @Override
     public MostRecentChecksum findByBitstream(Context context, Bitstream bitstream) throws SQLException {
-//        Criteria criteria = createCriteria(context, MostRecentChecksum.class);
-//        criteria.add(Restrictions.eq("bitstream", bitstream));
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery<MostRecentChecksum> criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
         Root<MostRecentChecksum> mostRecentChecksumRoot = criteriaQuery.from(MostRecentChecksum.class);

dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java

@@ -37,8 +37,6 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO<Bitstream> impleme
 
     @Override
     public List<Bitstream> findDeletedBitstreams(Context context) throws SQLException {
-//        Criteria criteria = createCriteria(context, Bitstream.class);
-//        criteria.add(Restrictions.eq("deleted", true));
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Bitstream.class);
         Root<Bitstream> bitstreamRoot = criteriaQuery.from(Bitstream.class);
@@ -50,13 +48,6 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO<Bitstream> impleme
 
     @Override
     public List<Bitstream> findDuplicateInternalIdentifier(Context context, Bitstream bitstream) throws SQLException {
-//        Criteria criteria = createCriteria(context, Bitstream.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("internalId", bitstream.getInternalId()),
-//                Restrictions.not(Restrictions.eq("id", bitstream.getID()))
-//        ));
-//
-//        return list(criteria);
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Bitstream.class);
         Root<Bitstream> bitstreamRoot = criteriaQuery.from(Bitstream.class);

dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java

@@ -60,15 +60,6 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO<BitstreamFormat
     {
         // NOTE: Avoid internal formats since e.g. "License" also has
         // a MIMEtype of text/plain.
-//        Criteria criteria = createCriteria(context, BitstreamFormat.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("internal", includeInternal),
-//                Restrictions.like("mimetype", mimeType)
-//        ));
-//
-//        return singleResult(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BitstreamFormat.class);
         Root<BitstreamFormat> bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
@@ -96,13 +87,6 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO<BitstreamFormat
     public BitstreamFormat findByShortDescription(Context context,
             String desc) throws SQLException
     {
-//        Criteria criteria = createCriteria(context, BitstreamFormat.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("shortDescription", desc)
-//        ));
-//
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BitstreamFormat.class);
         Root<BitstreamFormat> bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
@@ -151,9 +135,6 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO<BitstreamFormat
         Query query = createQuery(context, "from BitstreamFormat bf where :extension in elements(bf.fileExtensions)");
         query.setParameter("extension", extension);
 
-//        Criteria criteria = createCriteria(context, BitstreamFormat.class, "bitstreamFormat");
-//        criteria.createAlias("bitstreamFormat.fileExtensions", "extension");
-//        criteria.add(Restrictions.eq("extension",extension ));
         return list(query);
     }
 

dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java

@@ -84,10 +84,6 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO<Collection> imple
 
     @Override
     public Collection findByTemplateItem(Context context, Item item) throws SQLException {
-//        Criteria criteria = createCriteria(context, Collection.class);
-//        criteria.add(Restrictions.eq("template_item", item));
-//        return uniqueResult(criteria);
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Collection.class);
         Root<Collection> collectionRoot = criteriaQuery.from(Collection.class);
@@ -99,19 +95,6 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO<Collection> imple
 
     @Override
     public Collection findByGroup(Context context, Group group) throws SQLException {
-//        Criteria criteria = createCriteria(context, Collection.class);
-//        criteria.add(
-//                Restrictions.or(
-//                        Restrictions.eq("workflowStep1", group),
-//                        Restrictions.eq("workflowStep2", group),
-//                        Restrictions.eq("workflowStep3", group),
-//                        Restrictions.eq("submitters", group),
-//                        Restrictions.eq("admins", group)
-//                )
-//        );
-//        return singleResult(criteria);
-
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Collection.class);
         Root<Collection> collectionRoot = criteriaQuery.from(Collection.class);

dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java

@@ -80,10 +80,6 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO<Community> impleme
 
     @Override
     public Community findByAdminGroup(Context context, Group group) throws SQLException {
-//        Criteria criteria = createCriteria(context, Community.class);
-//        criteria.add(Restrictions.eq("admins", group));
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Community.class);
         Root<Community> communityRoot = criteriaQuery.from(Community.class);

dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java

@@ -35,15 +35,10 @@ public class SiteDAOImpl extends AbstractHibernateDAO<Site> implements SiteDAO
 
     @Override
     public Site findSite(Context context) throws SQLException {
-//        Criteria criteria = createCriteria(context, Site.class);
-//        criteria.setCacheable(true);
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Site.class);
         Root<Site> siteRoot = criteriaQuery.from(Site.class);
         criteriaQuery.select(siteRoot);
-//        criteriaQuery.where(criteriaBuilder.equal(root.get("doi"), doi));
         return uniqueResult(context, criteriaQuery, true, Site.class, -1, -1);
     }
 }

dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java

@@ -64,10 +64,6 @@ public class WorkspaceItemDAOImpl extends AbstractHibernateDAO<WorkspaceItem> im
     @Override
     public List<WorkspaceItem> findByCollection(Context context, Collection c) throws SQLException
     {
-//        Criteria criteria = createCriteria(context, WorkspaceItem.class);
-//        criteria.add(Restrictions.eq("collection", c));
-//        return list(criteria);
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
         Root<WorkspaceItem> workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
@@ -80,12 +76,6 @@ public class WorkspaceItemDAOImpl extends AbstractHibernateDAO<WorkspaceItem> im
     @Override
     public WorkspaceItem findByItem(Context context, Item i) throws SQLException
     {
-//        Criteria criteria = createCriteria(context, WorkspaceItem.class);
-//        criteria.add(Restrictions.eq("item", i));
-//         Look for the unique workspaceitem entry where 'item_id' references this item
-//        return uniqueResult(criteria);
-//
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
         Root<WorkspaceItem> workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);

dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java

@@ -43,11 +43,8 @@ public abstract class AbstractHibernateDSODAO<T extends DSpaceObject> extends Ab
      * @return
      * @throws SQLException
      */
-    public T findByLegacyId(Context context, int legacyId, Class<T> clazz) throws SQLException {
+    public T findByLegacyId(Context context, int legacyId, Class<T> clazz) throws SQLException
-//        Criteria criteria = createCriteria(context, clazz);
+    {
-//        criteria.add(Restrictions.eq("legacyId", legacyId));
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, clazz);
         Root<T> root = criteriaQuery.from(clazz);

dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java

@@ -44,14 +44,8 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO<EPerson> implements
     }
 
     @Override
-    public EPerson findByEmail(Context context, String email) throws SQLException {
+    public EPerson findByEmail(Context context, String email) throws SQLException
-//         All email addresses are stored as lowercase, so ensure that the email address is lowercased for the lookup
+    {
-//        Criteria criteria = createCriteria(context, EPerson.class);
-//        criteria.add(Restrictions.eq("email", email.toLowerCase()));
-//
-//        criteria.setCacheable(true);
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, EPerson.class);
         Root<EPerson> ePersonRoot = criteriaQuery.from(EPerson.class);
@@ -62,13 +56,8 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO<EPerson> implements
 
 
     @Override
-    public EPerson findByNetid(Context context, String netid) throws SQLException {
+    public EPerson findByNetid(Context context, String netid) throws SQLException
-//        Criteria criteria = createCriteria(context, EPerson.class);
+    {
-//        criteria.add(Restrictions.eq("netid", netid));
-//
-//        criteria.setCacheable(true);
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, EPerson.class);
         Root<EPerson> ePersonRoot = criteriaQuery.from(EPerson.class);
@@ -143,13 +132,6 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO<EPerson> implements
 
     @Override
     public List<EPerson> findWithPasswordWithoutDigestAlgorithm(Context context) throws SQLException {
-//        Criteria criteria = createCriteria(context, EPerson.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.isNotNull("password"),
-//                Restrictions.isNull("digestAlgorithm")
-//        ));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, EPerson.class);
         Root<EPerson> ePersonRoot = criteriaQuery.from(EPerson.class);
@@ -163,10 +145,6 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO<EPerson> implements
 
     @Override
     public List<EPerson> findNotActiveSince(Context context, Date date) throws SQLException {
-//        Criteria criteria = createCriteria(context, EPerson.class);
-//        criteria.add(Restrictions.le("lastActive", date));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, EPerson.class);
         Root<EPerson> ePersonRoot = criteriaQuery.from(EPerson.class);

dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java

@@ -44,12 +44,6 @@ public class Group2GroupCacheDAOImpl extends AbstractHibernateDAO<Group2GroupCac
 
     @Override
     public List<Group2GroupCache> findByParent(Context context, Group group) throws SQLException {
-//        Criteria criteria = createCriteria(context, Group2GroupCache.class);
-//        criteria.add(Restrictions.eq("parent.id", group.getID()));
-//        criteria.setCacheable(true);
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Group2GroupCache.class);
         Root<Group2GroupCache> group2GroupCacheRoot = criteriaQuery.from(Group2GroupCache.class);
@@ -60,20 +54,6 @@ public class Group2GroupCacheDAOImpl extends AbstractHibernateDAO<Group2GroupCac
 
     @Override
     public List<Group2GroupCache> findByChildren(Context context, Iterable<Group> groups) throws SQLException {
-//        Criteria criteria = createCriteria(context, Group2GroupCache.class);
-//
-//        Disjunction orDisjunction = Restrictions.or();
-//        for(Group group : groups)
-//        {
-//            orDisjunction.add(Restrictions.eq("child.id", group.getID()));
-//        }
-//
-//        criteria.add(orDisjunction);
-//        criteria.setCacheable(true);
-//
-//        return list(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Group2GroupCache.class);
         Root<Group2GroupCache> group2GroupCacheRoot = criteriaQuery.from(Group2GroupCache.class);
@@ -101,12 +81,6 @@ public class Group2GroupCacheDAOImpl extends AbstractHibernateDAO<Group2GroupCac
 
     @Override
     public Group2GroupCache find(Context context, Group parent, Group child) throws SQLException {
-//        Criteria criteria = createCriteria(context, Group2GroupCache.class);
-//        criteria.add(Restrictions.eq("parent.id", parent.getID()));
-//        criteria.add(Restrictions.eq("child.id", child.getID()));
-//        criteria.setCacheable(true);
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Group2GroupCache.class);
         Root<Group2GroupCache> group2GroupCacheRoot = criteriaQuery.from(Group2GroupCache.class);

dspace-api/src/main/java/org/dspace/eperson/dao/impl/RegistrationDataDAOImpl.java

@@ -38,10 +38,6 @@ public class RegistrationDataDAOImpl extends AbstractHibernateDAO<RegistrationDa
 
     @Override
     public RegistrationData findByEmail(Context context, String email) throws SQLException {
-//        Criteria criteria = createCriteria(context, RegistrationData.class);
-//        criteria.add(Restrictions.eq("email", email));
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, RegistrationData.class);
         Root<RegistrationData> registrationDataRoot = criteriaQuery.from(RegistrationData.class);
@@ -52,10 +48,6 @@ public class RegistrationDataDAOImpl extends AbstractHibernateDAO<RegistrationDa
 
     @Override
     public RegistrationData findByToken(Context context, String token) throws SQLException {
-//        Criteria criteria = createCriteria(context, RegistrationData.class);
-//        criteria.add(Restrictions.eq("token", token));
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, RegistrationData.class);
         Root<RegistrationData> registrationDataRoot = criteriaQuery.from(RegistrationData.class);

dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java

@@ -37,14 +37,6 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
 
     @Override
     public List<Subscription> findByEPerson(Context context, EPerson eperson) throws SQLException {
-//        Criteria criteria = createCriteria(context, Subscription.class);
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.eq("ePerson", eperson)
-//                )
-//        );
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         javax.persistence.criteria.CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
         Root<Subscription> subscriptionRoot = criteriaQuery.from(Subscription.class);
@@ -55,17 +47,7 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
     }
 
     @Override
-    public Subscription findByCollectionAndEPerson(Context context, EPerson eperson, Collection collection)
+    public Subscription findByCollectionAndEPerson(Context context, EPerson eperson, Collection collection) throws SQLException {
-        throws SQLException {
-//        Criteria criteria = createCriteria(context, Subscription.class);
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.eq("ePerson", eperson),
-//                        Restrictions.eq("collection", collection)
-//                )
-//        );
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         javax.persistence.criteria.CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
         Root<Subscription> subscriptionRoot = criteriaQuery.from(Subscription.class);

dspace-api/src/main/java/org/dspace/handle/dao/impl/HandleDAOImpl.java

@@ -84,10 +84,7 @@ public class HandleDAOImpl extends AbstractHibernateDAO<Handle> implements Handl
 
     @Override
     public List<Handle> findByPrefix(Context context, String prefix) throws SQLException {
-//        Criteria criteria = createCriteria(context, Handle.class);
+
-//        criteria.add(Restrictions.like("handle", prefix + "%"));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Handle.class);
         Root<Handle> handleRoot = criteriaQuery.from(Handle.class);

dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedCollectionDAOImpl.java

@@ -74,10 +74,6 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
 
     @Override
     public List<HarvestedCollection> findByStatus(Context context, int status) throws SQLException {
-//        Criteria criteria = createCriteria(context, HarvestedCollection.class);
-//        criteria.add(Restrictions.eq("harvestStatus", status));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, HarvestedCollection.class);
         Root<HarvestedCollection> harvestedCollectionRoot = criteriaQuery.from(HarvestedCollection.class);
@@ -88,10 +84,6 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
 
     @Override
     public HarvestedCollection findByCollection(Context context, Collection collection) throws SQLException {
-//        Criteria criteria = createCriteria(context, HarvestedCollection.class);
-//        criteria.add(Restrictions.eq("collection", collection));
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, HarvestedCollection.class);
         Root<HarvestedCollection> harvestedCollectionRoot = criteriaQuery.from(HarvestedCollection.class);
@@ -159,20 +151,6 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
     }
 
     protected CriteriaQuery getByStatusAndMinimalTypeCriteria(Context context, int status, int type, int limit) throws SQLException {
-//        Criteria criteria = createCriteria(context, HarvestedCollection.class);
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.gt("harvestType", type),
-//                        Restrictions.eq("harvestStatus", status)
-//                )
-//        );
-//        if(limit != -1)
-//        {
-//            criteria.setMaxResults(1);
-//        }
-//        return criteria;
-
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, HarvestedCollection.class);
         Root<HarvestedCollection> harvestedCollectionRoot = criteriaQuery.from(HarvestedCollection.class);

dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedItemDAOImpl.java

@@ -41,10 +41,6 @@ public class HarvestedItemDAOImpl extends AbstractHibernateDAO<HarvestedItem> im
 
     @Override
     public HarvestedItem findByItem(Context context, Item item) throws SQLException {
-//        Criteria criteria = createCriteria(context, HarvestedItem.class);
-//        criteria.add(Restrictions.eq("item", item));
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, HarvestedItem.class);
         Root<HarvestedItem> harvestedItemRoot = criteriaQuery.from(HarvestedItem.class);

dspace-api/src/main/java/org/dspace/identifier/dao/impl/DOIDAOImpl.java

@@ -43,10 +43,6 @@ public class DOIDAOImpl extends AbstractHibernateDAO<DOI> implements DOIDAO
 
     @Override
     public DOI findByDoi(Context context, String doi) throws SQLException {
-//        Criteria criteria = createCriteria(context, DOI.class);
-//        criteria.add(Restrictions.eq("doi", doi));
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, DOI.class);
         Root<DOI> doiRoot = criteriaQuery.from(DOI.class);
@@ -83,14 +79,6 @@ public class DOIDAOImpl extends AbstractHibernateDAO<DOI> implements DOIDAO
 
     @Override
     public List<DOI> findByStatus(Context context, List<Integer> statuses) throws SQLException {
-//        Criteria criteria = createCriteria(context, DOI.class);
-//        Disjunction statusQuery = Restrictions.or();
-//        for (Integer status : statuses) {
-//            statusQuery.add(Restrictions.eq("status", status));
-//        }
-//        criteria.add(statusQuery);
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, DOI.class);
         Root<DOI> doiRoot = criteriaQuery.from(DOI.class);
@@ -136,14 +124,6 @@ public class DOIDAOImpl extends AbstractHibernateDAO<DOI> implements DOIDAO
 
     @Override
     public DOI findDOIByDSpaceObject(Context context, DSpaceObject dso) throws SQLException {
-//        Criteria criteria = createCriteria(context, DOI.class);
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.eq("dSpaceObject", dso)
-//                )
-//        );
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, DOI.class);
         Root<DOI> doiRoot = criteriaQuery.from(DOI.class);

dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionDAOImpl.java

@@ -47,10 +47,6 @@ public class VersionDAOImpl extends AbstractHibernateDAO<Version> implements Ver
 
     @Override
     public Version findByItem(Context context, Item item) throws SQLException {
-//        Criteria criteria = createCriteria(context, Version.class);
-//        criteria.add(Restrictions.eq("item", item));
-//        return singleResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Version.class);
         Root<Version> versionRoot = criteriaQuery.from(Version.class);

dspace-api/src/main/java/org/dspace/workflowbasic/dao/impl/BasicWorkflowItemDAOImpl.java

@@ -45,11 +45,6 @@ public class BasicWorkflowItemDAOImpl extends AbstractHibernateDAO<BasicWorkflow
 
     @Override
     public BasicWorkflowItem findByItem(Context context, Item i) throws SQLException {
-//        Criteria criteria = createCriteria(context, BasicWorkflowItem.class);
-//        criteria.add(Restrictions.eq("item", i));
-        // Look for the unique WorkflowItem entry where 'item_id' references this item
-//        return uniqueResult(criteria);
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BasicWorkflowItem.class);
         Root<BasicWorkflowItem> basicWorkflowItemRoot = criteriaQuery.from(BasicWorkflowItem.class);
@@ -76,10 +71,6 @@ public class BasicWorkflowItemDAOImpl extends AbstractHibernateDAO<BasicWorkflow
     @Override
     public List<BasicWorkflowItem> findByCollection(Context context, Collection c) throws SQLException
     {
-//        Criteria criteria = createCriteria(context, BasicWorkflowItem.class);
-//        criteria.add(Restrictions.eq("collection", c));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BasicWorkflowItem.class);
         Root<BasicWorkflowItem> basicWorkflowItemRoot = criteriaQuery.from(BasicWorkflowItem.class);
@@ -99,10 +90,6 @@ public class BasicWorkflowItemDAOImpl extends AbstractHibernateDAO<BasicWorkflow
 
     @Override
     public List<BasicWorkflowItem> findByOwner(Context context, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, BasicWorkflowItem.class);
-//        criteria.add(Restrictions.eq("owner", ePerson));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BasicWorkflowItem.class);
         Root<BasicWorkflowItem> basicWorkflowItemRoot = criteriaQuery.from(BasicWorkflowItem.class);

dspace-api/src/main/java/org/dspace/workflowbasic/dao/impl/TaskListItemDAOImpl.java

@@ -48,10 +48,6 @@ public class TaskListItemDAOImpl extends AbstractHibernateDAO<TaskListItem> impl
 
     @Override
     public List<TaskListItem> findByEPerson(Context context, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, TaskListItem.class);
-//        criteria.add(Restrictions.eq("ePerson", ePerson));
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, TaskListItem.class);
         Root<TaskListItem> taskListItemRoot = criteriaQuery.from(TaskListItem.class);

dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/ClaimedTaskDAOImpl.java

@@ -40,11 +40,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public List<ClaimedTask> findByWorkflowItem(Context context, XmlWorkflowItem workflowItem) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.eq("workflowItem", workflowItem));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);
@@ -56,15 +51,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public ClaimedTask findByWorkflowItemAndEPerson(Context context, XmlWorkflowItem workflowItem, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("workflowItem", workflowItem),
-//                Restrictions.eq("owner", ePerson)
-//        ));
-//
-//        return uniqueResult(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);
@@ -80,11 +66,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public List<ClaimedTask> findByEperson(Context context, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.eq("owner", ePerson));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);
@@ -95,14 +76,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public List<ClaimedTask> findByWorkflowItemAndStepId(Context context, XmlWorkflowItem workflowItem, String stepID) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("workflowItem", workflowItem),
-//                Restrictions.eq("stepId", stepID)
-//        ));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);
@@ -116,16 +89,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public ClaimedTask findByEPersonAndWorkflowItemAndStepIdAndActionId(Context context, EPerson ePerson, XmlWorkflowItem workflowItem, String stepID, String actionID) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("workflowItem", workflowItem),
-//                Restrictions.eq("owner", ePerson),
-//                Restrictions.eq("stepId", stepID),
-//                Restrictions.eq("actionId", actionID)
-//        ));
-//
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);
@@ -141,15 +104,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public List<ClaimedTask> findByWorkflowItemAndStepIdAndActionId(Context context, XmlWorkflowItem workflowItem, String stepID, String actionID) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.and(
-//                Restrictions.eq("workflowItem", workflowItem),
-//                Restrictions.eq("stepId", stepID),
-//                Restrictions.eq("actionId", actionID)
-//        ));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);
@@ -164,11 +118,6 @@ public class ClaimedTaskDAOImpl extends AbstractHibernateDAO<ClaimedTask> implem
 
     @Override
     public List<ClaimedTask> findByStep(Context context, String stepID) throws SQLException {
-//        Criteria criteria = createCriteria(context, ClaimedTask.class);
-//        criteria.add(Restrictions.eq("stepId", stepID));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ClaimedTask.class);
         Root<ClaimedTask> claimedTaskRoot = criteriaQuery.from(ClaimedTask.class);

dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/CollectionRoleDAOImpl.java

@@ -39,11 +39,6 @@ public class CollectionRoleDAOImpl extends AbstractHibernateDAO<CollectionRole>
 
     @Override
     public List<CollectionRole> findByCollection(Context context, Collection collection) throws SQLException {
-//        Criteria criteria = createCriteria(context, CollectionRole.class);
-//        criteria.add(Restrictions.eq("collection", collection));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, CollectionRole.class);
         Root<CollectionRole> collectionRoleRoot = criteriaQuery.from(CollectionRole.class);
@@ -54,16 +49,6 @@ public class CollectionRoleDAOImpl extends AbstractHibernateDAO<CollectionRole>
 
     @Override
     public CollectionRole findByCollectionAndRole(Context context, Collection collection, String role) throws SQLException {
-//        Criteria criteria = createCriteria(context, CollectionRole.class);
-//        criteria.add(Restrictions.and(
-//                        Restrictions.eq("collection", collection),
-//                        Restrictions.eq("roleId", role)
-//                )
-//        );
-//
-//        return uniqueResult(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, CollectionRole.class);
         Root<CollectionRole> collectionRoleRoot = criteriaQuery.from(CollectionRole.class);

dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/InProgressUserDAOImpl.java

@@ -40,17 +40,7 @@ public class InProgressUserDAOImpl extends AbstractHibernateDAO<InProgressUser>
 
     @Override
     public InProgressUser findByWorkflowItemAndEPerson(Context context, XmlWorkflowItem workflowItem, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, InProgressUser.class);
+
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.eq("workflowItem", workflowItem),
-//                        Restrictions.eq("ePerson", ePerson)
-//                )
-//        );
-//        return uniqueResult(criteria);
-//
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, InProgressUser.class);
         Root<InProgressUser> inProgressUserRoot = criteriaQuery.from(InProgressUser.class);
@@ -65,12 +55,6 @@ public class InProgressUserDAOImpl extends AbstractHibernateDAO<InProgressUser>
 
     @Override
     public List<InProgressUser> findByEperson(Context context, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, InProgressUser.class);
-//        criteria.add(Restrictions.eq("ePerson", ePerson));
-//
-//        return list(criteria);
-//
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, InProgressUser.class);
         Root<InProgressUser> inProgressUserRoot = criteriaQuery.from(InProgressUser.class);
@@ -81,11 +65,7 @@ public class InProgressUserDAOImpl extends AbstractHibernateDAO<InProgressUser>
 
     @Override
     public List<InProgressUser> findByWorkflowItem(Context context, XmlWorkflowItem workflowItem) throws SQLException {
-//        Criteria criteria = createCriteria(context, InProgressUser.class);
+
-//        criteria.add(Restrictions.eq("workflowItem", workflowItem));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, InProgressUser.class);
         Root<InProgressUser> inProgressUserRoot = criteriaQuery.from(InProgressUser.class);

dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/PoolTaskDAOImpl.java

@@ -41,11 +41,6 @@ public class PoolTaskDAOImpl extends AbstractHibernateDAO<PoolTask> implements P
 
     @Override
     public List<PoolTask> findByEPerson(Context context, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, PoolTask.class);
-//        criteria.add(Restrictions.eq("ePerson", ePerson));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, PoolTask.class);
         Root<PoolTask> poolTaskRoot = criteriaQuery.from(PoolTask.class);
@@ -57,11 +52,6 @@ public class PoolTaskDAOImpl extends AbstractHibernateDAO<PoolTask> implements P
 
     @Override
     public List<PoolTask> findByGroup(Context context, Group group) throws SQLException {
-//        Criteria criteria = createCriteria(context, PoolTask.class);
-//        criteria.add(Restrictions.eq("group", group));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, PoolTask.class);
         Root<PoolTask> poolTaskRoot = criteriaQuery.from(PoolTask.class);
@@ -72,11 +62,6 @@ public class PoolTaskDAOImpl extends AbstractHibernateDAO<PoolTask> implements P
 
     @Override
     public List<PoolTask> findByWorkflowItem(Context context, XmlWorkflowItem workflowItem) throws SQLException {
-//        Criteria criteria = createCriteria(context, PoolTask.class);
-//        criteria.add(Restrictions.eq("workflowItem", workflowItem));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, PoolTask.class);
         Root<PoolTask> poolTaskRoot = criteriaQuery.from(PoolTask.class);
@@ -87,16 +72,6 @@ public class PoolTaskDAOImpl extends AbstractHibernateDAO<PoolTask> implements P
 
     @Override
     public PoolTask findByWorkflowItemAndEPerson(Context context, XmlWorkflowItem workflowItem, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, PoolTask.class);
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.eq("workflowItem", workflowItem),
-//                        Restrictions.eq("ePerson", ePerson)
-//                )
-//        );
-//
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, PoolTask.class);
         Root<PoolTask> poolTaskRoot = criteriaQuery.from(PoolTask.class);
@@ -110,16 +85,6 @@ public class PoolTaskDAOImpl extends AbstractHibernateDAO<PoolTask> implements P
 
     @Override
     public PoolTask findByWorkflowItemAndGroup(Context context, Group group, XmlWorkflowItem workflowItem) throws SQLException {
-//        Criteria criteria = createCriteria(context, PoolTask.class);
-//        criteria.add(
-//                Restrictions.and(
-//                        Restrictions.eq("workflowItem", workflowItem),
-//                        Restrictions.eq("group", group)
-//                )
-//        );
-//
-//        return uniqueResult(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, PoolTask.class);
         Root<PoolTask> poolTaskRoot = criteriaQuery.from(PoolTask.class);

dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/WorkflowItemRoleDAOImpl.java

@@ -40,15 +40,6 @@ public class WorkflowItemRoleDAOImpl extends AbstractHibernateDAO<WorkflowItemRo
 
     @Override
     public List<WorkflowItemRole> findByWorkflowItemAndRole(Context context, XmlWorkflowItem workflowItem, String role) throws SQLException {
-//        Criteria criteria = createCriteria(context, WorkflowItemRole.class);
-//        criteria.add(Restrictions.and(
-//                        Restrictions.eq("workflowItem", workflowItem),
-//                        Restrictions.eq("role", role)
-//                )
-//        );
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkflowItemRole.class);
         Root<WorkflowItemRole> workflowItemRoleRoot = criteriaQuery.from(WorkflowItemRole.class);
@@ -62,11 +53,6 @@ public class WorkflowItemRoleDAOImpl extends AbstractHibernateDAO<WorkflowItemRo
 
     @Override
     public List<WorkflowItemRole> findByWorkflowItem(Context context, XmlWorkflowItem workflowItem) throws SQLException {
-//        Criteria criteria = createCriteria(context, WorkflowItemRole.class);
-//        criteria.add(Restrictions.eq("workflowItem", workflowItem));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkflowItemRole.class);
         Root<WorkflowItemRole> workflowItemRoleRoot = criteriaQuery.from(WorkflowItemRole.class);
@@ -77,11 +63,6 @@ public class WorkflowItemRoleDAOImpl extends AbstractHibernateDAO<WorkflowItemRo
 
     @Override
     public List<WorkflowItemRole> findByEPerson(Context context, EPerson ePerson) throws SQLException {
-//        Criteria criteria = createCriteria(context, WorkflowItemRole.class);
-//        criteria.add(Restrictions.eq("ePerson", ePerson));
-//
-//        return list(criteria);
-//
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkflowItemRole.class);
         Root<WorkflowItemRole> workflowItemRoleRoot = criteriaQuery.from(WorkflowItemRole.class);

dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/XmlWorkflowItemDAOImpl.java

@@ -44,25 +44,6 @@ public class XmlWorkflowItemDAOImpl extends AbstractHibernateDAO<XmlWorkflowItem
 
     @Override
     public List<XmlWorkflowItem> findAllInCollection(Context context, Integer offset, Integer limit, Collection collection) throws SQLException {
-//        Criteria criteria = createCriteria(context, XmlWorkflowItem.class);
-//        if(collection != null)
-//        {
-//            criteria.add(Restrictions.eq("collection", collection));
-//        }
-//
-//        if(offset != null)
-//        {
-//            criteria.setFirstResult(offset);
-//        }
-//        if(limit != null)
-//        {
-//            criteria.setMaxResults(limit);
-//        }
-//
-//        return list(criteria);
-
-
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, XmlWorkflowItem.class);
         Root<XmlWorkflowItem> xmlWorkflowItemRoot = criteriaQuery.from(XmlWorkflowItem.class);
@@ -112,11 +93,6 @@ public class XmlWorkflowItemDAOImpl extends AbstractHibernateDAO<XmlWorkflowItem
 
     @Override
     public List<XmlWorkflowItem> findByCollection(Context context, Collection collection) throws SQLException {
-//        Criteria criteria = createCriteria(context, XmlWorkflowItem.class);
-//        criteria.add(Restrictions.eq("collection", collection));
-//
-//        return list(criteria);
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, XmlWorkflowItem.class);
         Root<XmlWorkflowItem> xmlWorkflowItemRoot = criteriaQuery.from(XmlWorkflowItem.class);
@@ -127,11 +103,6 @@ public class XmlWorkflowItemDAOImpl extends AbstractHibernateDAO<XmlWorkflowItem
 
     @Override
     public XmlWorkflowItem findByItem(Context context, Item item) throws SQLException {
-//        Criteria criteria = createCriteria(context, XmlWorkflowItem.class);
-//        criteria.add(Restrictions.eq("item", item));
-//
-//        return uniqueResult(criteria);
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, XmlWorkflowItem.class);
         Root<XmlWorkflowItem> xmlWorkflowItemRoot = criteriaQuery.from(XmlWorkflowItem.class);