String queryString = "delete from ResourcePolicy where dSpaceObject.id = :dsoId AND rptype = :rptype";
Query query = createQuery(context, queryString);
query.setParameter("dsoId", dso.getID());
- query.setString("rptype", type);
+ query.setParameter("rptype", type);
query.executeUpdate();
}
diff --git a/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java b/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java
index 753bb6267d..328d4a717e 100644
--- a/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java
@@ -9,6 +9,8 @@ package org.dspace.checker.dao.impl;
import java.sql.SQLException;
import java.util.Date;
+import javax.persistence.Query;
+import javax.persistence.TemporalType;
import org.dspace.checker.ChecksumHistory;
import org.dspace.checker.ChecksumResultCode;
@@ -16,7 +18,6 @@ import org.dspace.checker.dao.ChecksumHistoryDAO;
import org.dspace.content.Bitstream;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Query;
/**
*
@@ -29,6 +30,8 @@ import org.hibernate.Query;
* @author Grace Carpenter
* @author Nathan Sarr
* @author kevinvandevelde at atmire.com
+ *
+ *
*/
public class ChecksumHistoryDAOImpl extends AbstractHibernateDAO implements ChecksumHistoryDAO {
@@ -42,7 +45,7 @@ public class ChecksumHistoryDAOImpl extends AbstractHibernateDAO
@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 checksumResultRoot = criteriaQuery.from(ChecksumResult.class);
+ criteriaQuery.select(checksumResultRoot);
+ criteriaQuery.where(criteriaBuilder.equal(checksumResultRoot.get(ChecksumResult_.resultCode), code));
+ return uniqueResult(context, criteriaQuery, false, ChecksumResult.class, -1, -1);
}
}
diff --git a/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java b/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java
index 9ed89c40e9..66ce666b9d 100644
--- a/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java
@@ -9,22 +9,27 @@ package org.dspace.checker.dao.impl;
import java.sql.SQLException;
import java.util.Date;
+import java.util.LinkedList;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
import org.dspace.checker.ChecksumHistory;
+import org.dspace.checker.ChecksumHistory_;
+import org.dspace.checker.ChecksumResult;
import org.dspace.checker.ChecksumResultCode;
+import org.dspace.checker.ChecksumResult_;
import org.dspace.checker.MostRecentChecksum;
+import org.dspace.checker.MostRecentChecksum_;
import org.dspace.checker.dao.MostRecentChecksumDAO;
import org.dspace.content.Bitstream;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.DetachedCriteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Property;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the MostRecentChecksum object.
@@ -43,58 +48,58 @@ public class MostRecentChecksumDAOImpl extends AbstractHibernateDAO findByNotProcessedInDateRange(Context context, Date startDate, Date endDate)
throws SQLException {
-// + "most_recent_checksum.last_process_start_date, most_recent_checksum.last_process_end_date, "
-// + "most_recent_checksum.expected_checksum, most_recent_checksum.current_checksum, "
-// + "result_description "
-// + "from checksum_results, most_recent_checksum "
-// + "where most_recent_checksum.to_be_processed = false "
-// + "and most_recent_checksum.result = checksum_results.result_code "
-// + "and most_recent_checksum.last_process_start_date >= ? "
-// + "and most_recent_checksum.last_process_start_date < ? "
-// + "order by most_recent_checksum.bitstream_id
- Criteria criteria = createCriteria(context, MostRecentChecksum.class);
- criteria.add(
- Restrictions.and(
- Restrictions.eq("toBeProcessed", false),
- Restrictions.le("processStartDate", startDate),
- Restrictions.gt("processStartDate", endDate)
- )
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
+ Root mostRecentChecksumRoot = criteriaQuery.from(MostRecentChecksum.class);
+ criteriaQuery.select(mostRecentChecksumRoot);
+ criteriaQuery.where(criteriaBuilder.and(
+ criteriaBuilder.equal(mostRecentChecksumRoot.get(MostRecentChecksum_.toBeProcessed), false),
+ criteriaBuilder
+ .lessThanOrEqualTo(mostRecentChecksumRoot.get(MostRecentChecksum_.processStartDate), startDate),
+ criteriaBuilder.greaterThan(mostRecentChecksumRoot.get(MostRecentChecksum_.processStartDate), endDate)
+ )
);
- criteria.addOrder(Order.asc("bitstream.id"));
- return list(criteria);
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(mostRecentChecksumRoot.get(MostRecentChecksum_.bitstream)));
+ criteriaQuery.orderBy(orderList);
+ return list(context, criteriaQuery, false, MostRecentChecksum.class, -1, -1);
}
@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 criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
+ Root mostRecentChecksumRoot = criteriaQuery.from(MostRecentChecksum.class);
+ criteriaQuery.select(mostRecentChecksumRoot);
+ criteriaQuery
+ .where(criteriaBuilder.equal(mostRecentChecksumRoot.get(MostRecentChecksum_.bitstream), bitstream));
+ return singleResult(context, criteriaQuery);
}
@Override
public List findByResultTypeInDateRange(Context context, Date startDate, Date endDate,
ChecksumResultCode resultCode) throws SQLException {
-// "select bitstream_id, last_process_start_date, last_process_end_date, "
-// + "expected_checksum, current_checksum, result_description "
-// + "from most_recent_checksum, checksum_results "
-// + "where most_recent_checksum.result = checksum_results.result_code "
-// + "and most_recent_checksum.result= ? "
-// + "and most_recent_checksum.last_process_start_date >= ? "
-// + "and most_recent_checksum.last_process_start_date < ? "
-// + "order by bitstream_id";
- Criteria criteria = createCriteria(context, MostRecentChecksum.class);
- criteria.add(
- Restrictions.and(
- Restrictions.eq("checksumResult.resultCode", resultCode),
- Restrictions.le("processStartDate", startDate),
- Restrictions.gt("processStartDate", endDate)
- )
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
+ Root mostRecentChecksumRoot = criteriaQuery.from(MostRecentChecksum.class);
+ Join mostRecentResult =
+ mostRecentChecksumRoot.join(MostRecentChecksum_.checksumResult);
+
+ criteriaQuery.select(mostRecentChecksumRoot);
+ criteriaQuery.where(criteriaBuilder.and(
+ criteriaBuilder.equal(mostRecentResult.get(ChecksumResult_.resultCode), resultCode),
+ criteriaBuilder.lessThanOrEqualTo(
+ mostRecentChecksumRoot.get(MostRecentChecksum_.processStartDate), startDate),
+ criteriaBuilder.greaterThan(mostRecentChecksumRoot.get(MostRecentChecksum_.processStartDate), endDate)
+ )
);
- criteria.addOrder(Order.asc("bitstream.id"));
- return list(criteria);
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(mostRecentChecksumRoot.get(MostRecentChecksum_.bitstream)));
+ criteriaQuery.orderBy(orderList);
+ return list(context, criteriaQuery, false, MostRecentChecksum.class, -1, -1);
}
@@ -108,42 +113,52 @@ public class MostRecentChecksumDAOImpl extends AbstractHibernateDAO criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
+ Root mostRecentChecksumRoot = criteriaQuery.from(MostRecentChecksum.class);
+ criteriaQuery.select(mostRecentChecksumRoot);
+ criteriaQuery.where(criteriaBuilder.equal(mostRecentChecksumRoot.get(MostRecentChecksum_.toBeProcessed), true));
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(mostRecentChecksumRoot.get(MostRecentChecksum_.processEndDate)));
+ orderList.add(criteriaBuilder.asc(mostRecentChecksumRoot.get(MostRecentChecksum_.bitstream)));
+ criteriaQuery.orderBy(orderList);
+ return singleResult(context, criteriaQuery);
}
@Override
public MostRecentChecksum getOldestRecord(Context context, Date lessThanDate) throws SQLException {
-// "select bitstream_id "
-// + "from most_recent_checksum "
-// + "where to_be_processed = true "
-// + "and last_process_start_date < ? "
-// + "order by date_trunc('milliseconds', last_process_end_date), "
-// + "bitstream_id " + "ASC LIMIT 1";
- Criteria criteria = createCriteria(context, MostRecentChecksum.class);
- criteria.add(
- Restrictions.and(
- Restrictions.eq("toBeProcessed", true),
- Restrictions.lt("processStartDate", lessThanDate)
- ));
- criteria.addOrder(Order.asc("processEndDate")).addOrder(Order.asc("bitstream.id"));
- criteria.setMaxResults(1);
- return singleResult(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
+ Root mostRecentChecksumRoot = criteriaQuery.from(MostRecentChecksum.class);
+ criteriaQuery.select(mostRecentChecksumRoot);
+ criteriaQuery.where(criteriaBuilder.and(
+ criteriaBuilder.equal(mostRecentChecksumRoot.get(MostRecentChecksum_.toBeProcessed), true),
+ criteriaBuilder.lessThan(mostRecentChecksumRoot.get(MostRecentChecksum_.processStartDate), lessThanDate)
+ )
+ );
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(mostRecentChecksumRoot.get(MostRecentChecksum_.processEndDate)));
+ orderList.add(criteriaBuilder.asc(mostRecentChecksumRoot.get(MostRecentChecksum_.bitstream)));
+ criteriaQuery.orderBy(orderList);
+
+ return singleResult(context, criteriaQuery);
}
@Override
public List findNotInHistory(Context context) throws SQLException {
- Criteria criteria = createCriteria(context, MostRecentChecksum.class);
- DetachedCriteria subCriteria = DetachedCriteria.forClass(ChecksumHistory.class);
- subCriteria.setProjection(Projections.property("bitstream.id"));
- criteria.add(Property.forName("bitstreamId").notIn(subCriteria));
- return list(criteria);
+
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MostRecentChecksum.class);
+ Root checksumRoot = criteriaQuery.from(MostRecentChecksum.class);
+
+ Subquery subQuery = criteriaQuery.subquery(Bitstream.class);
+ Root historyRoot = subQuery.from(ChecksumHistory.class);
+ subQuery.select(historyRoot.get(ChecksumHistory_.bitstream));
+
+ criteriaQuery.where(
+ criteriaBuilder.not(checksumRoot.get(MostRecentChecksum_.bitstream).in(subQuery)));
+
+ return list(context, criteriaQuery, false, MostRecentChecksum.class, -1, -1);
}
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
index fff7c42206..02e3509c31 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
@@ -8,10 +8,17 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
import org.dspace.content.Bitstream;
+import org.dspace.content.Bitstream_;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.Item;
@@ -19,9 +26,6 @@ import org.dspace.content.dao.BitstreamDAO;
import org.dspace.core.AbstractHibernateDSODAO;
import org.dspace.core.Constants;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the Bitstream object.
@@ -38,40 +42,35 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO impleme
@Override
public List findDeletedBitstreams(Context context) throws SQLException {
- Criteria criteria = createCriteria(context, Bitstream.class);
- criteria.add(Restrictions.eq("deleted", true));
-
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Bitstream.class);
+ Root bitstreamRoot = criteriaQuery.from(Bitstream.class);
+ criteriaQuery.select(bitstreamRoot);
+ criteriaQuery.where(criteriaBuilder.equal(bitstreamRoot.get(Bitstream_.deleted), true));
+ return list(context, criteriaQuery, false, Bitstream.class, -1, -1);
}
@Override
public List 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 bitstreamRoot = criteriaQuery.from(Bitstream.class);
+ criteriaQuery.select(bitstreamRoot);
+ criteriaQuery.where(criteriaBuilder.and(
+ criteriaBuilder.equal(bitstreamRoot.get(Bitstream_.internalId), bitstream.getInternalId()),
+ criteriaBuilder.notEqual(bitstreamRoot.get(Bitstream_.id), bitstream.getID())
+ )
+ );
+ return list(context, criteriaQuery, false, Bitstream.class, -1, -1);
}
@Override
public List findBitstreamsWithNoRecentChecksum(Context context) throws SQLException {
-// "select bitstream.deleted, bitstream.store_number, bitstream.size_bytes, "
-// + "bitstreamformatregistry.short_description, bitstream.bitstream_id, "
-// + "bitstream.user_format_description, bitstream.internal_id, "
-// + "bitstream.source, bitstream.checksum_algorithm, bitstream.checksum, "
-// + "bitstream.name, bitstream.description "
-// + "from bitstream left outer join bitstreamformatregistry on "
-// + "bitstream.bitstream_format_id = bitstreamformatregistry.bitstream_format_id "
-// + "where not exists( select 'x' from most_recent_checksum "
-// + "where most_recent_checksum.bitstream_id = bitstream.bitstream_id )"
-
Query query = createQuery(context,
"select b from Bitstream b where b not in (select c.bitstream from " +
"MostRecentChecksum c)");
- return query.list();
+ return query.getResultList();
}
@Override
@@ -122,9 +121,14 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO impleme
@Override
public Long countByStoreNumber(Context context, Integer storeNumber) throws SQLException {
- Criteria criteria = createCriteria(context, Bitstream.class);
- criteria.add(Restrictions.eq("storeNumber", storeNumber));
- return countLong(criteria);
+
+
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Long.class);
+
+ Root bitstreamRoot = criteriaQuery.from(Bitstream.class);
+ criteriaQuery.where(criteriaBuilder.equal(bitstreamRoot.get(Bitstream_.storeNumber), storeNumber));
+ return countLong(context, criteriaQuery, criteriaBuilder, bitstreamRoot);
}
@Override
@@ -158,9 +162,8 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO impleme
@Override
public Iterator findAll(Context context, int limit, int offset) throws SQLException {
- Query query = createQuery(context, "select b FROM Bitstream b");
- query.setFirstResult(offset);
- query.setMaxResults(limit);
- return iterate(query);
+ Map map = new HashMap<>();
+ return findByX(context, Bitstream.class, map, true, limit, offset).iterator();
+
}
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java
index 51b0af51de..0824c5c343 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java
@@ -8,16 +8,18 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import java.util.LinkedList;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
import org.dspace.content.BitstreamFormat;
+import org.dspace.content.BitstreamFormat_;
import org.dspace.content.dao.BitstreamFormatDAO;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the BitstreamFormat object.
@@ -37,11 +39,14 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAOnull if
- * there's no bitstream format with the given MIMEtype.
+ * there's no bitstream format with the given MIMEtype.
* @throws SQLException if database error
*/
@Override
@@ -49,33 +54,39 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
+ criteriaQuery.select(bitstreamFormatRoot);
+ criteriaQuery.where(criteriaBuilder.and(
+ criteriaBuilder.equal(bitstreamFormatRoot.get(BitstreamFormat_.internal), includeInternal),
+ criteriaBuilder.like(bitstreamFormatRoot.get(BitstreamFormat_.mimetype), mimeType)
+ )
+ );
+ return singleResult(context, criteriaQuery);
}
/**
* Find a bitstream format by its (unique) short description
*
- * @param context DSpace context object
- * @param desc the short description
+ * @param context
+ * DSpace context object
+ * @param desc
+ * the short description
+ *
* @return the corresponding bitstream format, or null if
- * there's no bitstream format with the given short description
+ * there's no bitstream format with the given short description
* @throws SQLException if database error
*/
@Override
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 bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
+ criteriaQuery.select(bitstreamFormatRoot);
+ criteriaQuery.where(criteriaBuilder.equal(bitstreamFormatRoot.get(BitstreamFormat_.shortDescription), desc));
+ return uniqueResult(context, criteriaQuery, false, BitstreamFormat.class, -1, -1);
}
@Override
@@ -93,14 +104,28 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO findNonInternal(Context context) throws SQLException {
- Criteria criteria = createCriteria(context, BitstreamFormat.class);
- criteria.add(Restrictions.and(
- Restrictions.eq("internal", false),
- Restrictions.not(Restrictions.like("shortDescription", "Unknown"))
- ));
- criteria.addOrder(Order.desc("supportLevel")).addOrder(Order.asc("shortDescription"));
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BitstreamFormat.class);
+ Root bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
+ criteriaQuery.select(bitstreamFormatRoot);
+ criteriaQuery
+ .where(criteriaBuilder.and(criteriaBuilder.equal(bitstreamFormatRoot.get(BitstreamFormat_.internal), false),
+ criteriaBuilder.not(
+ criteriaBuilder
+ .like(bitstreamFormatRoot.get(BitstreamFormat_.shortDescription),
+ "Unknown"))
+ )
+ );
+
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.desc(bitstreamFormatRoot.get(BitstreamFormat_.supportLevel)));
+ orderList.add(criteriaBuilder.asc(bitstreamFormatRoot.get(BitstreamFormat_.shortDescription)));
+ criteriaQuery.orderBy(orderList);
+
+
+ return list(context, criteriaQuery, false, BitstreamFormat.class, -1, -1);
}
@@ -110,17 +135,22 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO findAll(Context context, Class clazz) throws SQLException {
- Criteria criteria = createCriteria(context, BitstreamFormat.class);
- criteria.addOrder(Order.asc("id"));
- return list(criteria);
+
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BitstreamFormat.class);
+ Root bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
+ criteriaQuery.select(bitstreamFormatRoot);
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(bitstreamFormatRoot.get(BitstreamFormat_.id)));
+ criteriaQuery.orderBy(orderList);
+
+ return list(context, criteriaQuery, false, BitstreamFormat.class, -1, -1);
}
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
index 14b1587315..9180fb3c09 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
@@ -8,11 +8,22 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import java.util.AbstractMap;
import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.ResourcePolicy_;
import org.dspace.content.Collection;
+import org.dspace.content.Collection_;
import org.dspace.content.Item;
import org.dspace.content.MetadataField;
import org.dspace.content.dao.CollectionDAO;
@@ -21,11 +32,6 @@ import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.transform.BasicTransformerAdapter;
/**
* Hibernate implementation of the Database Access Object interface class for the Collection object.
@@ -43,8 +49,9 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO imple
* Get all collections in the system. These are alphabetically sorted by
* collection name.
*
- * @param context DSpace context object
- * @param order order by MetadataField
+ * @param context
+ * DSpace context object
+ * @param order order by MetadataField
* @return the collections in the system
* @throws SQLException if database error
*/
@@ -75,77 +82,54 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO 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 collectionRoot = criteriaQuery.from(Collection.class);
+ criteriaQuery.select(collectionRoot);
+ criteriaQuery.where(criteriaBuilder.equal(collectionRoot.get(Collection_.template), item));
+ return uniqueResult(context, criteriaQuery, false, Collection.class, -1, -1);
}
@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)
- )
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Collection.class);
+ Root collectionRoot = criteriaQuery.from(Collection.class);
+ criteriaQuery.select(collectionRoot);
+ criteriaQuery
+ .where(criteriaBuilder.or(criteriaBuilder.equal(collectionRoot.get(Collection_.workflowStep1), group),
+ criteriaBuilder.equal(collectionRoot.get(Collection_.workflowStep2), group),
+ criteriaBuilder.equal(collectionRoot.get(Collection_.workflowStep3), group),
+ criteriaBuilder.equal(collectionRoot.get(Collection_.submitters), group),
+ criteriaBuilder.equal(collectionRoot.get(Collection_.admins), group)
+ )
);
- return singleResult(criteria);
+ return singleResult(context, criteriaQuery);
}
@Override
public List findAuthorized(Context context, EPerson ePerson, List actions)
throws SQLException {
- // TableRowIterator tri = DatabaseManager.query(context,
-// "SELECT * FROM collection, resourcepolicy, eperson " +
-// "WHERE resourcepolicy.resource_id = collection.collection_id AND " +
-// "eperson.eperson_id = resourcepolicy.eperson_id AND "+
-// "resourcepolicy.resource_type_id = 3 AND "+
-// "( resourcepolicy.action_id = 3 OR resourcepolicy.action_id = 11 ) AND "+
-// "eperson.eperson_id = ?", context.getCurrentUser().getID());
-
- Criteria criteria = createCriteria(context, Collection.class);
- criteria.createAlias("resourcePolicies", "resourcePolicy");
-
- Disjunction actionQuery = Restrictions.or();
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Collection.class);
+ Root collectionRoot = criteriaQuery.from(Collection.class);
+ Join join = collectionRoot.join("resourcePolicies");
+ List orPredicates = new LinkedList();
for (Integer action : actions) {
- actionQuery.add(Restrictions.eq("resourcePolicy.actionId", action));
+ orPredicates.add(criteriaBuilder.equal(join.get(ResourcePolicy_.actionId), action));
}
- criteria.add(Restrictions.and(
- Restrictions.eq("resourcePolicy.resourceTypeId", Constants.COLLECTION),
- Restrictions.eq("resourcePolicy.eperson", ePerson),
- actionQuery
- ));
- criteria.setCacheable(true);
-
- return list(criteria);
+ Predicate orPredicate = criteriaBuilder.or(orPredicates.toArray(new Predicate[] {}));
+ criteriaQuery.select(collectionRoot);
+ criteriaQuery.where(
+ criteriaBuilder.and(criteriaBuilder.equal(join.get(ResourcePolicy_.resourceTypeId), Constants.COLLECTION),
+ criteriaBuilder.equal(join.get(ResourcePolicy_.eperson), ePerson),
+ orPredicate));
+ return list(context, criteriaQuery, true, Collection.class, -1, -1);
}
@Override
public List findAuthorizedByGroup(Context context, EPerson ePerson, List actions)
throws SQLException {
- // TableRowIterator tri = DatabaseManager.query(context,
- // "SELECT \n" +
- // " * \n" +
- // "FROM \n" +
- // " public.eperson, \n" +
- // " public.epersongroup2eperson, \n" +
- // " public.epersongroup, \n" +
- // " public.group2group, \n" +
- // " public.resourcepolicy rp_parent, \n" +
- // " public.collection\n" +
- // "WHERE \n" +
- // " epersongroup2eperson.eperson_id = eperson.eperson_id AND\n" +
- // " epersongroup.eperson_group_id = epersongroup2eperson.eperson_group_id AND\n" +
- // " group2group.child_id = epersongroup.eperson_group_id AND\n" +
- // " rp_parent.epersongroup_id = group2group.parent_id AND\n" +
- // " collection.collection_id = rp_parent.resource_id AND\n" +
- // " eperson.eperson_id = ? AND \n" +
- // " (rp_parent.action_id = 3 OR \n" +
- // " rp_parent.action_id = 11 \n" +
- // " ) AND rp_parent.resource_type_id = 3;", context.getCurrentUser().getID());
StringBuilder query = new StringBuilder();
query.append("select c from Collection c join c.resourcePolicies rp join rp.epersonGroup rpGroup WHERE ");
for (int i = 0; i < actions.size(); i++) {
@@ -159,11 +143,11 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO imple
query.append(
" AND rp.epersonGroup.id IN (select g.id from Group g where (from EPerson e where e.id = :eperson_id) in " +
"elements(epeople))");
- Query hibernateQuery = createQuery(context, query.toString());
- hibernateQuery.setParameter("eperson_id", ePerson.getID());
- hibernateQuery.setCacheable(true);
+ Query persistenceQuery = createQuery(context, query.toString());
+ persistenceQuery.setParameter("eperson_id", ePerson.getID());
+ persistenceQuery.setHint("org.hibernate.cacheable", Boolean.TRUE);
- return list(hibernateQuery);
+ return list(persistenceQuery);
}
@@ -185,12 +169,12 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO imple
String q = "select col as collection, sum(bit.sizeBytes) as totalBytes from Item i join i.collections col " +
"join i.bundles bun join bun.bitstreams bit group by col";
Query query = createQuery(context, q);
- query.setResultTransformer(new BasicTransformerAdapter() {
- @Override
- public Object transformTuple(Object[] tuple, String[] aliases) {
- return new java.util.AbstractMap.SimpleImmutableEntry<>((Collection) tuple[0], (Long) tuple[1]);
- }
- });
- return ((List>) query.list());
+
+ List list = query.getResultList();
+ List> returnList = new LinkedList<>();
+ for (Object[] o : list) {
+ returnList.add(new AbstractMap.SimpleEntry<>((Collection) o[0], (Long) o[1]));
+ }
+ return returnList;
}
-}
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
index 36d2888e01..67bbd18d91 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
@@ -10,9 +10,19 @@ package org.dspace.content.dao.impl;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import org.dspace.authorize.ResourcePolicy;
+import org.dspace.authorize.ResourcePolicy_;
import org.dspace.content.Community;
+import org.dspace.content.Community_;
import org.dspace.content.MetadataField;
import org.dspace.content.dao.CommunityDAO;
import org.dspace.core.AbstractHibernateDSODAO;
@@ -20,10 +30,6 @@ import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the Community object.
@@ -41,8 +47,9 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO impleme
* Get a list of all communities in the system. These are alphabetically
* sorted by community name.
*
- * @param context DSpace context object
+ * @param context DSpace context object
* @param sortField sort field
+ *
* @return the communities in the system
* @throws SQLException if database error
*/
@@ -73,9 +80,12 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO 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 communityRoot = criteriaQuery.from(Community.class);
+ criteriaQuery.select(communityRoot);
+ criteriaQuery.where(criteriaBuilder.equal(communityRoot.get(Community_.admins), group));
+ return singleResult(context, criteriaQuery);
}
@Override
@@ -88,7 +98,8 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO impleme
Query query = createQuery(context, queryBuilder.toString());
query.setParameter(sortField.toString(), sortField.getID());
- query.setCacheable(true);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
+
return findMany(context, query);
}
@@ -115,42 +126,29 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO impleme
" resourcepolicy.resource_type_id = 4 AND eperson.eperson_id = ?", context.getCurrentUser()
.getID());
*/
- Criteria criteria = createCriteria(context, Community.class);
- criteria.createAlias("resourcePolicies", "resourcePolicy");
- Disjunction actionQuery = Restrictions.or();
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Community.class);
+ Root communityRoot = criteriaQuery.from(Community.class);
+ Join join = communityRoot.join("resourcePolicies");
+ List orPredicates = new LinkedList();
for (Integer action : actions) {
- actionQuery.add(Restrictions.eq("resourcePolicy.actionId", action));
+ orPredicates.add(criteriaBuilder.equal(join.get(ResourcePolicy_.actionId), action));
}
- criteria.add(Restrictions.and(
- Restrictions.eq("resourcePolicy.resourceTypeId", Constants.COMMUNITY),
- Restrictions.eq("resourcePolicy.eperson", ePerson),
- actionQuery
- ));
- criteria.setCacheable(true);
-
- return list(criteria);
+ Predicate orPredicate = criteriaBuilder.or(orPredicates.toArray(new Predicate[] {}));
+ criteriaQuery.select(communityRoot);
+ criteriaQuery.where(
+ criteriaBuilder.and(criteriaBuilder.equal(join.get(ResourcePolicy_.resourceTypeId), Constants.COMMUNITY),
+ criteriaBuilder.equal(join.get(ResourcePolicy_.eperson), ePerson),
+ orPredicate
+ )
+ );
+ return list(context, criteriaQuery, true, Community.class, -1, -1);
}
@Override
public List findAuthorizedByGroup(Context context, EPerson ePerson, List actions)
throws SQLException {
-// "SELECT \n" +
-// " * \n" +
-// "FROM \n" +
-// " public.eperson, \n" +
-// " public.epersongroup2eperson, \n" +
-// " public.epersongroup, \n" +
-// " public.community, \n" +
-// " public.resourcepolicy\n" +
-// "WHERE \n" +
-// " epersongroup2eperson.eperson_id = eperson.eperson_id AND\n" +
-// " epersongroup.eperson_group_id = epersongroup2eperson.eperson_group_id AND\n" +
-// " resourcepolicy.epersongroup_id = epersongroup.eperson_group_id AND\n" +
-// " resourcepolicy.resource_id = community.community_id AND\n" +
-// " ( resourcepolicy.action_id = 3 OR \n" +
-// " resourcepolicy.action_id = 11) AND \n" +
-// " resourcepolicy.resource_type_id = 4 AND eperson.eperson_id = ?", context.getCurrentUser().getID());
StringBuilder query = new StringBuilder();
query.append("select c from Community c join c.resourcePolicies rp join rp.epersonGroup rpGroup WHERE ");
for (int i = 0; i < actions.size(); i++) {
@@ -164,11 +162,12 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO impleme
query.append(
" AND rp.epersonGroup.id IN (select g.id from Group g where (from EPerson e where e.id = :eperson_id) in " +
"elements(epeople))");
- Query hibernateQuery = createQuery(context, query.toString());
- hibernateQuery.setParameter("eperson_id", ePerson.getID());
- hibernateQuery.setCacheable(true);
+ Query persistenceQuery = createQuery(context, query.toString());
+ persistenceQuery.setParameter("eperson_id", ePerson.getID());
- return list(hibernateQuery);
+ persistenceQuery.setHint("org.hibernate.cacheable", Boolean.TRUE);
+
+ return list(persistenceQuery);
}
@Override
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
index 4127454b27..67644ee7b4 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
@@ -13,6 +13,8 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
+import javax.persistence.Query;
+import javax.persistence.TemporalType;
import org.apache.log4j.Logger;
import org.dspace.content.Collection;
@@ -24,7 +26,7 @@ import org.dspace.core.AbstractHibernateDSODAO;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.hibernate.Criteria;
-import org.hibernate.Query;
+import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Property;
@@ -89,7 +91,7 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO- implements ItemDA
query.setParameter("withdrawn", withdrawn);
query.setParameter("discoverable", discoverable);
if (lastModified != null) {
- query.setTimestamp("last_modified", lastModified);
+ query.setParameter("last_modified", lastModified, TemporalType.TIMESTAMP);
}
return iterate(query);
}
@@ -139,14 +141,68 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO
- implements ItemDA
return iterate(query);
}
- enum OP { equals, not_equals, like, not_like, contains, doesnt_contain, exists, doesnt_exist, matches,
- doesnt_match }
+ enum OP {
+ equals {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return Property.forName("mv.value").eq(val);
+ }
+ },
+ not_equals {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return OP.equals.buildPredicate(val, regexClause);
+ }
+ },
+ like {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return Property.forName("mv.value").like(val);
+ }
+ },
+ not_like {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return OP.like.buildPredicate(val, regexClause);
+ }
+ },
+ contains {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return Property.forName("mv.value").like("%" + val + "%");
+ }
+ },
+ doesnt_contain {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return OP.contains.buildPredicate(val, regexClause);
+ }
+ },
+ exists {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return Property.forName("mv.value").isNotNull();
+ }
+ },
+ doesnt_exist {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return OP.exists.buildPredicate(val, regexClause);
+ }
+ },
+ matches {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return Restrictions.sqlRestriction(regexClause, val, StandardBasicTypes.STRING);
+ }
+ },
+ doesnt_match {
+ public Criterion buildPredicate(String val, String regexClause) {
+ return OP.matches.buildPredicate(val, regexClause);
+ }
+
+ };
+ public abstract Criterion buildPredicate(String val, String regexClause);
+ }
@Override
+ @Deprecated
public Iterator
- findByMetadataQuery(Context context, List> listFieldList,
List query_op, List query_val, List collectionUuids,
String regexClause, int offset, int limit) throws SQLException {
- Criteria criteria = createCriteria(context, Item.class, "item");
+
+ Criteria criteria = getHibernateSession(context).createCriteria(Item.class, "item");
criteria.setFirstResult(offset);
criteria.setMaxResults(limit);
@@ -183,20 +239,7 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO
- implements ItemDA
subcriteria.add(Restrictions.in("metadataField", listFieldList.get(i)));
}
- sb.append(op.name() + " ");
- if (op == OP.equals || op == OP.not_equals) {
- subcriteria.add(Property.forName("mv.value").eq(query_val.get(i)));
- sb.append(query_val.get(i));
- } else if (op == OP.like || op == OP.not_like) {
- subcriteria.add(Property.forName("mv.value").like(query_val.get(i)));
- sb.append(query_val.get(i));
- } else if (op == OP.contains || op == OP.doesnt_contain) {
- subcriteria.add(Property.forName("mv.value").like("%" + query_val.get(i) + "%"));
- sb.append(query_val.get(i));
- } else if (op == OP.matches || op == OP.doesnt_match) {
- subcriteria.add(Restrictions.sqlRestriction(regexClause, query_val.get(i), StandardBasicTypes.STRING));
- sb.append(query_val.get(i));
- }
+ subcriteria.add(op.buildPredicate(query_val.get(i), regexClause));
if (op == OP.exists || op == OP.equals || op == OP.like || op == OP.contains || op == OP.matches) {
criteria.add(Subqueries.exists(subcriteria));
@@ -206,7 +249,8 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO
- implements ItemDA
}
log.debug(String.format("Running custom query with %d filters", index));
- return list(criteria).iterator();
+ return ((List
- ) criteria.list()).iterator();
+
}
@Override
@@ -285,7 +329,7 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO
- implements ItemDA
Query query = createQuery(context, "select count(distinct i) from Item i " +
"join i.collections collection " +
"WHERE collection IN (:collections) AND i.inArchive=:in_archive AND i.withdrawn=:withdrawn");
- query.setParameterList("collections", collections);
+ query.setParameter("collections", collections);
query.setParameter("in_archive", includeArchived);
query.setParameter("withdrawn", includeWithdrawn);
@@ -296,7 +340,7 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO
- implements ItemDA
public Iterator
- findByLastModifiedSince(Context context, Date since)
throws SQLException {
Query query = createQuery(context, "SELECT i FROM item i WHERE last_modified > :last_modified");
- query.setTimestamp("last_modified", since);
+ query.setParameter("last_modified", since, TemporalType.TIMESTAMP);
return iterate(query);
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
index c7e22f3427..de517765ba 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
@@ -8,18 +8,22 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import java.util.LinkedList;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.dspace.content.MetadataField;
+import org.dspace.content.MetadataField_;
import org.dspace.content.MetadataSchema;
+import org.dspace.content.MetadataSchema_;
import org.dspace.content.dao.MetadataFieldDAO;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.Query;
-import org.hibernate.criterion.Order;
/**
* Hibernate implementation of the Database Access Object interface class for the MetadataField object.
@@ -61,8 +65,8 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO im
if (qualifier != null) {
query.setParameter("qualifier", qualifier);
}
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
- query.setCacheable(true);
return singleResult(query);
}
@@ -97,19 +101,27 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO im
if (StringUtils.isNotBlank(qualifier)) {
query.setParameter("qualifier", qualifier);
}
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
- query.setCacheable(true);
return singleResult(query);
}
@Override
public List findAll(Context context, Class clazz) throws SQLException {
- Criteria criteria = createCriteria(context, MetadataField.class);
- criteria.createAlias("metadataSchema", "s").addOrder(Order.asc("s.name")).addOrder(Order.asc("element"))
- .addOrder(Order.asc("qualifier"));
- criteria.setFetchMode("metadataSchema", FetchMode.JOIN);
- criteria.setCacheable(true);
- return list(criteria);
+
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MetadataField.class);
+ Root metadataFieldRoot = criteriaQuery.from(MetadataField.class);
+ Join join = metadataFieldRoot.join("metadataSchema");
+ criteriaQuery.select(metadataFieldRoot);
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(join.get(MetadataSchema_.name)));
+ orderList.add(criteriaBuilder.asc(metadataFieldRoot.get(MetadataField_.element)));
+ orderList.add(criteriaBuilder.asc(metadataFieldRoot.get(MetadataField_.qualifier)));
+ criteriaQuery.orderBy(orderList);
+
+ return list(context, criteriaQuery, true, MetadataField.class, -1, -1, false);
}
@Override
@@ -123,8 +135,8 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO im
query.setParameter("name", metadataSchema);
query.setParameter("element", element);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
- query.setCacheable(true);
return list(query);
}
@@ -140,7 +152,8 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO im
query.setParameter("name", metadataSchema.getName());
- query.setCacheable(true);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
+
return list(query);
}
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java
index 63d37ac195..80198a1e89 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java
@@ -8,15 +8,18 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import java.util.LinkedList;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
import org.dspace.content.MetadataSchema;
+import org.dspace.content.MetadataSchema_;
import org.dspace.content.dao.MetadataSchemaDAO;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Order;
/**
* Hibernate implementation of the Database Access Object interface class for the MetadataSchema object.
@@ -33,7 +36,7 @@ public class MetadataSchemaDAOImpl extends AbstractHibernateDAO
/**
* Get the schema object corresponding to this namespace URI.
*
- * @param context DSpace context
+ * @param context DSpace context
* @param namespace namespace URI to match
* @return metadata schema object or null if none found.
* @throws SQLException if database error
@@ -46,28 +49,34 @@ public class MetadataSchemaDAOImpl extends AbstractHibernateDAO
"WHERE ms.namespace = :namespace ");
query.setParameter("namespace", namespace);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
- query.setCacheable(true);
return singleResult(query);
}
@Override
public List findAll(Context context, Class clazz) throws SQLException {
// Get all the metadataschema rows
- Criteria criteria = createCriteria(context, MetadataSchema.class);
- criteria.addOrder(Order.asc("id"));
- criteria.setCacheable(true);
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MetadataSchema.class);
+ Root metadataSchemaRoot = criteriaQuery.from(MetadataSchema.class);
+ criteriaQuery.select(metadataSchemaRoot);
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(metadataSchemaRoot.get(MetadataSchema_.id)));
+ criteriaQuery.orderBy(orderList);
+
+ return list(context, criteriaQuery, true, MetadataSchema.class, -1, -1);
}
/**
* Return true if and only if the passed name appears within the allowed
* number of times in the current schema.
*
- * @param context DSpace context
+ * @param context DSpace context
* @param metadataSchemaId schema id
- * @param namespace namespace URI to match
+ * @param namespace namespace URI to match
* @return true of false
* @throws SQLException if database error
*/
@@ -80,16 +89,16 @@ public class MetadataSchemaDAOImpl extends AbstractHibernateDAO
query.setParameter("namespace", namespace);
query.setParameter("id", metadataSchemaId);
- query.setCacheable(true);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
return singleResult(query) == null;
}
/**
* Return true if and only if the passed name is unique.
*
- * @param context DSpace context
+ * @param context DSpace context
* @param metadataSchemaId schema id
- * @param name short name of schema
+ * @param name short name of schema
* @return true of false
* @throws SQLException if database error
*/
@@ -102,15 +111,17 @@ public class MetadataSchemaDAOImpl extends AbstractHibernateDAO
query.setParameter("name", name);
query.setParameter("id", metadataSchemaId);
- query.setCacheable(true);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
return singleResult(query) == null;
}
/**
* Get the schema corresponding with this short name.
*
- * @param context context, in case we need to read it in from DB
- * @param shortName the short name for the schema
+ * @param context
+ * context, in case we need to read it in from DB
+ * @param shortName
+ * the short name for the schema
* @return the metadata schema object
* @throws SQLException if database error
*/
@@ -122,7 +133,7 @@ public class MetadataSchemaDAOImpl extends AbstractHibernateDAO
query.setParameter("name", shortName);
- query.setCacheable(true);
+ query.setHint("org.hibernate.cacheable", Boolean.TRUE);
return singleResult(query);
}
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java
index d800126bdd..a4fdf57cba 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java
@@ -10,16 +10,18 @@ package org.dspace.content.dao.impl;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Root;
import org.dspace.content.MetadataField;
+import org.dspace.content.MetadataField_;
import org.dspace.content.MetadataValue;
import org.dspace.content.dao.MetadataValueDAO;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
-import org.hibernate.FetchMode;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the MetadataValue object.
@@ -36,13 +38,15 @@ public class MetadataValueDAOImpl extends AbstractHibernateDAO im
@Override
public List findByField(Context context, MetadataField metadataField) throws SQLException {
- Criteria criteria = createCriteria(context, MetadataValue.class);
- criteria.add(
- Restrictions.eq("metadataField.id", metadataField.getID())
- );
- criteria.setFetchMode("metadataField", FetchMode.JOIN);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, MetadataValue.class);
+ Root metadataValueRoot = criteriaQuery.from(MetadataValue.class);
+ Join join = metadataValueRoot.join("metadataField");
+ criteriaQuery.select(metadataValueRoot);
+ criteriaQuery.where(criteriaBuilder.equal(join.get(MetadataField_.id), metadataField.getID()));
- return list(criteria);
+
+ return list(context, criteriaQuery, false, MetadataValue.class, -1, -1);
}
@Override
@@ -51,7 +55,7 @@ public class MetadataValueDAOImpl extends AbstractHibernateDAO im
"WHERE m.value like concat('%', concat(:searchString,'%')) ORDER BY m.id ASC";
Query query = createQuery(context, queryString);
- query.setString("searchString", value);
+ query.setParameter("searchString", value);
return iterate(query);
}
@@ -72,7 +76,7 @@ public class MetadataValueDAOImpl extends AbstractHibernateDAO im
Query query = createQuery(context, queryString);
query.setParameter("metadata_field_id", metadataFieldId);
query.setMaxResults(1);
- return (MetadataValue) query.uniqueResult();
+ return (MetadataValue) query.getSingleResult();
}
@Override
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java
index 41f7312e5c..4533eab76a 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java
@@ -8,12 +8,14 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
import org.dspace.content.Site;
import org.dspace.content.dao.SiteDAO;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
-import org.hibernate.Criteria;
/**
* Hibernate implementation of the Database Access Object interface class for the Site object.
@@ -29,8 +31,10 @@ public class SiteDAOImpl extends AbstractHibernateDAO 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 siteRoot = criteriaQuery.from(Site.class);
+ criteriaQuery.select(siteRoot);
+ return uniqueResult(context, criteriaQuery, true, Site.class, -1, -1);
}
}
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java
index ee98889294..8e5e803898 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java
@@ -8,21 +8,26 @@
package org.dspace.content.dao.impl;
import java.sql.SQLException;
+import java.util.AbstractMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Root;
import org.dspace.content.Collection;
import org.dspace.content.Item;
import org.dspace.content.WorkspaceItem;
+import org.dspace.content.WorkspaceItem_;
import org.dspace.content.dao.WorkspaceItemDAO;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.transform.BasicTransformerAdapter;
+import org.dspace.eperson.EPerson_;
+import org.dspace.eperson.Group;
/**
* Hibernate implementation of the Database Access Object interface class for the WorkspaceItem object.
@@ -49,63 +54,91 @@ public class WorkspaceItemDAOImpl extends AbstractHibernateDAO im
@Override
public List findByEPerson(Context context, EPerson ep, Integer limit, Integer offset)
throws SQLException {
- Criteria criteria = createCriteria(context, WorkspaceItem.class, "wi");
- criteria.addOrder(Order.asc("workspaceItemId"));
- criteria.createAlias("wi.item", "item");
- criteria.createAlias("item.submitter", "submitter");
-
- criteria.add(Restrictions.eq("submitter.id", ep.getID()));
- criteria.setFirstResult(offset);
- criteria.setMaxResults(limit);
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
+ Root workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ criteriaQuery.select(workspaceItemRoot);
+ criteriaQuery.where(criteriaBuilder.equal(workspaceItemRoot.get(WorkspaceItem_.item).get("submitter"), ep));
+ criteriaQuery.orderBy(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
+ return list(context, criteriaQuery, false, WorkspaceItem.class, limit, offset);
}
@Override
public List 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 workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ criteriaQuery.select(workspaceItemRoot);
+ criteriaQuery.where(criteriaBuilder.equal(workspaceItemRoot.get(WorkspaceItem_.collection), c));
+ criteriaQuery.orderBy(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
+ return list(context, criteriaQuery, false, WorkspaceItem.class, -1, -1);
}
@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 workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ criteriaQuery.select(workspaceItemRoot);
+ criteriaQuery.where(criteriaBuilder.equal(workspaceItemRoot.get(WorkspaceItem_.item), i));
+ return uniqueResult(context, criteriaQuery, false, WorkspaceItem.class, -1, -1);
}
@Override
public List findAll(Context context) throws SQLException {
- Criteria criteria = createCriteria(context, WorkspaceItem.class);
- criteria.addOrder(Order.asc("item"));
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
+ Root workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ criteriaQuery.select(workspaceItemRoot);
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
+ criteriaQuery.orderBy(orderList);
+
+
+ return list(context, criteriaQuery, false, WorkspaceItem.class, -1, -1);
}
@Override
public List findAll(Context context, Integer limit, Integer offset) throws SQLException {
- Criteria criteria = createCriteria(context, WorkspaceItem.class);
- criteria.addOrder(Order.asc("item"));
- criteria.setFirstResult(offset);
- criteria.setMaxResults(limit);
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
+ Root workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ criteriaQuery.select(workspaceItemRoot);
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
+ criteriaQuery.orderBy(orderList);
+
+
+ return list(context, criteriaQuery, false, WorkspaceItem.class, limit, offset);
}
@Override
public List findWithSupervisedGroup(Context context) throws SQLException {
- Criteria criteria = createCriteria(context, WorkspaceItem.class);
- criteria.add(Restrictions.isNotEmpty("supervisorGroups"));
- criteria.addOrder(Order.asc("workspaceItemId"));
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
+ Root workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ criteriaQuery.select(workspaceItemRoot);
+ criteriaQuery.where(criteriaBuilder.isNotEmpty(workspaceItemRoot.get(WorkspaceItem_.supervisorGroups)));
+
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
+ criteriaQuery.orderBy(orderList);
+ return list(context, criteriaQuery, false, WorkspaceItem.class, -1, -1);
}
@Override
public List findBySupervisedGroupMember(Context context, EPerson ePerson) throws SQLException {
- Criteria criteria = createCriteria(context, WorkspaceItem.class);
- criteria.createAlias("supervisorGroups", "supervisorGroup");
- criteria.createAlias("supervisorGroup.epeople", "person");
- criteria.add(Restrictions.eq("person.id", ePerson.getID()));
- return list(criteria);
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, WorkspaceItem.class);
+ Root workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
+ Join join = workspaceItemRoot.join("supervisorGroups");
+ Join secondJoin = join.join("epeople");
+ criteriaQuery.select(workspaceItemRoot);
+ criteriaQuery.where(criteriaBuilder.equal(secondJoin.get(EPerson_.id), ePerson.getID()));
+ criteriaQuery.orderBy(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
+ return list(context, criteriaQuery, false, WorkspaceItem.class, -1, -1);
}
@Override
@@ -127,13 +160,13 @@ public class WorkspaceItemDAOImpl extends AbstractHibernateDAO im
Query query = createQuery(context,
"SELECT wi.stageReached as stage_reached, count(*) as cnt from WorkspaceItem wi" +
" group by wi.stageReached order by wi.stageReached");
- query.setResultTransformer(new BasicTransformerAdapter() {
- @Override
- public Object transformTuple(Object[] tuple, String[] aliases) {
- return new java.util.AbstractMap.SimpleImmutableEntry((Integer) tuple[0], (Long) tuple[1]);
- }
- });
- return (List>) query.list();
+
+ List list = query.getResultList();
+ List> returnList = new LinkedList<>();
+ for (Object[] o : list) {
+ returnList.add(new AbstractMap.SimpleEntry<>((Integer) o[0], (Long) o[1]));
+ }
+ return returnList;
}
}
diff --git a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
index 14c2622096..d4571b8463 100644
--- a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
+++ b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
@@ -10,21 +10,24 @@ package org.dspace.core;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Root;
-import org.apache.commons.collections4.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
+import org.apache.commons.collections.CollectionUtils;
import org.hibernate.Session;
-import org.hibernate.criterion.Projections;
/**
* Hibernate implementation for generic DAO interface. Also includes additional
* Hibernate calls that are commonly used.
* Each DAO should extend this class to prevent code duplication.
*
- * @param class type
* @author kevinvandevelde at atmire.com
+ * @param class type
*/
public abstract class AbstractHibernateDAO implements GenericDAO {
@@ -43,13 +46,13 @@ public abstract class AbstractHibernateDAO implements GenericDAO {
//Isn't required, is just here for other DB implementation. Hibernate auto keeps track of changes.
}
- /**
- * The Session used to manipulate entities of this type.
- *
- * @param context current DSpace context.
- * @return the current Session.
- * @throws SQLException
- */
+ /**
+ * The Session used to manipulate entities of this type.
+ *
+ * @param context current DSpace context.
+ * @return the current Session.
+ * @throws SQLException
+ */
protected Session getHibernateSession(Context context) throws SQLException {
return ((Session) context.getDBConnection().getSession());
}
@@ -61,13 +64,16 @@ public abstract class AbstractHibernateDAO implements GenericDAO {
@Override
public List findAll(Context context, Class clazz) throws SQLException {
- return list(createCriteria(context, clazz));
+ CriteriaQuery criteriaQuery = getCriteriaQuery(getCriteriaBuilder(context), clazz);
+ Root root = criteriaQuery.from(clazz);
+ criteriaQuery.select(root);
+ return executeCriteriaQuery(context, criteriaQuery, false, -1, -1);
}
@Override
public T findUnique(Context context, String query) throws SQLException {
@SuppressWarnings("unchecked")
- T result = (T) createQuery(context, query).uniqueResult();
+ T result = (T) createQuery(context, query).getSingleResult();
return result;
}
@@ -91,51 +97,26 @@ public abstract class AbstractHibernateDAO implements GenericDAO {
@Override
public List findMany(Context context, String query) throws SQLException {
@SuppressWarnings("unchecked")
- List result = (List) createQuery(context, query).list();
+ List result = (List) createQuery(context, query).getResultList();
return result;
}
/**
* Execute a JPA Criteria query and return a collection of results.
*
- * @param context The relevant DSpace Context.
- * @param query JPQL query string
+ * @param context
+ * The relevant DSpace Context.
+ * @param query
+ * JPQL query string
* @return list of DAOs specified by the query string
* @throws SQLException if database error
*/
public List findMany(Context context, Query query) throws SQLException {
@SuppressWarnings("unchecked")
- List result = (List) query.list();
+ List result = (List) query.getResultList();
return result;
}
- /**
- * Create criteria matching an entity type or a supertype thereof.
- * Use when building a criteria query.
- *
- * @param context current DSpace context.
- * @param persistentClass specifies the type to be matched by the criteria.
- * @return criteria concerning the type to be found.
- * @throws SQLException passed through.
- */
- public Criteria createCriteria(Context context, Class persistentClass) throws SQLException {
- return getHibernateSession(context).createCriteria(persistentClass);
- }
-
- /**
- * Create criteria matching an entity type or a supertype thereof.
- * Use when building a criteria query.
- *
- * @param context current DSpace context.
- * @param persistentClass specifies the type to be matched by the criteria.
- * @param alias alias for the type.
- * @return criteria concerning the type to be found.
- * @throws SQLException passed through.
- */
- public Criteria createCriteria(Context context, Class persistentClass, String alias) throws SQLException {
- return getHibernateSession(context).createCriteria(persistentClass, alias);
- }
-
/**
* Create a parsed query from a query expression.
*
@@ -149,82 +130,111 @@ public abstract class AbstractHibernateDAO implements GenericDAO {
}
/**
- * Get the entities matched by the given Criteria.
- * Use this if you need all results together.
+ * This method will return a list with unique results, no duplicates, made by the given CriteriaQuery and parameters
*
- * @param criteria description of desired entities.
- * @return the entities matched.
+ * @param context
+ * The standard DSpace context object
+ * @param criteriaQuery
+ * The CriteriaQuery for which this list will be retrieved
+ * @param cacheable
+ * Whether or not this query should be cacheable
+ * @param clazz
+ * The clazz for which this CriteriaQuery will be executed on
+ * @param maxResults
+ * The maxmimum amount of results that will be returned for this CriteriaQuery
+ * @param offset
+ * The offset to be used for the CriteriaQuery
+ * @return A list of distinct results as depicted by the CriteriaQuery and parameters
+ * @throws SQLException
*/
- public List list(Criteria criteria) {
+ public List list(Context context, CriteriaQuery criteriaQuery, boolean cacheable, Class clazz, int maxResults,
+ int offset) throws SQLException {
+ criteriaQuery.distinct(true);
@SuppressWarnings("unchecked")
- List result = (List) criteria.list();
+ List result = (List) executeCriteriaQuery(context, criteriaQuery, cacheable, maxResults, offset);
return result;
}
/**
- * Get the entities matching a given parsed query.
- * Use this if you need all results together.
+ * This method will return a list of results for the given CriteriaQuery and parameters
*
- * @param query the query to be executed.
- * @return entities matching the query.
+ * @param context
+ * The standard DSpace context object
+ * @param criteriaQuery
+ * The CriteriaQuery to be used to find the list of results
+ * @param cacheable
+ * A boolean value indicating whether this query should be cached or not
+ * @param clazz
+ * The class on which the CriteriaQuery will search
+ * @param maxResults
+ * The maximum amount of results to be returned
+ * @param offset
+ * The offset to be used for the CriteriaQuery
+ * @param distinct
+ * A boolean value indicating whether this list should be distinct or not
+ * @return A list of results determined by the CriteriaQuery and parameters
+ * @throws SQLException
+ */
+ public List list(Context context, CriteriaQuery criteriaQuery, boolean cacheable, Class clazz, int maxResults,
+ int offset, boolean distinct) throws SQLException {
+ criteriaQuery.distinct(distinct);
+ @SuppressWarnings("unchecked")
+ List result = (List) executeCriteriaQuery(context, criteriaQuery, cacheable, maxResults, offset);
+ return result;
+ }
+
+ /**
+ * This method will be used to return a list of results for the given query
+ *
+ * @param query
+ * The query for which the resulting list will be returned
+ * @return The list of results for the given query
*/
public List list(Query query) {
@SuppressWarnings("unchecked")
- List result = (List) query.list();
+ List result = (List) query.getResultList();
return result;
}
/**
- * Retrieve a unique result selected by criteria. If multiple results CAN be
+ * Retrieve a unique result from the query. If multiple results CAN be
* retrieved an exception will be thrown,
* so only use when the criteria state uniqueness in the database.
- *
- * @param criteria description of the desired entity.
+ * @param criteriaQuery JPA criteria
* @return a DAO specified by the criteria
*/
- public T uniqueResult(Criteria criteria) {
- @SuppressWarnings("unchecked")
- T result = (T) criteria.uniqueResult();
- return result;
- }
-
- /**
- * Retrieve a unique result selected by a query. If multiple results CAN be
- * retrieved then an exception will be thrown, so only use when the query
- * states uniqueness in the database.
- *
- * @param query description of the desired entity.
- * @return the found entity.
- */
- public T uniqueResult(Query query) {
- @SuppressWarnings("unchecked")
- T result = (T) query.uniqueResult();
- return result;
- }
-
- /**
- * Retrieve a single result selected by criteria. Best used if you expect a
- * single result, but this isn't enforced on the database.
- *
- * @param criteria description of the desired entities.
- * @return a DAO specified by the criteria
- */
- public T singleResult(Criteria criteria) {
- criteria.setMaxResults(1);
- List list = list(criteria);
+ public T uniqueResult(Context context, CriteriaQuery criteriaQuery, boolean cacheable, Class clazz,
+ int maxResults, int offset) throws SQLException {
+ List list = list(context, criteriaQuery, cacheable, clazz, maxResults, offset);
if (CollectionUtils.isNotEmpty(list)) {
- return list.get(0);
+ if (list.size() == 1) {
+ return list.get(0);
+ } else {
+ throw new IllegalArgumentException("More than one result found");
+ }
} else {
return null;
}
}
/**
- * Retrieve a single result matching a query. Best used if you expect a
+ * Retrieve a single result from the query. Best used if you expect a
* single result, but this isn't enforced on the database.
+ * @param criteriaQuery JPA criteria
+ * @return a DAO specified by the criteria
+ */
+ public T singleResult(Context context, CriteriaQuery criteriaQuery) throws SQLException {
+ Query query = this.getHibernateSession(context).createQuery(criteriaQuery);
+ return singleResult(query);
+
+ }
+
+ /**
+ * This method will return the first result from the given query or null if no results were found
*
- * @param query description of desired entities.
- * @return matched entities.
+ * @param query
+ * The query that is to be executed
+ * @return One result from the given query or null if none was found
*/
public T singleResult(final Query query) {
query.setMaxResults(1);
@@ -234,49 +244,179 @@ public abstract class AbstractHibernateDAO implements GenericDAO {
} else {
return null;
}
+
}
/**
- * Get an iterator over a stream of query results.
- * Use this when consuming results one at a time.
+ * This method will return a singular result for the given query
*
- * @param query description of desired entities.
- * @return iterator over the results of the query.
+ * @param query
+ * The query for which a single result will be given
+ * @return The single result for this query
*/
- public Iterator iterate(Query query) {
+ public T uniqueResult(Query query) {
@SuppressWarnings("unchecked")
- Iterator result = (Iterator) query.iterate();
+ T result = (T) query.getSingleResult();
return result;
}
/**
- * How many rows match these criteria?
- * The same value as {@link countLong(Criteria)}, coerced to {@code int}.
+ * This method will return an Iterator for the given Query
*
- * @param criteria description of the rows.
- * @return count of matching rows.
+ * @param query
+ * The query for which an Iterator will be made
+ * @return The Iterator for the results of this query
*/
- public int count(Criteria criteria) {
- return ((Long) criteria.setProjection(Projections.rowCount()).uniqueResult()).intValue();
+ public Iterator iterate(Query query) {
+ @SuppressWarnings("unchecked")
+ Iterator result = (Iterator) query.getResultList().iterator();
+ return result;
}
/**
- * How many rows match this query?
+ * This method will return the amount of results that would be generated for this CriteriaQuery as an integer
*
- * @param query description of the rows.
- * @return count of matching rows.
+ * @param context
+ * The standard DSpace Context object
+ * @param criteriaQuery
+ * The CriteriaQuery for which this result will be retrieved
+ * @param criteriaBuilder
+ * The CriteriaBuilder that accompagnies the CriteriaQuery
+ * @param root
+ * The root that'll determine on which class object we need to calculate the result
+ * @return The amount of results that would be found by this CriteriaQuery as an integer value
+ * @throws SQLException
+ */
+ public int count(Context context, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder, Root root)
+ throws SQLException {
+ return Math.toIntExact(countLong(context, criteriaQuery, criteriaBuilder, root));
+ }
+
+ /**
+ * This method will return the count of items for this query as an integer
+ * This query needs to already be in a formate that'll return one record that contains the amount
+ *
+ * @param query
+ * The query for which the amount of results will be returned.
+ * @return The amount of results
*/
public int count(Query query) {
- return ((Long) query.uniqueResult()).intValue();
+ return ((Long) query.getSingleResult()).intValue();
}
/**
- * How many rows match these criteria?
+ * This method will return the count of items for this query as a long
*
- * @param criteria description of the rows.
- * @return count of matching rows.
+ * @param context
+ * The standard DSpace Context object
+ * @param criteriaQuery
+ * The CriteriaQuery for which the amount of results will be retrieved
+ * @param criteriaBuilder
+ * The CriteriaBuilder that goes along with this CriteriaQuery
+ * @param root
+ * The root created for a DSpace class on which this query will search
+ * @return A long value that depicts the amount of results this query has found
+ * @throws SQLException
*/
- public long countLong(Criteria criteria) {
- return (Long) criteria.setProjection(Projections.rowCount()).uniqueResult();
+ public long countLong(Context context, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder, Root root)
+ throws SQLException {
+ Expression countExpression = criteriaBuilder.countDistinct(root);
+ criteriaQuery.select(countExpression);
+ return (Long) this.getHibernateSession(context).createQuery(criteriaQuery).getSingleResult();
}
+
+ /**
+ * This method should always be used in order to retrieve the CriteriaQuery in order to
+ * start creating a query that has to be executed
+ *
+ * @param criteriaBuilder
+ * The CriteriaBuilder for which this CriteriaQuery will be constructed
+ * @param clazz
+ * The class that this CriteriaQuery will be constructed for
+ * @return A CriteriaQuery on which a query can be built
+ */
+ public CriteriaQuery getCriteriaQuery(CriteriaBuilder criteriaBuilder, Class clazz) {
+ CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(clazz);
+ return criteriaQuery;
+ }
+
+ /**
+ * This method should always be used in order to retrieve a CriteriaBuilder for the given context
+ *
+ * @param context
+ * The standard DSpace Context class for which a CriteriaBuilder will be made
+ * @return A CriteriaBuilder that can be used to create the query
+ * @throws SQLException
+ */
+ public CriteriaBuilder getCriteriaBuilder(Context context) throws SQLException {
+ return this.getHibernateSession(context).getCriteriaBuilder();
+ }
+
+ /**
+ * This method will return a list of objects to be returned that match the given criteriaQuery and parameters.
+ * The maxResults and offSet can be circumvented by entering the value -1 for them.
+ *
+ * @param context
+ * The standard context DSpace object
+ * @param criteriaQuery
+ * The CriteriaQuery that will be used for executing the query
+ * @param cacheable
+ * Whether or not this query is able to be cached
+ * @param maxResults
+ * The maximum amount of results that this query will return
+ * This can be circumvented by passing along -1 as the value
+ * @param offset
+ * The offset to be used in this query
+ * This can be circumvented by passing along -1 as the value
+ * @return This will return a list of objects that conform to the made query
+ * @throws SQLException
+ */
+ public List executeCriteriaQuery(Context context, CriteriaQuery criteriaQuery, boolean cacheable,
+ int maxResults, int offset) throws SQLException {
+ Query query = this.getHibernateSession(context).createQuery(criteriaQuery);
+
+ query.setHint("org.hibernate.cacheable", cacheable);
+ if (maxResults != -1) {
+ query.setMaxResults(maxResults);
+ }
+ if (offset != -1) {
+ query.setFirstResult(offset);
+ }
+ return query.getResultList();
+
+ }
+
+ /**
+ * This method can be used to construct a query for which there needs to be a bunch of equal properties
+ * These properties can be passed along in the equals hashmap
+ *
+ * @param context
+ * The standard DSpace context object
+ * @param clazz
+ * The class on which the criteriaQuery will be built
+ * @param equals
+ * A hashmap that can be used to store the String representation of the column
+ * and the value that should match that in the DB
+ * @param cacheable
+ * A boolean indicating whether this query should be cacheable or not
+ * @param maxResults
+ * The max amount of results to be returned by this query
+ * @param offset
+ * The offset to be used in this query
+ * @return Will return a list of objects that correspond with the constructed query and parameters
+ * @throws SQLException
+ */
+ public List findByX(Context context, Class clazz, Map equals, boolean cacheable, int maxResults,
+ int offset) throws SQLException {
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteria = getCriteriaQuery(criteriaBuilder, clazz);
+ Root root = criteria.from(clazz);
+ criteria.select(root);
+
+ for (Map.Entry entry : equals.entrySet()) {
+ criteria.where(criteriaBuilder.equal(root.get(entry.getKey()), entry.getValue()));
+ }
+ return executeCriteriaQuery(context, criteria, cacheable, maxResults, offset);
+ }
+
}
diff --git a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java
index c17d1bdb86..232431cac7 100644
--- a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java
+++ b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java
@@ -9,15 +9,16 @@ package org.dspace.core;
import java.sql.SQLException;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.dspace.content.DSpaceObject;
import org.dspace.content.MetadataField;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation used by DSpaceObject Database Access Objects.
@@ -26,8 +27,8 @@ import org.hibernate.criterion.Restrictions;
*
* Each DSO Database Access Object should extend this class to prevent code duplication.
*
- * @param type of DSO represented.
* @author kevinvandevelde at atmire.com
+ * @param type of DSO represented.
*/
public abstract class AbstractHibernateDSODAO extends AbstractHibernateDAO {
/**
@@ -36,27 +37,27 @@ public abstract class AbstractHibernateDSODAO extends Ab
* All DSOs now have UUID primary keys, and those should be used when available.
* Each type derived from DSpaceObject had its own stream of record IDs, so
* it is also necessary to know the specific type.
- *
- * @param context current DSpace context.
+ * @param context current DSpace context.
* @param legacyId the old integer record identifier.
- * @param clazz DSO subtype of record identified by {@link legacyId}.
+ * @param clazz DSO subtype of record identified by {@link legacyId}.
* @return
* @throws SQLException
*/
public T findByLegacyId(Context context, int legacyId, Class 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 root = criteriaQuery.from(clazz);
+ criteriaQuery.where(criteriaBuilder.equal(root.get("legacyId"), legacyId));
+ return uniqueResult(context, criteriaQuery, false, clazz, -1, -1);
}
/**
* Add left outer join on all metadata fields which are passed to this function.
* The identifier of the join will be the toString() representation of the metadata field.
* The joined metadata fields can then be used to query or sort.
- *
- * @param query the query string being built.
+ * @param query the query string being built.
* @param tableIdentifier name of the table to be joined.
- * @param metadataFields names of the desired fields.
+ * @param metadataFields names of the desired fields.
*/
protected void addMetadataLeftJoin(StringBuilder query, String tableIdentifier,
Collection metadataFields) {
@@ -72,9 +73,9 @@ public abstract class AbstractHibernateDSODAO extends Ab
* Values can be checked using a like or an "=" query, as determined by the "operator" parameter.
* When creating a query, the "queryParam" string can be used set as parameter for the query.
*
- * @param query the already existing query builder, all changes will be appended
- * @param metadataFields the metadata fields whose metadata value should be queried
- * @param operator can either be "=" or "like"
+ * @param query the already existing query builder, all changes will be appended
+ * @param metadataFields the metadata fields whose metadata value should be queried
+ * @param operator can either be "=" or "like"
* @param additionalWhere additional where query
*/
protected void addMetadataValueWhereQuery(StringBuilder query, List metadataFields, String operator,
@@ -108,23 +109,21 @@ public abstract class AbstractHibernateDSODAO extends Ab
/**
* Append ORDER BY clause based on metadata fields or column names.
* All fields will be in ascending order.
- *
- * @param query the query being built.
+ * @param query the query being built.
* @param metadataSortFields fields on which to sort -- use this OR columnSortFields.
- * @param columnSortFields columns on which to sort -- use this OR metadataSortFields.
+ * @param columnSortFields columns on which to sort -- use this OR metadataSortFields.
*/
protected void addMetadataSortQuery(StringBuilder query, List metadataSortFields,
List columnSortFields) {
- addMetadataSortQuery(query, metadataSortFields, columnSortFields, Collections.EMPTY_LIST);
+ addMetadataSortQuery(query, metadataSortFields, columnSortFields, ListUtils.EMPTY_LIST);
}
/**
* Append ORDER BY clause based on metadata fields or column names.
- *
- * @param query the query being built.
+ * @param query the query being built.
* @param metadataSortFields fields on which to sort -- use this OR columnSortFields.
- * @param columnSortFields columns on which to sort -- use this OR metadataSortFields.
- * @param direction ASC or DESC for each field. Unspecified fields will be ASC.
+ * @param columnSortFields columns on which to sort -- use this OR metadataSortFields.
+ * @param direction ASC or DESC for each field. Unspecified fields will be ASC.
*/
protected void addMetadataSortQuery(StringBuilder query, List metadataSortFields,
List columnSortFields, List direction) {
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
index 581393e686..fd4c6f59d9 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
@@ -15,18 +15,21 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.dspace.content.MetadataField;
import org.dspace.core.AbstractHibernateDSODAO;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
+import org.dspace.eperson.EPerson_;
import org.dspace.eperson.Group;
import org.dspace.eperson.dao.EPersonDAO;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the EPerson object.
@@ -42,22 +45,23 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO implements
@Override
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 ePersonRoot = criteriaQuery.from(EPerson.class);
+ criteriaQuery.select(ePersonRoot);
+ criteriaQuery.where(criteriaBuilder.equal(ePersonRoot.get(EPerson_.email), email.toLowerCase()));
+ return uniqueResult(context, criteriaQuery, true, EPerson.class, -1, -1);
}
@Override
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 ePersonRoot = criteriaQuery.from(EPerson.class);
+ criteriaQuery.select(ePersonRoot);
+ criteriaQuery.where((criteriaBuilder.equal(ePersonRoot.get(EPerson_.netid), netid)));
+ return uniqueResult(context, criteriaQuery, true, EPerson.class, -1, -1);
}
@Override
@@ -101,8 +105,8 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO implements
sortFields = Collections.singletonList(metadataSortField);
}
- Query query = getSearchQuery(context, queryString, null, Collections.EMPTY_LIST, sortFields,
- sortField, pageSize, offset);
+ Query query = getSearchQuery(context, queryString, null, ListUtils.EMPTY_LIST, sortFields, sortField, pageSize,
+ offset);
return list(query);
}
@@ -119,26 +123,32 @@ public class EPersonDAOImpl extends AbstractHibernateDSODAO implements
idList.add(group.getID());
}
- query.setParameterList("idList", idList);
+ query.setParameter("idList", idList);
return list(query);
}
@Override
public List 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 ePersonRoot = criteriaQuery.from(EPerson.class);
+ criteriaQuery.select(ePersonRoot);
+ criteriaQuery.where(criteriaBuilder.and(criteriaBuilder.isNotNull(ePersonRoot.get(EPerson_.password)),
+ criteriaBuilder.isNull(ePersonRoot.get(EPerson_.digestAlgorithm))
+ )
+ );
+ return list(context, criteriaQuery, false, EPerson.class, -1, -1);
}
@Override
public List 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 ePersonRoot = criteriaQuery.from(EPerson.class);
+ criteriaQuery.select(ePersonRoot);
+ criteriaQuery.where(criteriaBuilder.lessThanOrEqualTo(ePersonRoot.get(EPerson_.lastActive), date));
+ return list(context, criteriaQuery, false, EPerson.class, -1, -1);
}
protected Query getSearchQuery(Context context, String queryString, String queryParam,
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java
index 03858e2240..717b41e8b9 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java
@@ -8,17 +8,20 @@
package org.dspace.eperson.dao.impl;
import java.sql.SQLException;
+import java.util.LinkedList;
import java.util.List;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
import org.dspace.eperson.Group;
import org.dspace.eperson.Group2GroupCache;
+import org.dspace.eperson.Group2GroupCache_;
import org.dspace.eperson.dao.Group2GroupCacheDAO;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Restrictions;
/**
* Hibernate implementation of the Database Access Object interface class for the Group2GroupCache object.
@@ -34,26 +37,27 @@ public class Group2GroupCacheDAOImpl extends AbstractHibernateDAO 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 group2GroupCacheRoot = criteriaQuery.from(Group2GroupCache.class);
+ criteriaQuery.select(group2GroupCacheRoot);
+ criteriaQuery.where(criteriaBuilder.equal(group2GroupCacheRoot.get(Group2GroupCache_.parent), group));
+ return list(context, criteriaQuery, true, Group2GroupCache.class, -1, -1);
}
@Override
public List findByChildren(Context context, Iterable