#2359 - Rename internal methods - STreeProperty

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java

@@ -98,7 +98,7 @@ public class MTable {
       withHistory = true;
       BeanProperty whenCreated = descriptor.whenCreatedProperty();
       if (whenCreated != null) {
-        whenCreatedColumn = whenCreated.getDbColumn();
+        whenCreatedColumn = whenCreated.dbColumn();
       }
     }
   }

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java

@@ -145,7 +145,7 @@ public class ModelBuildContext {
   public String getColumnDefn(BeanProperty p, boolean strict) {
     DbPlatformType dbType = getDbType(p);
     if (dbType == null) {
-      throw new IllegalStateException("Unknown DbType mapping for " + p.getFullBeanName());
+      throw new IllegalStateException("Unknown DbType mapping for " + p.fullName());
     }
     return p.renderDbType(dbType, strict);
   }
@@ -157,7 +157,7 @@ public class ModelBuildContext {
     }
     if (p.isLocalEncrypted()) {
       // scalar type potentially wrapping varbinary db type
-      ScalarType<Object> scalarType = p.getScalarType();
+      ScalarType<Object> scalarType = p.scalarType();
       int jdbcType = scalarType.getJdbcType();
       return dbTypeMap.get(jdbcType);
     }
@@ -165,7 +165,7 @@ public class ModelBuildContext {
     // can be the logical JSON types (JSON, JSONB, JSONClob, JSONBlob, JSONVarchar)
     int dbType = p.getDbType(platformTypes);
     if (dbType == 0) {
-      throw new RuntimeException("No scalarType defined for " + p.getFullBeanName());
+      throw new RuntimeException("No scalarType defined for " + p.fullName());
     }
     return dbTypeMap.get(dbType);
   }

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java

@@ -5,7 +5,6 @@ import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.PropertyForeignKey;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.TableJoinColumn;
 
@@ -34,7 +33,7 @@ class ModelBuildIntersectionTable {
     intersectionTable = createTable();
     MTable existingTable = ctx.addTable(intersectionTable);
     if (existingTable != null) {
-      throw new IllegalStateException("Property " + manyProp.getFullBeanName() + " has duplicate ManyToMany intersection table " + intersectionTable.getName()
+      throw new IllegalStateException("Property " + manyProp.fullName() + " has duplicate ManyToMany intersection table " + intersectionTable.getName()
         + ". Please use @JoinTable to define unique table to use");
     }
 

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java

@@ -189,7 +189,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
     TableJoinColumn[] columns = p.getTableJoin().columns();
     if (columns.length == 0) {
-      throw new RuntimeException("No join columns for " + p.getFullBeanName());
+      throw new RuntimeException("No join columns for " + p.fullName());
     }
 
     ImportedId importedId = p.getImportedId();
@@ -214,7 +214,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
         throw new RuntimeException("Imported BeanProperty not found?");
       }
       String columnDefn = ctx.getColumnDefn(importedProperty, true);
-      String refColumn = importedProperty.getDbColumn();
+      String refColumn = importedProperty.dbColumn();
 
       MColumn col = table.addColumn(dbCol, columnDefn, !p.isNullable());
       col.setDbMigrationInfos(p.getDbMigrationInfos());
@@ -268,7 +268,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
 
     // using non-strict mode to render the DB type such that we have a
     // "logical" type like jsonb(200) that can map to JSONB or VARCHAR(200)
-    MColumn col = new MColumn(p.getDbColumn(), ctx.getColumnDefn(p, false));
+    MColumn col = new MColumn(p.dbColumn(), ctx.getColumnDefn(p, false));
     col.setComment(p.getDbComment());
     col.setDraftOnly(p.isDraftOnly());
     col.setHistoryExclude(p.isExcludedFromHistory());
@@ -309,7 +309,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
         InheritInfo inheritInfo = beanDescriptor.getInheritInfo();
         inheritInfo.appendCheckConstraintValues(p.name(), checkConstraintValues);
       }
-      col.setCheckConstraint(buildCheckConstraint(p.getDbColumn(), checkConstraintValues));
+      col.setCheckConstraint(buildCheckConstraint(p.dbColumn(), checkConstraintValues));
       col.setCheckConstraintName(checkConstraintName(col.getName()));
     }