Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.22</version>
+	<version>0.2.23</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

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

@@ -8,6 +8,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -16,6 +17,8 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
+import org.mapstruct.ap.internal.util.Strings;
+
 import info.unterrainer.commons.httpserver.exceptions.ForbiddenException;
 import info.unterrainer.commons.httpserver.exceptions.InternalServerErrorException;
 import info.unterrainer.commons.httpserver.jsons.ListJson;
@@ -24,7 +27,9 @@
 import info.unterrainer.commons.rdbutils.enums.AsyncState;
 import io.javalin.http.Context;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class JpqlCoreDao<P extends BasicJpa> implements CoreDao<P, EntityManager> {
 
 	protected final Class<P> type;
@@ -136,6 +141,7 @@ <T> TypedQuery<T> getQuery(final EntityManager em, final String selectClause, St
 		else if (!orderBy.isBlank())
 			query += " ORDER BY " + orderBy;
 
+		log.debug("Query is: [{}]", query);
 		query = String.format(query, this.type.getSimpleName());
 
 		@SuppressWarnings("unchecked")
@@ -146,12 +152,24 @@ else if (!orderBy.isBlank())
 		TypedQuery<T> q = em.createQuery(query, t);
 		if (lockPessimistic)
 			q.setLockMode(LockModeType.PESSIMISTIC_WRITE);
-		q = addAsyncStatesParamsToQuery(asyncStates, q);
+
+		log.debug("  with lockmode: [{}]", q.getLockMode());
+
+		if (asyncStates != null)
+			log.debug("  with asynchronous_state: [{}]",
+					Strings.join(asyncStates.stream().map(AsyncState::toString).collect(Collectors.toList()), ", "));
+		addAsyncStatesParamsToQuery(asyncStates, q);
 
 		params = addTenantParams(params, tenantIds);
-		if (params != null)
+		if (params != null) {
+			log.debug("  with parameters: [{}]",
+					Strings.join(params.entrySet()
+							.stream()
+							.map(e -> e.getKey() + ": " + e.getValue().toString())
+							.collect(Collectors.toList()), ", "));
 			for (Entry<String, Object> e : params.entrySet())
 				q.setParameter(e.getKey(), e.getValue());
+		}
 		return q;
 	}
 
@@ -174,7 +192,7 @@ Query getCountQuery(final EntityManager em, final String selectClause, String jo
 
 		Query q = em.createQuery(String.format(query, this.type.getSimpleName()));
 
-		q = addAsyncStatesParamsToQuery(asyncStates, q);
+		addAsyncStatesParamsToQuery(asyncStates, q);
 		if (params != null)
 			for (Entry<String, Object> e : params.entrySet())
 				q.setParameter(e.getKey(), e.getValue());
@@ -269,53 +287,18 @@ private String buildWhereClause(final String whereClause, final Set<AsyncState>
 		if (isSet(whereClause) && !isSet(asyncStates))
 			r += whereClause;
 
-		if (!isSet(whereClause) && isSet(asyncStates))
-			r += addAsyncStatesToWhereClause(asyncStates);
-
-		if (isSet(whereClause) && isSet(asyncStates))
-			r += "( " + whereClause + " ) AND ( " + addAsyncStatesToWhereClause(asyncStates) + " )";
-
-		return r;
-	}
-
-	private String addAsyncStatesToWhereClause(final Set<AsyncState> asyncStates) {
-		StringBuilder sb = new StringBuilder();
-		boolean isFirst = true;
-
-		for (int i = 0; i < asyncStates.size(); i++) {
-			if (isFirst)
-				isFirst = false;
-			else
-				sb.append(" OR ");
-			sb.append("state = :state");
-			sb.append(i);
+		if (isSet(asyncStates)) {
+			if (isSet(whereClause))
+				r += "( " + whereClause + " ) AND ";
+			r += "( o.state IN :asynchronous_state )";
 		}
 
-		return sb.toString();
-	}
-
-	private <T> TypedQuery<T> addAsyncStatesParamsToQuery(final Set<AsyncState> asyncStates,
-			final TypedQuery<T> query) {
-
-		if (!isSet(asyncStates))
-			return query;
-
-		int count = 0;
-		for (AsyncState state : asyncStates)
-			query.setParameter("state" + count++, state);
-
-		return query;
+		return r;
 	}
 
-	private Query addAsyncStatesParamsToQuery(final Set<AsyncState> asyncStates, final Query query) {
-
+	private void addAsyncStatesParamsToQuery(final Set<AsyncState> asyncStates, final Query query) {
 		if (!isSet(asyncStates))
-			return query;
-
-		int count = 0;
-		for (AsyncState state : asyncStates)
-			query.setParameter("state" + count++, state);
-
-		return query;
+			return;
+		query.setParameter("asynchronous_state", asyncStates);
 	}
 }

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

@@ -116,7 +116,8 @@ public List<T> getList() {
 	public List<T> getList(final long offset, final long size) {
 		return withEntityManager(em -> {
 			TypedQuery<T> query = builder.getTypedQuery(em);
-			return builder.getDao().getList(em, query, offset, size);
+			List<T> list = builder.getDao().getList(em, query, offset, size);
+			return list;
 		});
 	}