Merge branch 'develop'

Author: guFalcon

pom.xml

@@ -15,7 +15,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.3.11</version>
+	<version>0.3.12</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

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

@@ -3,6 +3,8 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import info.unterrainer.commons.httpserver.daos.CoreDao;
@@ -156,6 +158,25 @@ public int convertToInt(final String s) {
 		}
 	}
 
+	public <T extends Enum<T>> List<T> convertToEnumList(final String[] o, final Class<T> enumType) {
+		List<T> result = new ArrayList<>();
+		try {
+			for (String s : o)
+				result.add(Enum.valueOf(enumType, s));
+		} catch (IllegalArgumentException e) {
+			throw new BadRequestException("Parameter has to be a comma-separated list of a valid enum type.");
+		}
+		return result;
+	}
+
+	public <T extends Enum<T>> List<T> getQueryParamAsEnumList(final Context ctx, final String name,
+			final Class<T> enumType, final List<T> defaultValue) {
+		String paramString = getQueryParamAsString(ctx, name);
+		if (paramString == null)
+			return defaultValue;
+		return convertToEnumList(paramString.split(","), enumType);
+	}
+
 	public String getQueryParamAsString(final Context ctx, final String name) {
 		return getQueryParamAsString(ctx, name, true, null);
 	}

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

@@ -4,15 +4,14 @@
 import java.util.List;
 import java.util.function.Function;
 
+import info.unterrainer.commons.httpserver.jsons.ListJson;
+import info.unterrainer.commons.rdbutils.Transactions;
+import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.NoResultException;
 import jakarta.persistence.NonUniqueResultException;
 import jakarta.persistence.TypedQuery;
-
-import info.unterrainer.commons.httpserver.jsons.ListJson;
-import info.unterrainer.commons.rdbutils.Transactions;
-import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 
@@ -59,7 +58,7 @@ public ListJson<T> getListJson(final long offset, final long size) {
 	}
 
 	/**
-	 * Gets the first row this query returns.
+	 * Gets the first row this query returns or null, if no row was returned at all.
 	 *
 	 * @return the result-row as a JPA
 	 */