switch to new java time api

REL-BRANCH-ClubhelperModel-0.0.1
kre6513 5 years ago
parent 83f7d2281a
commit d0f143307c
  1. 14
      src/main/java/de/kreth/clubhelper/model/controller/AbstractController.java
  2. 4
      src/main/java/de/kreth/clubhelper/model/controller/AdressController.java
  3. 4
      src/main/java/de/kreth/clubhelper/model/controller/ContactController.java
  4. 4
      src/main/java/de/kreth/clubhelper/model/controller/PersonController.java
  5. 46
      src/main/java/de/kreth/clubhelper/model/data/BaseEntity.java
  6. 6
      src/main/java/de/kreth/clubhelper/model/data/EntityAccessor.java
  7. 4
      src/main/java/de/kreth/clubhelperbackend/aspects/DeletedStorageAspect.java
  8. 4
      src/main/java/de/kreth/clubhelperbackend/utils/TimeProvider.java
  9. 6
      src/main/java/de/kreth/clubhelperbackend/utils/TimeProviderImpl.java

@ -3,6 +3,7 @@ package de.kreth.clubhelper.model.controller;
import static de.kreth.clubhelperbackend.utils.BoolUtils.not; import static de.kreth.clubhelperbackend.utils.BoolUtils.not;
import static java.time.temporal.ChronoUnit.MINUTES; import static java.time.temporal.ChronoUnit.MINUTES;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -89,13 +90,13 @@ public abstract class AbstractController<T extends BaseEntity, D extends CrudRep
@PutMapping(value = "/{id}", produces = "application/json") @PutMapping(value = "/{id}", produces = "application/json")
public T put(@PathVariable("id") long id, @RequestBody T toUpdate) { public T put(@PathVariable("id") long id, @RequestBody T toUpdate) {
Date now = new Date(); LocalDateTime now = LocalDateTime.now();
Date created = toUpdate.getCreated(); LocalDateTime created = toUpdate.getCreated();
Date changed = null; LocalDateTime changed = null;
if (toUpdate.getChanged() != null) { if (toUpdate.getChanged() != null) {
changed = toUpdate.getChanged(); changed = toUpdate.getChanged();
long minutes = MINUTES.between(created.toInstant(), changed.toInstant()); long minutes = MINUTES.between(created, changed);
if (minutes < 1) { if (minutes < 1) {
toUpdate.setChanged(now); toUpdate.setChanged(now);
} }
@ -130,12 +131,11 @@ public abstract class AbstractController<T extends BaseEntity, D extends CrudRep
id = -1L; id = -1L;
} }
toCreate.setId(id); toCreate.setId(id);
Date now = new Date(); LocalDateTime now = LocalDateTime.now();
toCreate.setChanged(now); toCreate.setChanged(now);
if (toCreate.getCreated() == null if (toCreate.getCreated() == null) {
|| toCreate.getCreated().getTime() == 0) {
toCreate.setCreated(now); toCreate.setCreated(now);
} }

@ -1,6 +1,6 @@
package de.kreth.clubhelper.model.controller; package de.kreth.clubhelper.model.controller;
import java.util.Date; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -27,7 +27,7 @@ public class AdressController
public void delete(Adress a) public void delete(Adress a)
{ {
a.setDeleted(new Date()); a.setDeleted(LocalDateTime.now());
adressDao.save(a); adressDao.save(a);
} }
} }

@ -1,6 +1,6 @@
package de.kreth.clubhelper.model.controller; package de.kreth.clubhelper.model.controller;
import java.util.Date; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -27,7 +27,7 @@ public class ContactController
public void delete(Contact c) public void delete(Contact c)
{ {
c.setDeleted(new Date()); c.setDeleted(LocalDateTime.now());
contactDao.save(c); contactDao.save(c);
} }
} }

@ -1,6 +1,6 @@
package de.kreth.clubhelper.model.controller; package de.kreth.clubhelper.model.controller;
import java.util.Date; import java.time.LocalDateTime;
import java.util.Optional; import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -58,7 +58,7 @@ public class PersonController
for (Adress a : adressController.getByParent(person)) { for (Adress a : adressController.getByParent(person)) {
adressController.delete(a); adressController.delete(a);
} }
person.setDeleted(new Date()); person.setDeleted(LocalDateTime.now());
personDao.save(person); personDao.save(person);
} }
return optional.orElseThrow(() -> new RuntimeException("Person not found by id=" + id)); return optional.orElseThrow(() -> new RuntimeException("Person not found by id=" + id));

@ -1,13 +1,11 @@
package de.kreth.clubhelper.model.data; package de.kreth.clubhelper.model.data;
import java.util.Date; import java.time.LocalDateTime;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.MappedSuperclass; import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@MappedSuperclass @MappedSuperclass
public abstract class BaseEntity implements EntityAccessor public abstract class BaseEntity implements EntityAccessor
@ -15,52 +13,40 @@ public abstract class BaseEntity implements EntityAccessor
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private long id; private long id;
@Temporal(TemporalType.TIMESTAMP) private LocalDateTime changed;
private Date changed; private LocalDateTime created;
@Temporal(TemporalType.TIMESTAMP) private LocalDateTime deleted;
private Date created;
@Temporal(TemporalType.TIMESTAMP)
private Date deleted;
public Date getChanged() public LocalDateTime getChanged()
{ {
if (changed == null) { return this.changed;
return null;
}
return new Date(this.changed.getTime());
} }
@Override @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 created;
return null;
}
return new Date(this.created.getTime());
} }
@Override @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 deleted;
return null;
}
return new Date(this.deleted.getTime());
} }
public void setDeleted(Date deleted) public void setDeleted(LocalDateTime deleted)
{ {
this.deleted = new Date(deleted.getTime()); this.deleted = deleted;
} }
public boolean isDeleted() { public boolean isDeleted() {

@ -1,7 +1,7 @@
package de.kreth.clubhelper.model.data; package de.kreth.clubhelper.model.data;
import java.util.Date; import java.time.LocalDateTime;
public interface EntityAccessor { public interface EntityAccessor {
@ -9,8 +9,8 @@ public interface EntityAccessor {
boolean hasValidId(); boolean hasValidId();
void setChanged(Date changed); void setChanged(LocalDateTime changed);
void setCreated(Date created); void setCreated(LocalDateTime created);
} }

@ -1,7 +1,7 @@
package de.kreth.clubhelperbackend.aspects; package de.kreth.clubhelperbackend.aspects;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.Date; import java.time.LocalDateTime;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterReturning;
@ -51,7 +51,7 @@ public class DeletedStorageAspect {
String tableName = class1.getSimpleName(); String tableName = class1.getSimpleName();
long id = deleted.getId(); long id = deleted.getId();
Date now = time.getNow(); LocalDateTime now = time.getNow();
DeletedEntry entry = new DeletedEntry(); DeletedEntry entry = new DeletedEntry();
entry.setTablename(tableName); entry.setTablename(tableName);

@ -1,7 +1,7 @@
package de.kreth.clubhelperbackend.utils; package de.kreth.clubhelperbackend.utils;
import java.util.Date; import java.time.LocalDateTime;
public interface TimeProvider { public interface TimeProvider {
Date getNow(); LocalDateTime getNow();
} }

@ -1,6 +1,6 @@
package de.kreth.clubhelperbackend.utils; package de.kreth.clubhelperbackend.utils;
import java.util.Date; import java.time.LocalDateTime;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -8,8 +8,8 @@ import org.springframework.stereotype.Component;
public class TimeProviderImpl implements TimeProvider { public class TimeProviderImpl implements TimeProvider {
@Override @Override
public Date getNow() { public LocalDateTime getNow() {
return new Date(); return LocalDateTime.now();
} }
} }

Loading…
Cancel
Save