#919 - io.ebean package initial

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java

@@ -0,0 +1,63 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+import javax.persistence.PersistenceException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Types;
+
+/**
+ * Creates "Counter" GeneratedProperty for various types of number.
+ * <p>
+ * Aka, Integer, Long, Short etc.
+ * </p>
+ */
+public class CounterFactory {
+
+  final GeneratedCounterInteger integerCounter = new GeneratedCounterInteger();
+
+  final GeneratedCounterLong longCounter = new GeneratedCounterLong();
+
+  public void setCounter(DeployBeanProperty property) {
+
+    property.setGeneratedProperty(createCounter(property));
+  }
+
+  /**
+   * Create the GeneratedProperty based on the property type.
+   */
+  private GeneratedProperty createCounter(DeployBeanProperty property) {
+
+    Class<?> propType = property.getPropertyType();
+    if (propType.equals(Integer.class) || propType.equals(int.class)) {
+      return integerCounter;
+    }
+    if (propType.equals(Long.class) || propType.equals(long.class)) {
+      return longCounter;
+    }
+
+    int type = getType(propType);
+    return new GeneratedCounter(type);
+  }
+
+  private int getType(Class<?> propType) {
+    if (propType.equals(Short.class) || propType.equals(short.class)) {
+      return Types.TINYINT;
+    }
+    if (propType.equals(BigDecimal.class)) {
+      return Types.DECIMAL;
+    }
+    if (propType.equals(Double.class) || propType.equals(double.class)) {
+      return Types.DOUBLE;
+    }
+    if (propType.equals(Float.class) || propType.equals(float.class)) {
+      return Types.REAL;
+    }
+    if (propType.equals(BigInteger.class)) {
+      return Types.BIGINT;
+    }
+    String msg = "Can not support Counter for type " + propType.getName();
+    throw new PersistenceException(msg);
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java

@@ -0,0 +1,59 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * A general number counter for various number types.
+ */
+public class GeneratedCounter implements GeneratedProperty {
+
+  final int numberType;
+
+  public GeneratedCounter(int numberType) {
+    this.numberType = numberType;
+  }
+
+  /**
+   * Always returns a 1.
+   */
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return BasicTypeConverter.convert(1, numberType);
+  }
+
+  /**
+   * Increments the current value by one.
+   */
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    Number currVal = (Number) prop.getValue(bean);
+    Integer nextVal = currVal.intValue() + 1;
+    return BasicTypeConverter.convert(nextVal, numberType);
+  }
+
+  /**
+   * Include this in every update.
+   */
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  /**
+   * Include this in every insert setting initial counter value to 1.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java

@@ -0,0 +1,55 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Used to create a counter version column for Integer.
+ */
+public class GeneratedCounterInteger implements GeneratedProperty {
+
+  public GeneratedCounterInteger() {
+
+  }
+
+  /**
+   * Always returns a 1.
+   */
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return 1;
+  }
+
+  /**
+   * Increments the current value by one.
+   */
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    Integer i = (Integer) prop.getValue(bean);
+    return i + 1;
+  }
+
+  /**
+   * Include this in every update.
+   */
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  /**
+   * Include this in every insert setting initial counter value to 1.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java

@@ -0,0 +1,55 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Used to create a counter version column for Long.
+ */
+public class GeneratedCounterLong implements GeneratedProperty {
+
+  public GeneratedCounterLong() {
+
+  }
+
+  /**
+   * Always returns a 1.
+   */
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return (long) 1;
+  }
+
+  /**
+   * Increments the current value by one.
+   */
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    Long i = (Long) prop.getValue(bean);
+    return i + 1;
+  }
+
+  /**
+   * Include this in every update.
+   */
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  /**
+   * Include this in every insert setting initial counter value to 1.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java

@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+import java.util.Date;
+
+/**
+ * Used to generate a (java.util.Date) timestamp when a bean is inserted.
+ */
+public class GeneratedInsertDate implements GeneratedProperty {
+
+  /**
+   * Return the current time as a Timestamp.
+   */
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return new Date(now);
+  }
+
+  /**
+   * Just returns the beans original insert timestamp value.
+   */
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return prop.getValue(bean);
+  }
+
+  /**
+   * Return false.
+   */
+  public boolean includeInUpdate() {
+    return false;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  /**
+   * Return true.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java

@@ -0,0 +1,85 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Support java.time types as GeneratedProperty.
+ */
+public class GeneratedInsertJavaTime {
+
+  public static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
+
+    @Override
+    public boolean includeInUpdate() {
+      return false;
+    }
+
+    @Override
+    public boolean includeInAllUpdates() {
+      return false;
+    }
+
+    @Override
+    public boolean includeInInsert() {
+      return true;
+    }
+
+    @Override
+    public boolean isDDLNotNullable() {
+      return true;
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return prop.getValue(bean);
+    }
+  }
+
+  /**
+   * Instant support.
+   */
+  public static class InstantDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toInstant(now);
+    }
+  }
+
+  /**
+   * LocalDateTime support.
+   */
+  public static class LocalDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toLocalDateTime(now);
+    }
+  }
+
+  /**
+   * OffsetDateTime support.
+   */
+  public static class OffsetDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toOffsetDateTime(now);
+    }
+
+  }
+
+  /**
+   * ZonedDateTime support.
+   */
+  public static class ZonedDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toZonedDateTime(now);
+    }
+
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java

@@ -0,0 +1,65 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDateTime;
+
+/**
+ * Support joda time types as GeneratedProperty.
+ */
+public class GeneratedInsertJodaTime {
+
+  public static abstract class Base implements GeneratedProperty, GeneratedWhenCreated {
+
+    @Override
+    public boolean includeInUpdate() {
+      return false;
+    }
+
+    @Override
+    public boolean includeInAllUpdates() {
+      return false;
+    }
+
+    @Override
+    public boolean includeInInsert() {
+      return true;
+    }
+
+    @Override
+    public boolean isDDLNotNullable() {
+      return true;
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return prop.getValue(bean);
+    }
+  }
+
+  /**
+   * LocalDateTime support.
+   */
+  public static class LocalDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return new LocalDateTime(now);
+    }
+  }
+
+  /**
+   * DateTime support.
+   */
+  public static class DateTimeDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return new DateTime(now);
+    }
+
+  }
+
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java

@@ -0,0 +1,50 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Used to generate a (Long) timestamp when a bean is inserted.
+ */
+public class GeneratedInsertLong implements GeneratedProperty {
+
+  /**
+   * Return the current time as a Timestamp.
+   */
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return now;
+  }
+
+  /**
+   * Just returns the beans original insert timestamp value.
+   */
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return prop.getValue(bean);
+  }
+
+  /**
+   * Return false.
+   */
+  public boolean includeInUpdate() {
+    return false;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  /**
+   * Return true.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java

@@ -0,0 +1,52 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+import java.sql.Timestamp;
+
+/**
+ * Used to generate a timestamp when a bean is inserted.
+ */
+public class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhenCreated {
+
+  /**
+   * Return the current time as a Timestamp.
+   */
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return new Timestamp(now);
+  }
+
+  /**
+   * Just returns the beans original insert timestamp value.
+   */
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return prop.getValue(bean);
+  }
+
+  /**
+   * Return false.
+   */
+  public boolean includeInUpdate() {
+    return false;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  /**
+   * Return true.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java

@@ -0,0 +1,47 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Used to generate values for a property rather than have then set by the user.
+ * For example generate the update timestamp when a bean is updated.
+ */
+public interface GeneratedProperty {
+
+  /**
+   * Get the generated insert value for a specific property of a bean.
+   */
+  Object getInsertValue(BeanProperty prop, EntityBean bean, long now);
+
+  /**
+   * Get the generated update value for a specific property of a bean.
+   */
+  Object getUpdateValue(BeanProperty prop, EntityBean bean, long now);
+
+  /**
+   * Return true if this should always be includes in an update statement.
+   * <p>
+   * Used to include GeneratedUpdateTimestamp in dynamic table updates.
+   * </p>
+   */
+  boolean includeInUpdate();
+
+  /**
+   * Return true if the property should be included in an update even if
+   * it is not loaded (ie. Last Updated Timestamp).
+   */
+  boolean includeInAllUpdates();
+
+  /**
+   * Return true if this should be included in insert statements.
+   */
+  boolean includeInInsert();
+
+  /**
+   * Return true if the GeneratedProperty implies the DDL to create the DB
+   * column should have a not null constraint.
+   */
+  boolean isDDLNotNullable();
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java

@@ -0,0 +1,153 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.Transaction;
+import io.ebean.config.ClassLoadConfig;
+import io.ebean.config.CurrentUserProvider;
+import io.ebean.config.IdGenerator;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Default implementation of GeneratedPropertyFactory.
+ */
+public class GeneratedPropertyFactory {
+
+  private final CounterFactory counterFactory = new CounterFactory();
+
+  private final InsertTimestampFactory insertFactory;
+
+  private final UpdateTimestampFactory updateFactory;
+
+  private final HashSet<String> numberTypes = new HashSet<>();
+
+  private final GeneratedWhoModified generatedWhoModified;
+
+  private final GeneratedWhoCreated generatedWhoCreated;
+
+  private final ClassLoadConfig classLoadConfig;
+
+  private final Map<String,PlatformIdGenerator> idGeneratorMap = new HashMap<>();
+
+  public GeneratedPropertyFactory(ServerConfig serverConfig, List<IdGenerator> idGenerators) {
+
+    this.classLoadConfig = serverConfig.getClassLoadConfig();
+    this.insertFactory = new InsertTimestampFactory(classLoadConfig);
+    this.updateFactory = new UpdateTimestampFactory(classLoadConfig);
+
+    CurrentUserProvider currentUserProvider = serverConfig.getCurrentUserProvider();
+    if (currentUserProvider != null) {
+      generatedWhoCreated = new GeneratedWhoCreated(currentUserProvider);
+      generatedWhoModified = new GeneratedWhoModified(currentUserProvider);
+    } else {
+      generatedWhoCreated = null;
+      generatedWhoModified = null;
+    }
+
+    numberTypes.add(Integer.class.getName());
+    numberTypes.add(int.class.getName());
+    numberTypes.add(Long.class.getName());
+    numberTypes.add(long.class.getName());
+    numberTypes.add(Short.class.getName());
+    numberTypes.add(short.class.getName());
+    numberTypes.add(Double.class.getName());
+    numberTypes.add(double.class.getName());
+    numberTypes.add(BigDecimal.class.getName());
+
+    if (idGenerators != null) {
+      for (IdGenerator idGenerator : idGenerators) {
+        idGeneratorMap.put(idGenerator.getName(), new CustomIdGenerator(idGenerator));
+      }
+    }
+  }
+
+  public ClassLoadConfig getClassLoadConfig() {
+    return classLoadConfig;
+  }
+
+  private boolean isNumberType(String typeClassName) {
+    return numberTypes.contains(typeClassName);
+  }
+
+  public void setVersion(DeployBeanProperty property) {
+    if (isNumberType(property.getPropertyType().getName())) {
+      setCounter(property);
+    } else {
+      setUpdateTimestamp(property);
+    }
+  }
+
+  public void setCounter(DeployBeanProperty property) {
+
+    counterFactory.setCounter(property);
+  }
+
+  public void setInsertTimestamp(DeployBeanProperty property) {
+
+    insertFactory.setInsertTimestamp(property);
+  }
+
+  public void setUpdateTimestamp(DeployBeanProperty property) {
+
+    updateFactory.setUpdateTimestamp(property);
+  }
+
+  public void setWhoCreated(DeployBeanProperty property) {
+    if (generatedWhoCreated == null) {
+      throw new IllegalStateException("No CurrentUserProvider has been set so @WhoCreated is not supported");
+    }
+    property.setGeneratedProperty(generatedWhoCreated);
+  }
+
+  public void setWhoModified(DeployBeanProperty property) {
+    if (generatedWhoModified == null) {
+      throw new IllegalStateException("No CurrentUserProvider has been set so @WhoModified is not supported");
+    }
+    property.setGeneratedProperty(generatedWhoModified);
+  }
+
+  /**
+   * Return the named custom IdGenerator (wrapped as a PlatformIdGenerator).
+   */
+  public PlatformIdGenerator getIdGenerator(String generatorName) {
+    return idGeneratorMap.get(generatorName);
+  }
+
+  /**
+   * Wraps the custom IdGenerator to implement PlatformIdGenerator.
+   */
+  private static class CustomIdGenerator implements PlatformIdGenerator {
+
+    private final IdGenerator generator;
+
+    CustomIdGenerator(IdGenerator generator) {
+      this.generator = generator;
+    }
+
+    @Override
+    public String getName() {
+      return generator.getName();
+    }
+
+    @Override
+    public boolean isDbSequence() {
+      return false;
+    }
+
+    @Override
+    public Object nextId(Transaction transaction) {
+      return generator.nextValue();
+    }
+
+    @Override
+    public void preAllocateIds(int allocateSize) {
+      // do nothing
+    }
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java

@@ -0,0 +1,51 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+import java.util.Date;
+
+/**
+ * Generate a (java.util.Date) Timestamp whenever the bean is inserted or
+ * updated.
+ */
+public class GeneratedUpdateDate implements GeneratedProperty {
+
+  /**
+   * Return now as a Timestamp.
+   */
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return new Date(now);
+  }
+
+  /**
+   * Return now as a Timestamp.
+   */
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return new Date(now);
+  }
+
+  /**
+   * For dynamic table updates make sure this is included.
+   */
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return true;
+  }
+
+  /**
+   * Include this in every insert.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java

@@ -0,0 +1,98 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Support java.time DateTime types as GeneratedProperty.
+ */
+public class GeneratedUpdateJavaTime {
+
+  public static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
+
+    @Override
+    public boolean includeInUpdate() {
+      return true;
+    }
+
+    @Override
+    public boolean includeInAllUpdates() {
+      return true;
+    }
+
+    @Override
+    public boolean includeInInsert() {
+      return true;
+    }
+
+    @Override
+    public boolean isDDLNotNullable() {
+      return true;
+    }
+  }
+
+  /**
+   * Instant support.
+   */
+  public static class InstantDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toInstant(now);
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toInstant(now);
+    }
+  }
+
+  /**
+   * LocalDateTime support.
+   */
+  public static class LocalDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toLocalDateTime(now);
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toLocalDateTime(now);
+    }
+  }
+
+  /**
+   * OffsetDateTime support.
+   */
+  public static class OffsetDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toOffsetDateTime(now);
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toOffsetDateTime(now);
+    }
+  }
+
+  /**
+   * ZonedDateTime support.
+   */
+  public static class ZonedDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toZonedDateTime(now);
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return JavaTimeUtils.toZonedDateTime(now);
+    }
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java

@@ -0,0 +1,68 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDateTime;
+
+/**
+ * Support java.time DateTime types as GeneratedProperty.
+ */
+public class GeneratedUpdateJodaTime {
+
+  public static abstract class Base implements GeneratedProperty, GeneratedWhenModified {
+
+    @Override
+    public boolean includeInUpdate() {
+      return true;
+    }
+
+    @Override
+    public boolean includeInAllUpdates() {
+      return true;
+    }
+
+    @Override
+    public boolean includeInInsert() {
+      return true;
+    }
+
+    @Override
+    public boolean isDDLNotNullable() {
+      return true;
+    }
+  }
+
+  /**
+   * LocalDateTime support.
+   */
+  public static class LocalDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return new LocalDateTime(now);
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return new LocalDateTime(now);
+    }
+  }
+
+  /**
+   * OffsetDateTime support.
+   */
+  public static class DateTimeDT extends Base {
+
+    @Override
+    public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+      return new DateTime(now);
+    }
+
+    @Override
+    public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+      return new DateTime(now);
+    }
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java

@@ -0,0 +1,48 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Generate a (Long) Timestamp whenever the bean is inserted or updated.
+ */
+public class GeneratedUpdateLong implements GeneratedProperty {
+
+  /**
+   * Return now as a Timestamp.
+   */
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return now;
+  }
+
+  /**
+   * Return now as a Timestamp.
+   */
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return now;
+  }
+
+  /**
+   * For dynamic table updates make sure this is included.
+   */
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return true;
+  }
+
+  /**
+   * Include this in every insert.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java

@@ -0,0 +1,50 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+import java.sql.Timestamp;
+
+/**
+ * Generate a Timestamp whenever the bean is inserted or updated.
+ */
+public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhenModified {
+
+  /**
+   * Return now as a Timestamp.
+   */
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return new Timestamp(now);
+  }
+
+  /**
+   * Return now as a Timestamp.
+   */
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return new Timestamp(now);
+  }
+
+  /**
+   * For dynamic table updates make sure this is included.
+   */
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return true;
+  }
+
+  /**
+   * Include this in every insert.
+   */
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java

@@ -0,0 +1,7 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+/**
+ * Marker interface for all implementations mapping to @WhenCreated or @CreatedTimestamp.
+ */
+public interface GeneratedWhenCreated {
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java

@@ -0,0 +1,7 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+/**
+ * Marker interface for all implementations mapping to @WhenModified or @UpdatedTimestamp.
+ */
+public interface GeneratedWhenModified {
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java

@@ -0,0 +1,47 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebean.config.CurrentUserProvider;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Used to populate @WhoCreated bean properties.
+ */
+public class GeneratedWhoCreated implements GeneratedProperty {
+
+  final CurrentUserProvider currentUserProvider;
+
+  public GeneratedWhoCreated(CurrentUserProvider currentUserProvider) {
+    this.currentUserProvider = currentUserProvider;
+  }
+
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return currentUserProvider.currentUser();
+  }
+
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return null;
+  }
+
+  @Override
+  public boolean includeInUpdate() {
+    return false;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return false;
+  }
+
+  @Override
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  @Override
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java

@@ -0,0 +1,47 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.bean.EntityBean;
+import io.ebean.config.CurrentUserProvider;
+import io.ebeaninternal.server.deploy.BeanProperty;
+
+/**
+ * Used to populate @WhoModified bean properties.
+ */
+public class GeneratedWhoModified implements GeneratedProperty {
+
+  final CurrentUserProvider currentUserProvider;
+
+  public GeneratedWhoModified(CurrentUserProvider currentUserProvider) {
+    this.currentUserProvider = currentUserProvider;
+  }
+
+  @Override
+  public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
+    return currentUserProvider.currentUser();
+  }
+
+  @Override
+  public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
+    return currentUserProvider.currentUser();
+  }
+
+  @Override
+  public boolean includeInUpdate() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInAllUpdates() {
+    return true;
+  }
+
+  @Override
+  public boolean includeInInsert() {
+    return true;
+  }
+
+  @Override
+  public boolean isDDLNotNullable() {
+    return true;
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java

@@ -0,0 +1,62 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.config.ClassLoadConfig;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+import javax.persistence.PersistenceException;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Helper for creating Insert timestamp GeneratedProperty objects.
+ */
+public class InsertTimestampFactory {
+
+  final GeneratedInsertLong longTime = new GeneratedInsertLong();
+
+  final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
+
+  public InsertTimestampFactory(ClassLoadConfig classLoadConfig) {
+    map.put(Timestamp.class, new GeneratedInsertTimestamp());
+    map.put(java.util.Date.class, new GeneratedInsertDate());
+    map.put(Long.class, longTime);
+    map.put(long.class, longTime);
+
+    if (classLoadConfig.isJavaTimePresent()) {
+      map.put(Instant.class, new GeneratedInsertJavaTime.InstantDT());
+      map.put(LocalDateTime.class, new GeneratedInsertJavaTime.LocalDT());
+      map.put(OffsetDateTime.class, new GeneratedInsertJavaTime.OffsetDT());
+      map.put(ZonedDateTime.class, new GeneratedInsertJavaTime.ZonedDT());
+    }
+    if (classLoadConfig.isJodaTimePresent()) {
+      map.put(org.joda.time.LocalDateTime.class, new GeneratedInsertJodaTime.LocalDT());
+      map.put(org.joda.time.DateTime.class, new GeneratedInsertJodaTime.DateTimeDT());
+    }
+
+  }
+
+  public void setInsertTimestamp(DeployBeanProperty property) {
+
+    property.setGeneratedProperty(createInsertTimestamp(property));
+  }
+
+  /**
+   * Create the insert GeneratedProperty depending on the property type.
+   */
+  public GeneratedProperty createInsertTimestamp(DeployBeanProperty property) {
+
+    Class<?> propType = property.getPropertyType();
+    GeneratedProperty generatedProperty = map.get(propType);
+    if (generatedProperty != null) {
+      return generatedProperty;
+    }
+
+    throw new PersistenceException("Generated Insert Timestamp not supported on " + propType.getName());
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java

@@ -0,0 +1,41 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+/**
+ * Helper methods for Java time conversion.
+ */
+public class JavaTimeUtils {
+
+  /**
+   * Return the system millis time as a LocalDateTime.
+   */
+  public static Object toInstant(long systemMillis) {
+    return Instant.ofEpochMilli(systemMillis);
+  }
+
+  /**
+   * Return the system millis time as a LocalDateTime.
+   */
+  public static Object toLocalDateTime(long systemMillis) {
+    return new Timestamp(systemMillis).toLocalDateTime();
+  }
+
+  /**
+   * Return the system millis time as a OffsetDateTime.
+   */
+  public static Object toOffsetDateTime(long systemMillis) {
+    return OffsetDateTime.ofInstant(Instant.ofEpochMilli(systemMillis), ZoneId.systemDefault());
+  }
+
+  /**
+   * Return the system millis time as a ZonedDateTime.
+   */
+  public static Object toZonedDateTime(long systemMillis) {
+    return ZonedDateTime.ofInstant(Instant.ofEpochMilli(systemMillis), ZoneId.systemDefault());
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java

@@ -0,0 +1,61 @@
+package io.ebeaninternal.server.deploy.generatedproperty;
+
+import io.ebean.config.ClassLoadConfig;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+
+import javax.persistence.PersistenceException;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Helper for creating Update timestamp GeneratedProperty objects.
+ */
+public class UpdateTimestampFactory {
+
+  final GeneratedUpdateLong longTime = new GeneratedUpdateLong();
+
+  final Map<Class<?>, GeneratedProperty> map = new HashMap<>();
+
+  public UpdateTimestampFactory(ClassLoadConfig classLoadConfig) {
+    map.put(Timestamp.class, new GeneratedUpdateTimestamp());
+    map.put(java.util.Date.class, new GeneratedUpdateDate());
+    map.put(Long.class, longTime);
+    map.put(long.class, longTime);
+
+    if (classLoadConfig.isJavaTimePresent()) {
+      map.put(Instant.class, new GeneratedUpdateJavaTime.InstantDT());
+      map.put(LocalDateTime.class, new GeneratedUpdateJavaTime.LocalDT());
+      map.put(OffsetDateTime.class, new GeneratedUpdateJavaTime.OffsetDT());
+      map.put(ZonedDateTime.class, new GeneratedUpdateJavaTime.ZonedDT());
+    }
+    if (classLoadConfig.isJodaTimePresent()) {
+      map.put(org.joda.time.LocalDateTime.class, new GeneratedUpdateJodaTime.LocalDT());
+      map.put(org.joda.time.DateTime.class, new GeneratedUpdateJodaTime.DateTimeDT());
+    }
+  }
+
+  public void setUpdateTimestamp(DeployBeanProperty property) {
+
+    property.setGeneratedProperty(createUpdateTimestamp(property));
+  }
+
+  /**
+   * Create the update GeneratedProperty depending on the property type.
+   */
+  protected GeneratedProperty createUpdateTimestamp(DeployBeanProperty property) {
+
+    Class<?> propType = property.getPropertyType();
+    GeneratedProperty generatedProperty = map.get(propType);
+    if (generatedProperty != null) {
+      return generatedProperty;
+    }
+
+    throw new PersistenceException("Generated update Timestamp not supported on " + propType.getName());
+  }
+
+}

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/package.html

@@ -0,0 +1,9 @@
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+  <TITLE>Counter, Insert Timestamp, Update Timestamp support</TITLE>
+</HEAD>
+<Body BGCOLOR="#ffffff">
+Counter, Insert Timestamp, Update Timestamp support
+</Body>
+</HTML>