Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>info.unterrainer.commons</groupId>
 		<artifactId>parent-javalin-pom</artifactId>
-		<version>0.0.15</version>
+		<version>0.1.0</version>
 	</parent>
 
 	<properties>
@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.44</version>
+	<version>0.3.0</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 
@@ -30,17 +30,17 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>
-			<version>0.2.13</version>
+			<version>0.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>rdb-utils</artifactId>
-			<version>0.1.20</version>
+			<version>0.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>serialization</artifactId>
-			<version>0.1.9</version>
+			<version>0.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>
@@ -55,17 +55,17 @@
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4-runtime</artifactId>
-			<version>4.8-1</version>
+			<version>4.10.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-common</artifactId>
-			<version>17.0.1</version>
+			<version>18.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-core</artifactId>
-			<version>17.0.1</version>
+			<version>18.0.2</version>
 		</dependency>
 	</dependencies>
 

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

@@ -17,8 +17,6 @@
 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.jpas.BasicPermissionJpa;
@@ -158,16 +156,17 @@ else if (!orderBy.isBlank())
 
 		if (asyncStates != null)
 			log.debug("  with asynchronous_state: [{}]",
-					Strings.join(asyncStates.stream().map(AsyncState::toString).collect(Collectors.toList()), ", "));
+					String.join(", ", asyncStates.stream().map(AsyncState::toString).collect(Collectors.toList())));
 		addAsyncStatesParamsToQuery(asyncStates, q);
 
 		params = addTenantParams(params, tenantIds);
 		if (params != null) {
 			log.debug("  with parameters: [{}]",
-					Strings.join(params.entrySet()
-							.stream()
-							.map(e -> e.getKey() + ": " + e.getValue().toString())
-							.collect(Collectors.toList()), ", "));
+					String.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());
 		}