Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

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

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

@@ -4,7 +4,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
+import javax.persistence.TypedQuery;
 
 import info.unterrainer.commons.rdbutils.entities.BasicAsyncJpa;
 import info.unterrainer.commons.rdbutils.enums.AsyncState;
@@ -18,6 +20,18 @@ public class AsyncJpaListQueryBuilder<P extends BasicAsyncJpa>
 		super(emf, dao, resultType);
 	}
 
+	@Override
+	public TypedQuery<P> getTypedQuery(final EntityManager em) {
+		return dao.coreDao.getQuery(em, selectClause, joinClause, whereClause, parameters, resultType, orderByClause,
+				lockPessimistic, asyncStates, readTenantIds);
+	}
+
+	@Override
+	public javax.persistence.Query getCountQuery(final EntityManager em) {
+		return dao.coreDao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, asyncStates,
+				readTenantIds);
+	}
+
 	public JpaListQuery<P> build() {
 		return new JpaListQuery<>(emf, this);
 	}

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

@@ -4,7 +4,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
+import javax.persistence.TypedQuery;
 
 import info.unterrainer.commons.rdbutils.entities.BasicAsyncJpa;
 import info.unterrainer.commons.rdbutils.enums.AsyncState;
@@ -18,6 +20,18 @@ public class AsyncListQueryBuilder<P extends BasicAsyncJpa, T>
 		super(emf, dao, resultType);
 	}
 
+	@Override
+	public TypedQuery<T> getTypedQuery(final EntityManager em) {
+		return dao.coreDao.getQuery(em, selectClause, joinClause, whereClause, parameters, resultType, orderByClause,
+				lockPessimistic, asyncStates, readTenantIds);
+	}
+
+	@Override
+	public javax.persistence.Query getCountQuery(final EntityManager em) {
+		return dao.coreDao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, asyncStates,
+				readTenantIds);
+	}
+
 	public ListQuery<P, T> build() {
 		return new ListQuery<>(emf, this);
 	}

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

@@ -114,7 +114,10 @@ public List<T> getList() {
 	 * @return a list containing the rows as specified
 	 */
 	public List<T> getList(final long offset, final long size) {
-		return withEntityManager(em -> builder.getDao().getList(em, builder.getTypedQuery(em), offset, size));
+		return withEntityManager(em -> {
+			TypedQuery<T> query = builder.getTypedQuery(em);
+			return builder.getDao().getList(em, query, offset, size);
+		});
 	}
 
 	/**