Merge branch 'master' into features/keycloak

Author: Psilo

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>info.unterrainer.commons</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>0.0.25</version>
+		<version>0.0.26</version>
 	</parent>
 
 	<properties>
@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.0.41</version>
+	<version>0.0.42</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 = "2020-08-05T09:24:23Z";
-	public static final String pomVersion = "0.0.40";
+	public static final String buildTime = "2020-09-29T16:51:32Z";
+	public static final String pomVersion = "0.0.41";
 }

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

@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -48,7 +47,7 @@ public P create(final P entity) {
 
 	@Override
 	public P create(final EntityManager em, final P entity) {
-		LocalDateTime time = ZonedDateTime.now(ZoneOffset.UTC).toLocalDateTime();
+		LocalDateTime time = LocalDateTime.now(ZoneOffset.UTC);
 		entity.setCreatedOn(time);
 		entity.setEditedOn(time);
 		em.persist(entity);
@@ -62,7 +61,7 @@ public P update(final P entity) {
 
 	@Override
 	public P update(final EntityManager em, final P entity) {
-		LocalDateTime time = ZonedDateTime.now(ZoneOffset.UTC).toLocalDateTime();
+		LocalDateTime time = LocalDateTime.now(ZoneOffset.UTC);
 		entity.setEditedOn(time);
 		return em.merge(entity);
 	}

src/main/java/info/unterrainer/commons/httpserver/handlers/DateTimeHandler.java

@@ -15,8 +15,10 @@ public class DateTimeHandler implements Handler {
 
 	@Override
 	public void handle(final Context ctx) throws Exception {
-		ctx.attribute(Attribute.RESPONSE_OBJECT, MessageJson.builder()
-				.message(ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ISO_INSTANT)).build());
+		ctx.attribute(Attribute.RESPONSE_OBJECT,
+				MessageJson.builder()
+						.message(ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ISO_INSTANT))
+						.build());
 		ctx.attribute(Attribute.RESPONSE_STATUS, 200);
 	}
 }