Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

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

src/main/java/info/unterrainer/commons/httpserver/Information.java

@@ -2,6 +2,6 @@
 
 public class Information {
 	public static final String name = "Http-Server";
-	public static final String buildTime = "2021-03-10T08:45:24Z";
-	public static final String pomVersion = "0.1.24";
+	public static final String buildTime = "2021-05-18T06:57:49Z";
+	public static final String pomVersion = "0.2.8";
 }

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

@@ -37,10 +37,13 @@ public P getById(final Long id) {
 	public 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(getList(em, getQuery(em, selectClause, joinClause, whereClause, params.getParameters(), type,
-				orderByClause, false, null), offset, size));
-		r.setCount((Long) getCountQuery(em, selectClause, joinClause, whereClause, params.getParameters(), null)
-				.getSingleResult());
+		r.setEntries(
+				getList(em,
+						getQuery(em, selectClause, joinClause, whereClause,
+								params == null ? null : params.getParameters(), type, orderByClause, false, null),
+						offset, size));
+		r.setCount((Long) getCountQuery(em, selectClause, joinClause, whereClause,
+				params == null ? null : params.getParameters(), null).getSingleResult());
 		return r;
 	}
 
@@ -84,15 +87,15 @@ public <T> List<T> getList(final EntityManager em, final TypedQuery<T> query, fi
 
 	@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.getParameters(), type, null, false, null), 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.getParameters(), type, null, false, null),
-				entity);
+		return upsert(em, getQuery(em, "o", null, whereClause, params == null ? null : params.getParameters(), type,
+				null, false, null), entity);
 	}
 
 	@Override