#2636 - Remove deprecated @CreatedTimestamp and @UpdateTimestamp, migrate to @WhenCreated / @WhenModified

This commit is contained in:
Rob Bygrave committed 2022-04-06 22:17:33 +12:00
1 parent 34ce77c17e
commit c7ad5c5981
8 files changed
+22 -74

No files matched your search

+1 -1
View File
@@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-annotation</artifactId> <artifactId>ebean-annotation</artifactId>
<version>7.8</version> <version>8.0</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -219,9 +219,7 @@ public class DeployBeanProperty {
return (AnnotationUtil.has(field, WhenCreated.class) return (AnnotationUtil.has(field, WhenCreated.class)
|| AnnotationUtil.has(field, WhenModified.class) || AnnotationUtil.has(field, WhenModified.class)
|| AnnotationUtil.has(field, WhoModified.class) || AnnotationUtil.has(field, WhoModified.class)
|| AnnotationUtil.has(field, WhoCreated.class) || AnnotationUtil.has(field, WhoCreated.class));
|| AnnotationUtil.has(field, UpdatedTimestamp.class)
|| AnnotationUtil.has(field, CreatedTimestamp.class));
} }
public String getFullBeanName() { public String getFullBeanName() {
@@ -1,38 +1,7 @@
package io.ebeaninternal.server.deploy.parse; package io.ebeaninternal.server.deploy.parse;
import io.ebean.annotation.Aggregation;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.DbArray;
import io.ebean.annotation.DbComment;
import io.ebean.annotation.DbDefault;
import io.ebean.annotation.DbJson;
import io.ebean.annotation.DbJsonB;
import io.ebean.annotation.DbMap;
import io.ebean.annotation.DbMigration;
import io.ebean.annotation.DocCode;
import io.ebean.annotation.DocEmbedded;
import io.ebean.annotation.DocProperty;
import io.ebean.annotation.DocSortable;
import io.ebean.annotation.Draft;
import io.ebean.annotation.DraftDirty;
import io.ebean.annotation.DraftOnly;
import io.ebean.annotation.DraftReset;
import io.ebean.annotation.Encrypted;
import io.ebean.annotation.Expose;
import io.ebean.annotation.Formula;
import io.ebean.annotation.HistoryExclude;
import io.ebean.annotation.Identity;
import io.ebean.annotation.Index; import io.ebean.annotation.Index;
import io.ebean.annotation.JsonIgnore; import io.ebean.annotation.*;
import io.ebean.annotation.Length;
import io.ebean.annotation.SoftDelete;
import io.ebean.annotation.TenantId;
import io.ebean.annotation.UnmappedJson;
import io.ebean.annotation.UpdatedTimestamp;
import io.ebean.annotation.WhenCreated;
import io.ebean.annotation.WhenModified;
import io.ebean.annotation.WhoCreated;
import io.ebean.annotation.WhoModified;
import io.ebean.config.EncryptDeploy; import io.ebean.config.EncryptDeploy;
import io.ebean.config.EncryptDeploy.Mode; import io.ebean.config.EncryptDeploy.Mode;
import io.ebean.config.dbplatform.DbEncrypt; import io.ebean.config.dbplatform.DbEncrypt;
@@ -51,24 +20,7 @@ import io.ebeaninternal.server.type.ScalarTypeBytesBase;
import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted; import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted;
import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper; import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper;
import javax.persistence.Basic; import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.PersistenceException;
import javax.persistence.SequenceGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.persistence.Version;
import java.sql.Types; import java.sql.Types;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@@ -339,10 +291,10 @@ final class AnnotationFields extends AnnotationParser {
} }
private void initWhen(DeployBeanProperty prop) { private void initWhen(DeployBeanProperty prop) {
if (has(prop, WhenCreated.class) || has(prop, CreatedTimestamp.class)) { if (has(prop, WhenCreated.class)) {
generatedPropFactory.setInsertTimestamp(prop); generatedPropFactory.setInsertTimestamp(prop);
} }
if (has(prop, WhenModified.class) || has(prop, UpdatedTimestamp.class)) { if (has(prop, WhenModified.class)) {
generatedPropFactory.setUpdateTimestamp(prop); generatedPropFactory.setUpdateTimestamp(prop);
} }
} }
@@ -40,7 +40,7 @@ public class Contact {
@OneToMany(cascade = CascadeType.ALL) @OneToMany(cascade = CascadeType.ALL)
List<ContactNote> notes; List<ContactNote> notes;
@CreatedTimestamp @WhenCreated
Timestamp cretime; Timestamp cretime;
@Version @Version
@@ -33,7 +33,7 @@ public class Product implements Serializable {
String name; String name;
@CreatedTimestamp @WhenCreated
Timestamp cretime; Timestamp cretime;
@Version @Version
@@ -1,7 +1,5 @@
package org.tests.model; package org.tests.model;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.UpdatedTimestamp;
import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenCreated;
import io.ebean.annotation.WhenModified; import io.ebean.annotation.WhenModified;
@@ -31,40 +29,40 @@ public class EGenProps {
@WhenModified @WhenModified
Timestamp whenModified; Timestamp whenModified;
@CreatedTimestamp @WhenCreated
Timestamp tsCreated; Timestamp tsCreated;
@UpdatedTimestamp @WhenModified
Timestamp tsUpdated; Timestamp tsUpdated;
@CreatedTimestamp @WhenCreated
LocalDateTime ldtCreated; LocalDateTime ldtCreated;
@UpdatedTimestamp @WhenModified
LocalDateTime ldtUpdated; LocalDateTime ldtUpdated;
@CreatedTimestamp @WhenCreated
OffsetDateTime odtCreated; OffsetDateTime odtCreated;
@UpdatedTimestamp @WhenModified
OffsetDateTime odtUpdated; OffsetDateTime odtUpdated;
@CreatedTimestamp @WhenCreated
ZonedDateTime zdtCreated; ZonedDateTime zdtCreated;
@UpdatedTimestamp @WhenModified
ZonedDateTime zdtUpdated; ZonedDateTime zdtUpdated;
@CreatedTimestamp @WhenCreated
Instant instantCreated; Instant instantCreated;
@UpdatedTimestamp @WhenModified
Instant instantUpdated; Instant instantUpdated;
@CreatedTimestamp @WhenCreated
long longCreated; long longCreated;
@UpdatedTimestamp @WhenModified
long longUpdated; long longUpdated;
public Long getId() { public Long getId() {
@@ -40,7 +40,7 @@ public class Contact {
@OneToMany(cascade = CascadeType.ALL) @OneToMany(cascade = CascadeType.ALL)
List<ContactNote> notes; List<ContactNote> notes;
@CreatedTimestamp @WhenCreated
Timestamp cretime; Timestamp cretime;
@Version @Version
@@ -33,7 +33,7 @@ public class Product implements Serializable {
String name; String name;
@CreatedTimestamp @WhenCreated
Timestamp cretime; Timestamp cretime;
@Version @Version