finished query-rewrite

Author: Gerald Unterrainer

src/main/java/info/unterrainer/commons/httpserver/daos/BasicAsyncDao.java

@@ -26,7 +26,7 @@ ListJson<P> getList(E em, long offset, long size, String selectClause, String jo
 
 	QueryBuilder<P, P> query();
 
-	CountQueryBuilder<P, P> countQuery();
+	CountQueryBuilder<P> countQuery();
 
 	P create(E em, P entity);
 

src/main/java/info/unterrainer/commons/httpserver/daos/BasicDao.java

@@ -15,12 +15,13 @@ public class BasicQueryBuilder<P extends BasicJpa, T, R extends BasicQueryBuilde
 
 	protected final EntityManagerFactory emf;
 	protected final JpqlDao<P> dao;
+	protected final Class<T> resultType;
 
 	protected EntityManager entityManager;
 	protected String selectClause = "o";
 	protected String joinClause;
 	protected String whereClause;
-	protected String orderByClause = "o.id ASC";
+	protected String orderByClause;
 	protected boolean lockPessimistic = false;
 
 	protected Map<String, Object> parameters = new HashMap<>();
@@ -95,7 +96,7 @@ public R where(final String whereClause) {
 	/**
 	 * Adds an 'AND' part to the where-clause.
 	 * <p>
-	 * For example: .and("o.loggedIn=:loggedIn");
+	 * For example: .and("o.loggedIn = :loggedIn");
 	 *
 	 * @param andWhereClause the clause to add
 	 * @return an instance of this builder to provide a fluent interface
@@ -112,7 +113,7 @@ public R and(final String andWhereClause) {
 	/**
 	 * Adds an 'OR' part to the where-clause.
 	 * <p>
-	 * For example: .or("o.loggedIn=:loggedIn");
+	 * For example: .or("o.loggedIn = :loggedIn");
 	 *
 	 * @param orWhereClause the clause to add
 	 * @return an instance of this builder to provide a fluent interface
@@ -126,27 +127,6 @@ public R or(final String orWhereClause) {
 		return (R) this;
 	}
 
-	/**
-	 * Clears the where-clause and resets it to default.
-	 * <p>
-	 * Default is the empty string.
-	 *
-	 * @return an instance of this builder to provide a fluent interface
-	 */
-	public R clearWhere() {
-		return where(null);
-	}
-
-	/**
-	 * Clears the order-by-clause and resets it to an empty string, thus effectively
-	 * clearing the order.
-	 *
-	 * @return an instance of this builder to provide a fluent interface
-	 */
-	public R clearOrderBy() {
-		return orderBy("");
-	}
-
 	/**
 	 * Sets the order-by-clause to the standard-order, which is {@code "o.id ASC"}
 	 * and since this is the default as well, this effectively resets it to default.
@@ -189,6 +169,8 @@ public R clearParameters() {
 	 */
 	@SuppressWarnings("unchecked")
 	public R parameters(final ParamMap params) {
+		if (params == null)
+			return (R) this;
 		parameters = params.getParameters();
 		if (this.parameters == null)
 			parameters = new HashMap<>();
@@ -221,16 +203,11 @@ public R addParam(final String paramKey, final Object paramValue) {
 	@SuppressWarnings("unchecked")
 	public R orderBy(final String orderByClause) {
 		this.orderByClause = orderByClause;
-		if (this.orderByClause == null)
-			this.orderByClause = "o.id ASC";
 		return (R) this;
 	}
 
 	/**
 	 * Adds an ASC-segment to the order-by-clause.
-	 * <p>
-	 * Since the standard-order is {@code "o.id ASC"} it is advised to call
-	 * {@link #clearOrderBy()} first.
 	 *
 	 * @param field the name of the field ("o.id" or "o.createdOn" for example)
 	 * @return an instance of this builder to provide a fluent interface
@@ -240,16 +217,13 @@ public R asc(final String field) {
 		if (orderByClause == null || orderByClause.isBlank())
 			orderByClause = field;
 		else
-			orderByClause = ", " + field;
+			orderByClause += ", " + field;
 		orderByClause += " ASC";
 		return (R) this;
 	}
 
 	/**
 	 * Adds an DESC-segment to the order-by-clause.
-	 * <p>
-	 * Since the standard-order is {@code "o.id ASC"} it is advised to call
-	 * {@link #clearOrderBy()} first.
 	 *
 	 * @param field the name of the field ("o.id" or "o.createdOn" for example)
 	 * @return an instance of this builder to provide a fluent interface
@@ -259,7 +233,7 @@ public R desc(final String field) {
 		if (orderByClause == null || orderByClause.isBlank())
 			orderByClause = field;
 		else
-			orderByClause = ", " + field;
+			orderByClause += ", " + field;
 		orderByClause += " DESC";
 		return (R) this;
 	}

src/main/java/info/unterrainer/commons/httpserver/daos/BasicQueryBuilder.java

@@ -1,21 +1,21 @@
 package info.unterrainer.commons.httpserver.daos;
 
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
 
 import info.unterrainer.commons.rdbutils.Transactions;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 
-public class CountQueryBuilder<P extends BasicJpa, T> extends BasicQueryBuilder<P, T, CountQueryBuilder<P, T>> {
+public class CountQueryBuilder<P extends BasicJpa> extends BasicQueryBuilder<P, Long, CountQueryBuilder<P>> {
 
 	CountQueryBuilder(final EntityManagerFactory emf, final JpqlDao<P> dao) {
-		super(emf, dao);
+		super(emf, dao, Long.class);
 	}
 
-	public Query build() {
+	public Long build() {
 		if (entityManager != null)
-			return dao.getCountQuery(entityManager, selectClause, joinClause, whereClause, parameters);
-		return Transactions.withNewTransactionReturning(emf,
-				em -> dao.getCountQuery(em, selectClause, joinClause, whereClause, parameters));
+			return (Long) dao.getCountQuery(entityManager, selectClause, joinClause, whereClause, parameters, null)
+					.getSingleResult();
+		return (Long) Transactions.withNewTransactionReturning(emf,
+				em -> dao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, null).getSingleResult());
 	}
 }

src/main/java/info/unterrainer/commons/httpserver/daos/CountQueryBuilder.java

@@ -1,156 +1,17 @@
 package info.unterrainer.commons.httpserver.daos;
 
-import java.util.List;
-import java.util.function.Function;
-
-import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.LockModeType;
-import javax.persistence.TypedQuery;
 
-import info.unterrainer.commons.rdbutils.Transactions;
 import info.unterrainer.commons.rdbutils.entities.BasicAsyncJpa;
-import info.unterrainer.commons.rdbutils.enums.AsyncState;
 
-public class JpqlAsyncDao<P extends BasicAsyncJpa> extends JpqlDao<P> implements BasicAsyncDao<P, EntityManager> {
+public class JpqlAsyncDao<P extends BasicAsyncJpa> extends JpqlDao<P> {
 
 	public JpqlAsyncDao(final EntityManagerFactory emf, final Class<P> type) {
 		super(emf, type);
 	}
 
 	@Override
-	public P getLastWith(final AsyncState... states) {
-		return Transactions.withNewTransactionReturning(emf, em -> getLastWith(em, states));
-	}
-
-	@Override
-	public P getLastWith(final EntityManager em, final AsyncState... states) {
-		return internalGet(em, false, false, null, states);
-	}
-
-	@Override
-	public List<P> getLastNWith(final Long count, final AsyncState... states) {
-		return Transactions.withNewTransactionReturning(emf, em -> getLastNWith(em, count, states));
-	}
-
-	@Override
-	public List<P> getLastNWith(final EntityManager em, final Long count, final AsyncState... states) {
-		return internalGetList(em, count, false, false, null, states);
-	}
-
-	@Override
-	public P getNextWith(final AsyncState... states) {
-		return Transactions.withNewTransactionReturning(emf, em -> getNextWith(em, states));
-	}
-
-	@Override
-	public P getNextWith(final EntityManager em, final AsyncState... states) {
-		return internalGet(em, false, true, null, states);
-	}
-
-	@Override
-	public List<P> getNextNWith(final Long count, final AsyncState... states) {
-		return Transactions.withNewTransactionReturning(emf, em -> getNextNWith(em, count, states));
-	}
-
-	@Override
-	public List<P> getNextNWith(final EntityManager em, final Long count, final AsyncState... states) {
-		return internalGetList(em, count, false, true, null, states);
-	}
-
-	@Override
-	public P lockedGetNextWith(final AsyncState stateToSetTo, final AsyncState... states) {
-		return Transactions.withNewTransactionReturning(emf, em -> lockedGetNextWith(em, stateToSetTo, states));
-	}
-
-	@Override
-	public P lockedGetNextWith(final EntityManager em, final AsyncState stateToSetTo, final AsyncState... states) {
-		return internalGet(em, true, true, stateToSetTo, states);
-	}
-
-	@Override
-	public List<P> lockedGetNextNWith(final Long count, final AsyncState stateToSetTo, final AsyncState... states) {
-		return Transactions.withNewTransactionReturning(emf, em -> lockedGetNextNWith(em, count, stateToSetTo, states));
-	}
-
-	@Override
-	public List<P> lockedGetNextNWith(final EntityManager em, final Long count, final AsyncState stateToSetTo,
-			final AsyncState... states) {
-		return internalGetList(em, count, true, true, stateToSetTo, states);
-	}
-
-	public P internalGet(final EntityManager em, final boolean lockPessimistic, final boolean ascending,
-			final AsyncState stateToSetTo, final AsyncState... states) {
-		List<P> list = internalGetList(em, 1, lockPessimistic, ascending, stateToSetTo, states);
-		if (list.size() == 0)
-			return null;
-		return list.get(0);
-	}
-
-	public List<P> internalGetList(final EntityManager em, final long size, final boolean lockPessimistic,
-			final boolean ascending, final AsyncState stateToSetTo, final AsyncState... states) {
-		int s = Integer.MAX_VALUE;
-		if (size < s)
-			s = (int) size;
-
-		StringBuilder sb = new StringBuilder();
-
-		sb.append("SELECT o FROM %s AS o ");
-		boolean isFirst = true;
-		for (int i = 0; i < states.length; i++) {
-			if (isFirst) {
-				sb.append("WHERE ");
-				isFirst = false;
-			} else
-				sb.append("OR ");
-			sb.append("state = :state");
-			sb.append(i);
-			sb.append(" ");
-		}
-		sb.append("ORDER BY o.id " + (ascending ? "ASC" : "DESC"));
-
-		TypedQuery<P> q = em.createQuery(String.format(sb.toString(), type.getSimpleName()), type).setMaxResults(s);
-		if (lockPessimistic)
-			q.setLockMode(LockModeType.PESSIMISTIC_WRITE);
-
-		for (int i = 0; i < states.length; i++)
-			q.setParameter("state" + i, states[i]);
-
-		List<P> r = q.getResultList();
-
-		if (stateToSetTo != null)
-			for (P jpa : r) {
-				jpa.setState(stateToSetTo);
-				em.merge(jpa);
-			}
-
-		return r;
-	}
-
-	@Override
-	public P setStateTo(final AsyncState stateToSetTo, final Long id) {
-		return setStateTo(stateToSetTo, id, null);
-	}
-
-	@Override
-	public P setStateTo(final EntityManager em, final AsyncState stateToSetTo, final Long id) {
-		return setStateTo(em, stateToSetTo, id, null);
-	}
-
-	@Override
-	public P setStateTo(final AsyncState stateToSetTo, final Long id, final Function<P, P> additionalTransformations) {
-		return Transactions.withNewTransactionReturning(emf,
-				em -> setStateTo(em, stateToSetTo, id, additionalTransformations));
-	}
-
-	@Override
-	public P setStateTo(final EntityManager em, final AsyncState stateToSetTo, final Long id,
-			final Function<P, P> additionalTransformations) {
-		P jpa = getById(em, id);
-		jpa.setState(stateToSetTo);
-		if (additionalTransformations != null)
-			jpa = additionalTransformations.apply(jpa);
-		update(em, jpa);
-		return jpa;
+	public QueryAsyncBuilder<P, P> query() {
+		return new QueryAsyncBuilder<>(emf, this, type);
 	}
 }