From d0f143307cd77bf5a29479ff7865190bcc8d1040 Mon Sep 17 00:00:00 2001
From: kre6513 <kre6513@DA05PC46.mecklenburgische.de>
Date: Thu, 10 Sep 2020 16:42:16 +0200
Subject: [PATCH] switch to new java time api

---
 .../model/controller/AbstractController.java  | 14 +++---
 .../model/controller/AdressController.java    |  4 +-
 .../model/controller/ContactController.java   |  4 +-
 .../model/controller/PersonController.java    |  4 +-
 .../clubhelper/model/data/BaseEntity.java     | 46 +++++++------------
 .../clubhelper/model/data/EntityAccessor.java |  6 +--
 .../aspects/DeletedStorageAspect.java         |  4 +-
 .../clubhelperbackend/utils/TimeProvider.java |  4 +-
 .../utils/TimeProviderImpl.java               |  6 +--
 9 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/src/main/java/de/kreth/clubhelper/model/controller/AbstractController.java b/src/main/java/de/kreth/clubhelper/model/controller/AbstractController.java
index 7a286fa..ff9e871 100644
--- a/src/main/java/de/kreth/clubhelper/model/controller/AbstractController.java
+++ b/src/main/java/de/kreth/clubhelper/model/controller/AbstractController.java
@@ -3,6 +3,7 @@ package de.kreth.clubhelper.model.controller;
 import static de.kreth.clubhelperbackend.utils.BoolUtils.not;
 import static java.time.temporal.ChronoUnit.MINUTES;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -89,13 +90,13 @@ public abstract class AbstractController<T extends BaseEntity, D extends CrudRep
 	@PutMapping(value = "/{id}", produces = "application/json")
 	public T put(@PathVariable("id") long id, @RequestBody T toUpdate) {
 
-		Date now = new Date();
-		Date created = toUpdate.getCreated();
-		Date changed = null;
+	   LocalDateTime now = LocalDateTime.now();
+		LocalDateTime created = toUpdate.getCreated();
+		LocalDateTime changed = null;
 
 		if (toUpdate.getChanged() != null) {
 			changed = toUpdate.getChanged();
-			long minutes = MINUTES.between(created.toInstant(), changed.toInstant());
+			long minutes = MINUTES.between(created, changed);
 			if (minutes < 1) {
 				toUpdate.setChanged(now);
 			}
@@ -130,12 +131,11 @@ public abstract class AbstractController<T extends BaseEntity, D extends CrudRep
 			id = -1L;
 		}
 		toCreate.setId(id);
-		Date now = new Date();
+		LocalDateTime now = LocalDateTime.now();
 
 		toCreate.setChanged(now);
 
-		if (toCreate.getCreated() == null
-				|| toCreate.getCreated().getTime() == 0) {
+		if (toCreate.getCreated() == null) {
 			toCreate.setCreated(now);
 		}
 
diff --git a/src/main/java/de/kreth/clubhelper/model/controller/AdressController.java b/src/main/java/de/kreth/clubhelper/model/controller/AdressController.java
index cd31499..5ce356e 100644
--- a/src/main/java/de/kreth/clubhelper/model/controller/AdressController.java
+++ b/src/main/java/de/kreth/clubhelper/model/controller/AdressController.java
@@ -1,6 +1,6 @@
 package de.kreth.clubhelper.model.controller;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ public class AdressController
 
    public void delete(Adress a)
    {
-      a.setDeleted(new Date());
+      a.setDeleted(LocalDateTime.now());
       adressDao.save(a);
    }
 }
diff --git a/src/main/java/de/kreth/clubhelper/model/controller/ContactController.java b/src/main/java/de/kreth/clubhelper/model/controller/ContactController.java
index 4b26581..576de01 100644
--- a/src/main/java/de/kreth/clubhelper/model/controller/ContactController.java
+++ b/src/main/java/de/kreth/clubhelper/model/controller/ContactController.java
@@ -1,6 +1,6 @@
 package de.kreth.clubhelper.model.controller;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ public class ContactController
 
    public void delete(Contact c)
    {
-      c.setDeleted(new Date());
+      c.setDeleted(LocalDateTime.now());
       contactDao.save(c);
    }
 }
diff --git a/src/main/java/de/kreth/clubhelper/model/controller/PersonController.java b/src/main/java/de/kreth/clubhelper/model/controller/PersonController.java
index 5e8ce06..5c46616 100644
--- a/src/main/java/de/kreth/clubhelper/model/controller/PersonController.java
+++ b/src/main/java/de/kreth/clubhelper/model/controller/PersonController.java
@@ -1,6 +1,6 @@
 package de.kreth.clubhelper.model.controller;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +58,7 @@ public class PersonController
          for (Adress a : adressController.getByParent(person)) {
             adressController.delete(a);
          }
-         person.setDeleted(new Date());
+         person.setDeleted(LocalDateTime.now());
          personDao.save(person);
       }
       return optional.orElseThrow(() -> new RuntimeException("Person not found by id=" + id));
diff --git a/src/main/java/de/kreth/clubhelper/model/data/BaseEntity.java b/src/main/java/de/kreth/clubhelper/model/data/BaseEntity.java
index 4ce1846..69cd5e6 100644
--- a/src/main/java/de/kreth/clubhelper/model/data/BaseEntity.java
+++ b/src/main/java/de/kreth/clubhelper/model/data/BaseEntity.java
@@ -1,13 +1,11 @@
 package de.kreth.clubhelper.model.data;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 @MappedSuperclass
 public abstract class BaseEntity implements EntityAccessor
@@ -15,52 +13,40 @@ public abstract class BaseEntity implements EntityAccessor
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    private long id;
-   @Temporal(TemporalType.TIMESTAMP)
-   private Date changed;
-   @Temporal(TemporalType.TIMESTAMP)
-   private Date created;
-   @Temporal(TemporalType.TIMESTAMP)
-   private Date deleted;
+   private LocalDateTime changed;
+   private LocalDateTime created;
+   private LocalDateTime deleted;
 
-   public Date getChanged()
+   public LocalDateTime getChanged()
    {
-      if (changed == null) {
-         return null;
-      }
-      return new Date(this.changed.getTime());
+      return this.changed;
    }
 
    @Override
-   public void setChanged(Date changed)
+   public void setChanged(LocalDateTime changed)
    {
-      this.changed = new Date(changed.getTime());
+      this.changed = changed;
    }
 
-   public Date getCreated()
+   public LocalDateTime getCreated()
    {
-      if (created == null) {
-         return null;
-      }
-      return new Date(this.created.getTime());
+      return created;
    }
 
    @Override
-   public void setCreated(Date created)
+   public void setCreated(LocalDateTime created)
    {
-      this.created = new Date(created.getTime());
+      this.created = created;
    }
 
-   public Date getDeleted()
+   public LocalDateTime getDeleted()
    {
-      if (deleted == null) {
-         return null;
-      }
-      return new Date(this.deleted.getTime());
+      return deleted;
    }
 
-   public void setDeleted(Date deleted)
+   public void setDeleted(LocalDateTime deleted)
    {
-      this.deleted = new Date(deleted.getTime());
+      this.deleted = deleted;
    }
 
    public boolean isDeleted() {
diff --git a/src/main/java/de/kreth/clubhelper/model/data/EntityAccessor.java b/src/main/java/de/kreth/clubhelper/model/data/EntityAccessor.java
index ae0ade0..3243f89 100644
--- a/src/main/java/de/kreth/clubhelper/model/data/EntityAccessor.java
+++ b/src/main/java/de/kreth/clubhelper/model/data/EntityAccessor.java
@@ -1,7 +1,7 @@
 package de.kreth.clubhelper.model.data;
 
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public interface EntityAccessor {
 
@@ -9,8 +9,8 @@ public interface EntityAccessor {
 
 	boolean hasValidId();
 
-	void setChanged(Date changed);
+	void setChanged(LocalDateTime changed);
 
-	void setCreated(Date created);
+	void setCreated(LocalDateTime created);
 
 }
diff --git a/src/main/java/de/kreth/clubhelperbackend/aspects/DeletedStorageAspect.java b/src/main/java/de/kreth/clubhelperbackend/aspects/DeletedStorageAspect.java
index 01feed0..029a4de 100644
--- a/src/main/java/de/kreth/clubhelperbackend/aspects/DeletedStorageAspect.java
+++ b/src/main/java/de/kreth/clubhelperbackend/aspects/DeletedStorageAspect.java
@@ -1,7 +1,7 @@
 package de.kreth.clubhelperbackend.aspects;
 
 import java.lang.reflect.Modifier;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -51,7 +51,7 @@ public class DeletedStorageAspect {
 
 		String tableName = class1.getSimpleName();
 		long id = deleted.getId();
-		Date now = time.getNow();
+		LocalDateTime now = time.getNow();
 
 		DeletedEntry entry = new DeletedEntry();
 		entry.setTablename(tableName);
diff --git a/src/main/java/de/kreth/clubhelperbackend/utils/TimeProvider.java b/src/main/java/de/kreth/clubhelperbackend/utils/TimeProvider.java
index 69dd8b3..62e19de 100644
--- a/src/main/java/de/kreth/clubhelperbackend/utils/TimeProvider.java
+++ b/src/main/java/de/kreth/clubhelperbackend/utils/TimeProvider.java
@@ -1,7 +1,7 @@
 package de.kreth.clubhelperbackend.utils;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public interface TimeProvider {
-	Date getNow();
+   LocalDateTime getNow();
 }
diff --git a/src/main/java/de/kreth/clubhelperbackend/utils/TimeProviderImpl.java b/src/main/java/de/kreth/clubhelperbackend/utils/TimeProviderImpl.java
index 248730c..e3d4b83 100644
--- a/src/main/java/de/kreth/clubhelperbackend/utils/TimeProviderImpl.java
+++ b/src/main/java/de/kreth/clubhelperbackend/utils/TimeProviderImpl.java
@@ -1,6 +1,6 @@
 package de.kreth.clubhelperbackend.utils;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 import org.springframework.stereotype.Component;
 
@@ -8,8 +8,8 @@ import org.springframework.stereotype.Component;
 public class TimeProviderImpl implements TimeProvider {
 
 	@Override
-	public Date getNow() {
-		return new Date();
+	public LocalDateTime getNow() {
+		return LocalDateTime.now();
 	}
 
 }