#472 - DDL column ordering for @WhoCreated / @WhoModified. These columns should appear in the DDL with the @WhenCreated/@WhenModified columns.

src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java

@@ -4,6 +4,8 @@ import com.avaje.ebean.annotation.CreatedTimestamp;
 import com.avaje.ebean.annotation.UpdatedTimestamp;
 import com.avaje.ebean.annotation.WhenCreated;
 import com.avaje.ebean.annotation.WhenModified;
+import com.avaje.ebean.annotation.WhoCreated;
+import com.avaje.ebean.annotation.WhoModified;
 import com.avaje.ebean.config.ScalarTypeConverter;
 import com.avaje.ebean.config.dbplatform.DbEncrypt;
 import com.avaje.ebean.config.dbplatform.DbEncryptFunction;
@@ -215,9 +217,7 @@ public class DeployBeanProperty {
       return ID_ORDER;
     } else if (undirectionalShadow) {
       return UNIDIRECTIONAL_ORDER;
-    } else if (field.getAnnotation(WhenCreated.class) != null || field.getAnnotation(CreatedTimestamp.class) != null) {
-      return AUDITCOLUMN_ORDER;
-    } else if (field.getAnnotation(WhenModified.class) != null || field.getAnnotation(UpdatedTimestamp.class) != null) {
+    } else if (isAuditProperty()) {
       return AUDITCOLUMN_ORDER;
     } else if (field.getAnnotation(Version.class) != null) {
       return VERSIONCOLUMN_ORDER;
@@ -225,6 +225,15 @@ public class DeployBeanProperty {
     return 0;
   }
 
+  private boolean isAuditProperty() {
+    return (field.getAnnotation(WhenCreated.class) != null
+        || field.getAnnotation(WhenModified.class) != null
+        || field.getAnnotation(WhoModified.class) != null
+        || field.getAnnotation(WhoCreated.class) != null
+        || field.getAnnotation(UpdatedTimestamp.class) != null
+        || field.getAnnotation(CreatedTimestamp.class) != null);
+  }
+
   public String getFullBeanName() {
     return desc.getFullName() + "." + name;
   }

src/test/java/com/avaje/tests/model/EWhoProps.java

@@ -1,46 +1,12 @@
 package com.avaje.tests.model;
 
-import com.avaje.ebean.annotation.WhenCreated;
-import com.avaje.ebean.annotation.WhenModified;
-import com.avaje.ebean.annotation.WhoCreated;
-import com.avaje.ebean.annotation.WhoModified;
-
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Version;
-import java.sql.Timestamp;
 
 @Entity
-public class EWhoProps {
-
-  @Id
-  Long id;
+public class EWhoProps extends EWhoPropsSuper {
 
   String name;
 
-  @Version
-  Long version;
-
-  @WhenCreated
-  Timestamp whenCreated;
-
-  @WhenModified
-  Timestamp whenModified;
-
-  @WhoCreated
-  String whoCreated;
-
-  @WhoModified
-  String whoModified;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
   public String getName() {
     return name;
   }
@@ -49,43 +15,4 @@ public class EWhoProps {
     this.name = name;
   }
 
-  public Long getVersion() {
-    return version;
-  }
-
-  public void setVersion(Long version) {
-    this.version = version;
-  }
-
-  public Timestamp getWhenCreated() {
-    return whenCreated;
-  }
-
-  public void setWhenCreated(Timestamp whenCreated) {
-    this.whenCreated = whenCreated;
-  }
-
-  public Timestamp getWhenModified() {
-    return whenModified;
-  }
-
-  public void setWhenModified(Timestamp whenModified) {
-    this.whenModified = whenModified;
-  }
-
-  public String getWhoCreated() {
-    return whoCreated;
-  }
-
-  public void setWhoCreated(String whoCreated) {
-    this.whoCreated = whoCreated;
-  }
-
-  public String getWhoModified() {
-    return whoModified;
-  }
-
-  public void setWhoModified(String whoModified) {
-    this.whoModified = whoModified;
-  }
 }

src/test/java/com/avaje/tests/model/EWhoPropsSuper.java

@@ -0,0 +1,81 @@
+package com.avaje.tests.model;
+
+import com.avaje.ebean.annotation.WhenCreated;
+import com.avaje.ebean.annotation.WhenModified;
+import com.avaje.ebean.annotation.WhoCreated;
+import com.avaje.ebean.annotation.WhoModified;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import java.sql.Timestamp;
+
+@MappedSuperclass
+public class EWhoPropsSuper {
+
+  @Id
+  Long id;
+
+  @Version
+  Long version;
+
+  @WhenCreated
+  Timestamp whenCreated;
+
+  @WhenModified
+  Timestamp whenModified;
+
+  @WhoCreated
+  String whoCreated;
+
+  @WhoModified
+  String whoModified;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+  public Timestamp getWhenCreated() {
+    return whenCreated;
+  }
+
+  public void setWhenCreated(Timestamp whenCreated) {
+    this.whenCreated = whenCreated;
+  }
+
+  public Timestamp getWhenModified() {
+    return whenModified;
+  }
+
+  public void setWhenModified(Timestamp whenModified) {
+    this.whenModified = whenModified;
+  }
+
+  public String getWhoCreated() {
+    return whoCreated;
+  }
+
+  public void setWhoCreated(String whoCreated) {
+    this.whoCreated = whoCreated;
+  }
+
+  public String getWhoModified() {
+    return whoModified;
+  }
+
+  public void setWhoModified(String whoModified) {
+    this.whoModified = whoModified;
+  }
+}