#2278 - Embedded bean override with DbJson property

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java

@@ -42,11 +42,7 @@ class BeanEmbeddedMetaFactory {
       int dbScale = dbScale(column, sourceProperties[i]);
       String colDefn = getDbColumnDefn(column, sourceProperties[i]);
       BeanPropertyOverride overrides = new BeanPropertyOverride(dbColumn, dbNullable, dbLength, dbScale, colDefn);
-      if (sourceProperties[i] instanceof BeanPropertyAssocOne) {
-        embeddedProperties[i] = new BeanPropertyAssocOne((BeanPropertyAssocOne)sourceProperties[i], overrides);
-      } else {
-        embeddedProperties[i] = new BeanProperty(sourceProperties[i], overrides);
-      }
+      embeddedProperties[i] = sourceProperties[i].override(overrides);
     }
 
     return new BeanEmbeddedMeta(embeddedProperties);

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -365,13 +365,14 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return InternString.intern(s);
   }
 
+  public BeanProperty override(BeanPropertyOverride override) {
+    return new BeanProperty(this, override);
+  }
+
   /**
-   * Create a Matching BeanProperty with some attributes overridden.
-   * <p>
-   * Primarily for supporting Embedded beans with overridden dbColumn
-   * mappings.
+   * Create a Matching BeanProperty with some attributes overridden for Embedded beans.
    */
-  public BeanProperty(BeanProperty source, BeanPropertyOverride override) {
+  protected BeanProperty(BeanProperty source, BeanPropertyOverride override) {
     this.descriptor = source.descriptor;
     this.propertyIndex = source.propertyIndex;
     this.name = source.getName();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -94,10 +94,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
-  /**
-   * Copy constructor for ManyToOne inside Embeddable.
-   */
-  public BeanPropertyAssocOne(BeanPropertyAssocOne source, BeanPropertyOverride override) {
+  @Override
+  public BeanPropertyAssocOne<?> override(BeanPropertyOverride override) {
+    return new BeanPropertyAssocOne<>(this, override);
+  }
+
+  protected BeanPropertyAssocOne(BeanPropertyAssocOne<T> source, BeanPropertyOverride override) {
     super(source, override);
     primaryKeyExport = source.primaryKeyExport;
     primaryKeyJoin = source.primaryKeyJoin;
@@ -255,12 +257,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
   }
 
   private SqlUpdate deleteByParentIdList(List<Object> parentIds) {
-
-    StringBuilder sb = new StringBuilder(100);
-    sb.append(deleteByParentIdInSql);
-    sb.append(targetIdBinder.getIdInValueExpr(false, parentIds.size()));
-
-    DefaultSqlUpdate delete = new DefaultSqlUpdate(sb.toString());
+    String sql = deleteByParentIdInSql + targetIdBinder.getIdInValueExpr(false, parentIds.size());
+    DefaultSqlUpdate delete = new DefaultSqlUpdate(sql);
     bindParentIds(delete, parentIds);
     return delete;
   }
@@ -501,7 +499,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return targetDescriptor.getIdProperty();
   }
 
-  ScalarType getIdScalarType() {
+  ScalarType<?> getIdScalarType() {
     return targetDescriptor.getIdProperty().scalarType;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java

@@ -27,6 +27,16 @@ public class BeanPropertyJsonMapper extends BeanProperty {
     this.sourceDetection = deployProp.getMutationDetection() == MutationDetection.SOURCE;
   }
 
+  private BeanPropertyJsonMapper(BeanPropertyJsonMapper source, BeanPropertyOverride override) {
+    super(source, override);
+    this.sourceDetection = source.sourceDetection;
+  }
+
+  @Override
+  public BeanProperty override(BeanPropertyOverride override) {
+    return new BeanPropertyJsonMapper(this, override);
+  }
+
   @Override
   public MutableValueInfo createMutableInfo(String json) {
     if (sourceDetection) {