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. 48
      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 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);
}

@ -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);
}
}

@ -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);
}
}

@ -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));

@ -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;
public Date getChanged()
private LocalDateTime changed;
private LocalDateTime created;
private LocalDateTime deleted;
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() {

@ -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);
}

@ -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);

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

@ -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();
}
}

Loading…
Cancel
Save