#1952 - Entity bean with @Id and ONLY @WhenCreated treated as reference bean - not inserted

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -376,7 +376,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   private final BeanProperty[] propertiesGenInsert;
   private final BeanProperty[] propertiesGenUpdate;
   private final List<BeanProperty[]> propertiesUnique = new ArrayList<>();
-
+  private final boolean idOnlyReference;
   private BeanNaturalKey beanNaturalKey;
 
   /**
@@ -512,7 +512,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.propertiesOneImported = listHelper.getOneImported();
     this.propertiesOneImportedSave = listHelper.getOneImportedSave();
     this.propertiesOneImportedDelete = listHelper.getOneImportedDelete();
-
     this.propertiesMany = listHelper.getMany();
     this.propertiesNonMany = listHelper.getNonMany();
     this.propertiesAggregate = listHelper.getAggregates();
@@ -521,6 +520,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     this.propertiesManyToMany = listHelper.getManyToMany();
     this.propertiesGenInsert = listHelper.getGeneratedInsert();
     this.propertiesGenUpdate = listHelper.getGeneratedUpdate();
+    this.idOnlyReference = isIdOnlyReference(propertiesBaseScalar);
 
     boolean noRelationships = propertiesOne.length + propertiesMany.length == 0;
 
@@ -568,6 +568,19 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
+  /**
+   * Return true if the bean should be treated as a reference bean when it only has its id populated.
+   * To be true it has other scalar properties that are not generated on insert.
+   */
+  private boolean isIdOnlyReference(BeanProperty[] baseScalar) {
+    for (BeanProperty beanProperty : baseScalar) {
+      if (!beanProperty.isGeneratedOnInsert()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * Derive an array of property positions for properties that are initialised in the constructor.
    * These properties need to be unloaded when populating beans for queries.
@@ -1809,7 +1822,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * Find a property annotated with @WhenCreated or @CreatedTimestamp.
    */
   private BeanProperty findWhenCreatedProperty() {
-
     for (BeanProperty aPropertiesBaseScalar : propertiesBaseScalar) {
       if (aPropertiesBaseScalar.isGeneratedWhenCreated()) {
         return aPropertiesBaseScalar;
@@ -3301,11 +3313,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   }
 
   public boolean isReference(EntityBeanIntercept ebi) {
-    return ebi.isReference() || hasIdPropertyOnly(ebi);
+    return ebi.isReference() || referenceIdPropertyOnly(ebi);
   }
 
-  boolean hasIdPropertyOnly(EntityBeanIntercept ebi) {
-    return propertiesBaseScalar.length > 0 && ebi.hasIdOnly(idPropertyIndex);
+  boolean referenceIdPropertyOnly(EntityBeanIntercept ebi) {
+    return idOnlyReference && ebi.hasIdOnly(idPropertyIndex);
   }
 
   public boolean isIdLoaded(EntityBeanIntercept ebi) {

src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -1160,6 +1160,10 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return isVersion() || (generatedProperty != null && generatedProperty.isDDLNotNullable());
   }
 
+  boolean isGeneratedOnInsert() {
+    return generatedProperty != null && generatedProperty.includeInInsert();
+  }
+
   /**
    * Return true if this is a generated property mapping to @WhenCreated or @CreatedTimestamp.
    */

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

@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * Used to generate a (java.util.Date) timestamp when a bean is inserted.
  */
-public class GeneratedInsertDate implements GeneratedProperty {
+public class GeneratedInsertDate implements GeneratedProperty, GeneratedWhenCreated {
 
   /**
    * Return the current time as a Timestamp.