update

Author: guFalcon

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

@@ -79,4 +79,24 @@ public AsyncListQueryBuilder<P, P> select(final String selectClause) {
 	public SingleQueryBuilder<P, P> select(final Long id) {
 		return new SingleQueryBuilder<>(this, id);
 	}
+
+	/**
+	 * Insert the given entity.
+	 *
+	 * @param entity to insert.
+	 * @return the entity after inserting
+	 */
+	public InsertQueryBuilder<P> insert(final P entity) {
+		return new InsertQueryBuilder<>(this, entity);
+	}
+
+	/**
+	 * Update the given entity.
+	 *
+	 * @param entity to update.
+	 * @return the entity after updating
+	 */
+	public UpdateQueryBuilder<P> update(final P entity) {
+		return new UpdateQueryBuilder<>(this, entity);
+	}
 }

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

@@ -1,36 +1,7 @@
 package info.unterrainer.commons.httpserver.daos;
 
-import javax.persistence.TypedQuery;
-
-import info.unterrainer.commons.httpserver.jsons.ListJson;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 
 public interface BasicDao<P extends BasicJpa, E> {
 
-	P _getById(Long id);
-
-	P create(P entity);
-
-	P update(P entity);
-
-	ListJson<P> getList(E em, long offset, long size, String selectClause, String joinClause, String whereClause,
-			ParamMap params, String orderByClause);
-
-	UpsertResult<P> upsert(String whereClause, ParamMap params, P entity);
-
-	UpsertResult<P> upsert(TypedQuery<P> query, P entity);
-
-	void _delete(Long id);
-
-	P _getById(E em, Long id);
-
-	P create(E em, P entity);
-
-	P update(E em, P entity);
-
-	UpsertResult<P> upsert(E em, String whereClause, ParamMap params, P entity);
-
-	UpsertResult<P> upsert(E em, TypedQuery<P> query, P entity);
-
-	void _delete(E em, Long id);
 }

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

@@ -28,13 +28,11 @@ public class BasicJpqlDao<P extends BasicJpa> implements BasicDao<P, EntityManag
 	protected final EntityManagerFactory emf;
 	protected final Class<P> type;
 
-	@Override
-	public P _getById(final Long id) {
+	P _getById(final Long id) {
 		return Transactions.withNewTransactionReturning(emf, em -> _getById(em, id));
 	}
 
-	@Override
-	public ListJson<P> getList(final EntityManager em, final long offset, final long size, final String selectClause,
+	ListJson<P> getList(final EntityManager em, final long offset, final long size, final String selectClause,
 			final String joinClause, final String whereClause, final ParamMap params, final String orderByClause) {
 		ListJson<P> r = new ListJson<>();
 		r.setEntries(
@@ -47,33 +45,29 @@ public ListJson<P> getList(final EntityManager em, final long offset, final long
 		return r;
 	}
 
-	@Override
-	public P create(final P entity) {
+	P create(final P entity) {
 		return Transactions.withNewTransactionReturning(emf, em -> create(em, entity));
 	}
 
-	@Override
-	public P create(final EntityManager em, final P entity) {
+	P create(final EntityManager em, final P entity) {
 		LocalDateTime time = DateUtils.nowUtc();
 		entity.setCreatedOn(time);
 		entity.setEditedOn(time);
 		em.persist(entity);
 		return entity;
 	}
 
-	@Override
-	public P update(final P entity) {
-		return Transactions.withNewTransactionReturning(emf, em -> update(em, entity));
+	P _update(final P entity) {
+		return Transactions.withNewTransactionReturning(emf, em -> _update(em, entity));
 	}
 
-	@Override
-	public P update(final EntityManager em, final P entity) {
+	P _update(final EntityManager em, final P entity) {
 		LocalDateTime time = DateUtils.nowUtc();
 		entity.setEditedOn(time);
 		return em.merge(entity);
 	}
 
-	public <T> List<T> getList(final EntityManager em, final TypedQuery<T> query, final long offset, final long size) {
+	<T> List<T> getList(final EntityManager em, final TypedQuery<T> query, final long offset, final long size) {
 		int s = Integer.MAX_VALUE;
 		if (size < s)
 			s = (int) size;
@@ -85,24 +79,6 @@ public <T> List<T> getList(final EntityManager em, final TypedQuery<T> query, fi
 		return query.getResultList();
 	}
 
-	@Override
-	public UpsertResult<P> upsert(final String whereClause, final ParamMap params, final P entity) {
-		return Transactions.withNewTransactionReturning(emf, em -> upsert(em, getQuery(em, "o", null, whereClause,
-				params == null ? null : params.getParameters(), type, null, false, null), entity));
-	}
-
-	@Override
-	public UpsertResult<P> upsert(final EntityManager em, final String whereClause, final ParamMap params,
-			final P entity) {
-		return upsert(em, getQuery(em, "o", null, whereClause, params == null ? null : params.getParameters(), type,
-				null, false, null), entity);
-	}
-
-	@Override
-	public UpsertResult<P> upsert(final TypedQuery<P> query, final P entity) {
-		return Transactions.withNewTransactionReturning(emf, em -> upsert(em, query, entity));
-	}
-
 	private <T> T getFirst(final EntityManager em, final TypedQuery<T> query) {
 		List<T> r = getList(em, query, 0, 1);
 		if (r.size() == 1) {
@@ -112,24 +88,7 @@ private <T> T getFirst(final EntityManager em, final TypedQuery<T> query) {
 		return null;
 	}
 
-	public <T> UpsertResult<P> _upsert(final EntityManager em, final TypedQuery<T> query, final P entity) {
-		boolean wasInserted = false;
-		boolean wasUpdated = false;
-		T e = getFirst(em, query);
-		if (e == null) {
-			e = create(em, entity);
-			wasInserted = true;
-		} else {
-			entity.setId(e.getId());
-			entity.setCreatedOn(e.getCreatedOn());
-			e = update(em, entity);
-			wasUpdated = true;
-		}
-		return UpsertResult.<P>builder().wasInserted(wasInserted).wasUpdated(wasUpdated).jpa(e).build();
-	}
-
-	@Override
-	public UpsertResult<P> upsert(final EntityManager em, final TypedQuery<P> query, final P entity) {
+	UpsertResult<P> _upsert(final EntityManager em, final TypedQuery<P> query, final P entity) {
 		boolean wasInserted = false;
 		boolean wasUpdated = false;
 		P e = getFirst(em, query);
@@ -139,28 +98,25 @@ public UpsertResult<P> upsert(final EntityManager em, final TypedQuery<P> query,
 		} else {
 			entity.setId(e.getId());
 			entity.setCreatedOn(e.getCreatedOn());
-			e = update(em, entity);
+			e = _update(em, entity);
 			wasUpdated = true;
 		}
 		return UpsertResult.<P>builder().wasInserted(wasInserted).wasUpdated(wasUpdated).jpa(e).build();
 	}
 
-	@Override
-	public void _delete(final Long id) {
+	void _delete(final Long id) {
 		Transactions.withNewTransaction(emf, em -> {
 			_delete(em, id);
 		});
 	}
 
-	@Override
-	public void _delete(final EntityManager em, final Long id) {
+	void _delete(final EntityManager em, final Long id) {
 		em.createQuery(String.format("DELETE FROM %s AS o WHERE o.id = :id", type.getSimpleName()))
 				.setParameter("id", id)
 				.executeUpdate();
 	}
 
-	@Override
-	public P _getById(final EntityManager em, final Long id) {
+	P _getById(final EntityManager em, final Long id) {
 		try {
 			return getQuery(em, "o", null, "o.id = :id", Map.of("id", id), type, null, false, null).getSingleResult();
 		} catch (NoResultException e) {
@@ -278,6 +234,33 @@ else if (!orderBy.isBlank())
 		return q;
 	}
 
+	<T> TypedQuery<T> getDeleteQuery(final EntityManager em, final String joinClause, final String whereClause,
+			final Map<String, Object> params) {
+		String query = "DELETE FROM  %s AS o";
+
+		if (joinClause != null && !joinClause.isBlank())
+			query += " " + joinClause;
+
+		query += buildWhereClause(whereClause, null);
+
+		query = String.format(query, this.type.getSimpleName());
+
+		String msg = query;
+		if (params != null)
+			for (Entry<String, Object> p : params.entrySet())
+				msg += "\\n  " + p.getKey() + ": " + p.getValue();
+		log.debug(msg);
+
+		@SuppressWarnings("unchecked")
+		Class<T> t = (Class<T>) this.type;
+
+		TypedQuery<T> q = em.createQuery(query, t);
+		if (params != null)
+			for (Entry<String, Object> e : params.entrySet())
+				q.setParameter(e.getKey(), e.getValue());
+		return q;
+	}
+
 	private boolean isAllowed(final info.unterrainer.commons.httpserver.daos.ListQueryBuilder query,
 			final EntityManager em) {
 		String tenantReferenceField = "testId";

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

@@ -1,7 +1,6 @@
 package info.unterrainer.commons.httpserver.daos;
 
 import java.util.HashMap;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -14,21 +13,17 @@
 
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 public class BasicListQueryBuilder<P extends BasicJpa, T, R extends BasicListQueryBuilder<P, T, R>>
-		extends BasicQueryEntityManagerBuilder<P, T, R> {
+		extends BasicQueryGeneralBuilder<P, T, R> {
 
 	protected final EntityManagerFactory emf;
 	@Getter
 	protected final BasicJpqlDao<P> dao;
 	protected final Class<T> resultType;
 
 	protected String selectClause = "o";
-	protected String joinClause;
-	protected String whereClause;
 	protected String orderByClause;
 	protected boolean lockPessimistic = false;
 
-	protected Map<String, Object> parameters = new HashMap<>();
-
 	void setSelect(final String selectClause) {
 		this.selectClause = selectClause;
 		if (this.selectClause == null || this.selectClause.isBlank())
@@ -40,76 +35,12 @@ public TypedQuery<T> getTypedQuery(final EntityManager em) {
 				lockPessimistic, null);
 	}
 
-	public javax.persistence.Query getCountQuery(final EntityManager em) {
-		return dao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, null);
-	}
-
-	/**
-	 * Sets a custom join-clause.
-	 * <p>
-	 * Default is ""<br>
-	 * To reset it to default, set it to null or directly to an empty string.
-	 *
-	 * @param joinClause the new clause
-	 * @return an instance of this builder to provide a fluent interface
-	 */
-	@SuppressWarnings("unchecked")
-	public R join(final String joinClause) {
-		this.joinClause = joinClause;
-		if (this.joinClause == null)
-			this.joinClause = "";
-		return (R) this;
-	}
-
-	/**
-	 * Sets a custom where-clause.
-	 * <p>
-	 * Default is ""<br>
-	 * To reset it to default, set it to null or directly to an empty string.
-	 *
-	 * @param whereClause the new clause
-	 * @return an instance of this builder to provide a fluent interface
-	 */
-	@SuppressWarnings("unchecked")
-	public R where(final String whereClause) {
-		this.whereClause = whereClause;
-		if (this.whereClause == null)
-			this.whereClause = "";
-		return (R) this;
+	public TypedQuery<T> getDeleteQuery(final EntityManager em) {
+		return dao.getDeleteQuery(em, joinClause, whereClause, parameters);
 	}
 
-	/**
-	 * Adds an 'AND' part to the where-clause.
-	 * <p>
-	 * For example: .and("o.loggedIn = :loggedIn");
-	 *
-	 * @param andWhereClause the clause to add
-	 * @return an instance of this builder to provide a fluent interface
-	 */
-	@SuppressWarnings("unchecked")
-	public R and(final String andWhereClause) {
-		if (whereClause == null || whereClause.isBlank())
-			whereClause = andWhereClause;
-		else
-			whereClause += " AND " + andWhereClause;
-		return (R) this;
-	}
-
-	/**
-	 * Adds an 'OR' part to the where-clause.
-	 * <p>
-	 * For example: .or("o.loggedIn = :loggedIn");
-	 *
-	 * @param orWhereClause the clause to add
-	 * @return an instance of this builder to provide a fluent interface
-	 */
-	@SuppressWarnings("unchecked")
-	public R or(final String orWhereClause) {
-		if (whereClause == null || whereClause.isBlank())
-			whereClause = orWhereClause;
-		else
-			whereClause += " OR " + orWhereClause;
-		return (R) this;
+	public javax.persistence.Query getCountQuery(final EntityManager em) {
+		return dao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, null);
 	}
 
 	/**
@@ -139,6 +70,7 @@ public R setReversedStandardOrder() {
 	 *
 	 * @return an instance of this builder to provide a fluent interface
 	 */
+	@Override
 	public R clearParameters() {
 		return parameters(null);
 	}
@@ -152,6 +84,7 @@ public R clearParameters() {
 	 * @param params the new {@link ParamMap}
 	 * @return an instance of this builder to provide a fluent interface
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public R parameters(final ParamMap params) {
 		if (params == null)
@@ -169,6 +102,7 @@ public R parameters(final ParamMap params) {
 	 * @param paramValue the value of the parameter
 	 * @return an instance of this builder to provide a fluent interface
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public R addParam(final String paramKey, final Object paramValue) {
 		parameters.put(paramKey, paramValue);