Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.19</version>
+	<version>0.2.20</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>rdb-utils</artifactId>
-			<version>0.1.7</version>
+			<version>0.1.8</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>

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

@@ -21,6 +21,7 @@
 import info.unterrainer.commons.httpserver.enums.ResponseType;
 import info.unterrainer.commons.httpserver.exceptions.HttpException;
 import info.unterrainer.commons.httpserver.exceptions.NotFoundException;
+import info.unterrainer.commons.httpserver.exceptions.UnauthorizedException;
 import info.unterrainer.commons.httpserver.handlers.AppNameHandler;
 import info.unterrainer.commons.httpserver.handlers.AppVersionHandler;
 import info.unterrainer.commons.httpserver.handlers.DateTimeHandler;
@@ -164,7 +165,10 @@ private void handleException(final Exception e, final Context ctx) {
 		} else {
 			status = 500;
 			message = "500 Internal Server Error";
-			log.error(e.getMessage(), e);
+			if (e instanceof UnauthorizedException)
+				log.debug(e.getMessage());
+			else
+				log.error(e.getMessage(), e);
 		}
 		ctx.result(jsonMapper.toStringFrom(MessageJson.builder().message(message).build()))
 				.contentType("application/json")

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

@@ -226,12 +226,12 @@ private String addTenantWhere(final String whereClause, final Set<Long> tenantId
 
 		String r = "";
 		if (whereClause != null && !whereClause.isBlank())
-			r = "( " + whereClause + ") AND ";
+			r = "( " + whereClause + " ) AND ";
 
-		r += String.format("( tenantTable.%1$s IS NULL ", tenantData.getTenantIdField());
+		r += String.format("( tenantTable.%1$s IS NULL", tenantData.getTenantIdField());
 		if (tenantIds != null && !tenantIds.isEmpty())
-			r += String.format(" OR tenantTable.%1$s IN (:tenantIds) ", tenantData.getTenantIdField());
-		r += ")";
+			r += String.format(" OR tenantTable.%1$s IN (:tenantIds)", tenantData.getTenantIdField());
+		r += " )";
 		return r;
 	}
 

src/main/java/info/unterrainer/commons/httpserver/extensions/AsyncExtensionContext.java

@@ -1,6 +1,7 @@
 package info.unterrainer.commons.httpserver.extensions;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -13,7 +14,7 @@
 @Accessors(fluent = true)
 public class AsyncExtensionContext {
 
-	private Map<String, Object> parameters;
+	private Map<String, Object> parameters = new HashMap<>();
 
 	public AsyncExtensionContext addParameter(final Context ctx, final String parameterKey) {
 		parameters.put(parameterKey, ctx.attribute(parameterKey));