Remove AbstractAuditableEntity, move functions to AbstractEntity.

Author: yuanxuegui

src/main/java/org/springframework/data/ebean/domain/AbstractAuditableEntity.java

@@ -16,91 +16,149 @@
 
 package org.springframework.data.ebean.domain;
 
+import io.ebean.annotation.CreatedTimestamp;
+import io.ebean.annotation.UpdatedTimestamp;
+import io.ebean.annotation.WhoCreated;
+import io.ebean.annotation.WhoModified;
+import org.springframework.data.domain.Auditable;
 import org.springframework.data.domain.Persistable;
 import org.springframework.util.ClassUtils;
 
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
+import java.time.LocalDateTime;
+import java.util.Optional;
 
 /**
- * Abstract base class for entities. Allows parameterization of id type, chooses auto-generation and implements
+ * Abstract base class for entities.
  * {@link #equals(Object)} and {@link #hashCode()} based on that id.
  *
  * @author Xuegui Yuan
  */
 @MappedSuperclass
-public abstract class AbstractEntity implements Persistable<Long> {
+public abstract class AbstractEntity implements Persistable<Long>, Auditable<String, Long, LocalDateTime> {
 
-  private static final long serialVersionUID = -5554308939380869754L;
+    private static final long serialVersionUID = -5554308939380869754L;
 
     @Id
-  protected Long id;
-
-  /*
-   * (non-Javadoc)
-   *
-   * @see java.lang.Object#hashCode()
-   */
-  @Override
-  public int hashCode() {
-
-    int hashCode = 17;
-
-    hashCode += null == getId() ? 0 : getId().hashCode() * 31;
-
-    return hashCode;
-  }
-
-  @Override
-  public Long getId() {
-    return id;
-  }
-
-  /**
-   * Sets the id of the entity.
-   *
-   * @param id the id to set
-   */
-  public void setId(final Long id) {
-    this.id = id;
-  }
-
-  @Transient
-  @Override
-  public boolean isNew() {
-    return null == getId();
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-
-    if (null == obj) {
-      return false;
+    protected Long id;
+
+    @WhoCreated
+    String createdBy;
+
+    @CreatedTimestamp
+    LocalDateTime createdDate;
+
+    @WhoModified
+    String lastModifiedBy;
+
+    @UpdatedTimestamp
+    LocalDateTime lastModifiedDate;
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * Sets the id of the entity.
+     *
+     * @param id the id to set
+     */
+    public void setId(final Long id) {
+        this.id = id;
+    }
+
+    @Transient
+    @Override
+    public boolean isNew() {
+        return null == getId();
+    }
+
+    @Override
+    public Optional<String> getCreatedBy() {
+        return Optional.ofNullable(createdBy);
+    }
+
+    @Override
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
     }
 
-    if (this == obj) {
-      return true;
+    @Override
+    public Optional<LocalDateTime> getCreatedDate() {
+        return Optional.ofNullable(createdDate);
     }
 
-    if (!getClass().equals(ClassUtils.getUserClass(obj))) {
-      return false;
+    @Override
+    public void setCreatedDate(LocalDateTime createdDate) {
+        this.createdDate = createdDate;
     }
 
-    AbstractEntity that = (AbstractEntity) obj;
+    @Override
+    public Optional<String> getLastModifiedBy() {
+        return Optional.ofNullable(lastModifiedBy);
+    }
 
-    return null == this.getId() ? false : this.getId().equals(that.getId());
-  }
+    @Override
+    public void setLastModifiedBy(String lastModifiedBy) {
+        this.lastModifiedBy = lastModifiedBy;
+    }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see java.lang.Object#toString()
-   */
-  @Override
-  public String toString() {
-    return String.format("Entity of type %s with id: %s", this.getClass().getName(), getId());
-  }
+    @Override
+    public Optional<LocalDateTime> getLastModifiedDate() {
+        return Optional.ofNullable(lastModifiedDate);
+    }
+
+    @Override
+    public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
+        this.lastModifiedDate = lastModifiedDate;
+    }
+
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        int hashCode = 17;
+
+        hashCode += null == getId() ? 0 : getId().hashCode() * 31;
+
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (null == obj) {
+            return false;
+        }
+
+        if (this == obj) {
+            return true;
+        }
+
+        if (!getClass().equals(ClassUtils.getUserClass(obj))) {
+            return false;
+        }
+
+        AbstractEntity that = (AbstractEntity) obj;
+
+        return null == this.getId() ? false : this.getId().equals(that.getId());
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return String.format("Entity of type %s with id: %s", this.getClass().getName(), getId());
+    }
 
 
 }

src/main/java/org/springframework/data/ebean/domain/AbstractEntity.java

@@ -130,12 +130,12 @@ public void testFindByExample() {
         assertEquals(0, result2.size());
     }
 
-//    @Test
-//    public void testAuditable() {
-//        User u = userRepository.findUserByEmailAddressEqualsOql("[email protected]");
-//        assertEquals("test", u.getCreatedBy().get());
-//        assertEquals("test", u.getLastModifiedBy().get());
-//    }
+    @Test
+    public void testAuditable() {
+        User u = userRepository.findUserByEmailAddressEqualsOql("[email protected]");
+        assertEquals("test", u.getCreatedBy().get());
+        assertEquals("test", u.getLastModifiedBy().get());
+    }
 
     @Test
     public void testDomainEvent() {