diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index c576c5628..d684d063a 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -48,7 +48,7 @@ public class ProfileOriginNodeUsage { logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name()); return; } else { - BeanProperty beanProperty = elGetValue.getBeanProperty(); + BeanProperty beanProperty = elGetValue.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { desc = ((BeanPropertyAssoc) beanProperty).getTargetDescriptor(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 08795611d..50fac9299 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -49,8 +49,8 @@ public final class ManyWhereJoins implements Serializable { */ public void add(ElPropertyDeploy elProp) { - String join = elProp.getElPrefix(); - BeanProperty p = elProp.getBeanProperty(); + String join = elProp.elPrefix(); + BeanProperty p = elProp.beanProperty(); if (p instanceof BeanPropertyAssocMany) { join = addManyToJoin(join, p.name()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 11c924c92..37e9e4bb3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -935,7 +935,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { * Return the Encrypt key given the BeanProperty. */ public EncryptKey getEncryptKey(BeanProperty p) { - return owner.getEncryptKey(baseTable, p.getDbColumn()); + return owner.getEncryptKey(baseTable, p.dbColumn()); } /** @@ -2805,14 +2805,14 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { if (elProp == null) { throw new PersistenceException("Invalid path " + propertyPath + " from " + fullName()); } - return elProp.getBeanProperty().isEmbedded(); + return elProp.beanProperty().isEmbedded(); } @Override public ExtraJoin extraJoin(String propertyPath) { ElPropertyValue elGetValue = getElGetValue(propertyPath); if (elGetValue != null) { - BeanProperty beanProperty = elGetValue.getBeanProperty(); + BeanProperty beanProperty = elGetValue.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc assocProp = (BeanPropertyAssoc) beanProperty; if (!assocProp.isEmbedded()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java index 54803369a..ccc22836f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElement.java @@ -52,7 +52,7 @@ abstract class BeanDescriptorElement extends BeanDescriptor { if (props.length != 1) { throw new IllegalStateException("Expecting 1 property for element scalar but got " + Arrays.toString(props)); } - return props[0].getScalarType(); + return props[0].scalarType(); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java index 93a2bcb91..d9f6b4b25 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java @@ -26,8 +26,8 @@ class BeanDescriptorElementScalarMap extends BeanDescriptorElement { if (props.length != 2) { throw new IllegalStateException("Expecting 2 properties for key and value but got " + Arrays.toString(props)); } - this.scalarTypeKey = props[0].getScalarType(); - this.scalarTypeVal = props[1].getScalarType(); + this.scalarTypeKey = props[0].scalarType(); + this.scalarTypeVal = props[1].scalarType(); this.stringKey = String.class.equals(scalarTypeKey.getType()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index 98280b268..d99d58444 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -49,7 +49,7 @@ final class BeanEmbeddedMetaFactory { } private static String dbColumn(String prefix, Column override, BeanProperty source) { - String dbCol = (override != null && !override.name().isEmpty()) ? override.name() : source.getDbColumn(); + String dbCol = (override != null && !override.name().isEmpty()) ? override.name() : source.dbColumn(); return prefix == null ? dbCol : prefix + dbCol; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java index 8d7a31456..bd479b08d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java @@ -42,7 +42,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public int getFetchPreference() { + public int fetchPreference() { // return some decently high value return 1000; } @@ -101,7 +101,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public String getDbColumn() { + public String dbColumn() { return dbColumn; } @@ -171,12 +171,12 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return placeHolder; } @Override - public String getElPrefix() { + public String elPrefix() { return prefix; } @@ -191,7 +191,7 @@ public final class BeanFkeyProperty implements ElPropertyValue { } @Override - public BeanProperty getBeanProperty() { + public BeanProperty beanProperty() { return null; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 3f6117d54..1a49e2a3e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -429,7 +429,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getEncryptKeyAsString() { + public String encryptKeyAsString() { return getEncryptKey().getStringValue(); } @@ -441,11 +441,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Return the SQL for the column including decryption function and column alias. */ private String getDecryptSqlWithColumnAlias(String tableAlias) { - return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn()) + ENC_PREFIX + tableAlias + "_" + this.getDbColumn(); + return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.dbColumn()) + ENC_PREFIX + tableAlias + "_" + this.dbColumn(); } @Override - public int getFetchPreference() { + public int fetchPreference() { // return some decently high value - override on ToMany property return 1000; } @@ -567,7 +567,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public BeanProperty getBeanProperty() { + public BeanProperty beanProperty() { return this; } @@ -904,12 +904,12 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return encrypted ? elPlaceHolderEncrypted : elPlaceHolder; } @Override - public String getElPrefix() { + public String elPrefix() { return elPrefix; } @@ -917,7 +917,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Return the full name of this property. */ @Override - public String getFullBeanName() { + public String fullName() { return descriptor.fullName() + "." + name; } @@ -934,7 +934,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ @Override @SuppressWarnings(value = "unchecked") - public ScalarType getScalarType() { + public ScalarType scalarType() { return scalarType; } @@ -1117,7 +1117,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * The database column name this is mapped to. */ @Override - public String getDbColumn() { + public String dbColumn() { return dbColumn; } @@ -1411,7 +1411,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { // change in behavior for #318 objValue = null; String msg = "Error trying to use Jackson ObjectMapper to read transient property " - + getFullBeanName() + " - consider marking this property with @JsonIgnore"; + + fullName() + " - consider marking this property with @JsonIgnore"; logger.error(msg, e); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 56cd61425..c88c66d15 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -129,7 +129,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } @Override - public int getFetchPreference() { + public int fetchPreference() { return fetchPreference; } @@ -425,7 +425,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree BeanProperty idProp = target.idProperty(); BeanProperty[] others = target.propertiesBaseScalar(); if (descriptor.isRawSqlBased()) { - String dbColumn = owner.getDbColumn(); + String dbColumn = owner.dbColumn(); return new ImportedIdSimple(owner, dbColumn, null, idProp, 0); } if (idProp == null) { @@ -466,16 +466,16 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree boolean insertable = col.isInsertable(); boolean updateable = col.isUpdateable(); for (int j = 0; j < props.length; j++) { - if (props[j].getDbColumn().equalsIgnoreCase(matchColumn)) { + if (props[j].dbColumn().equalsIgnoreCase(matchColumn)) { return new ImportedIdSimple(owner, localColumn, localSqlFormula, props[j], j, insertable, updateable); } } for (int j = 0; j < others.length; j++) { - if (others[j].getDbColumn().equalsIgnoreCase(matchColumn)) { + if (others[j].dbColumn().equalsIgnoreCase(matchColumn)) { return new ImportedIdSimple(owner, localColumn, localSqlFormula, others[j], j + props.length, insertable, updateable); } } - String msg = "Error with the Join on [" + getFullBeanName() + String msg = "Error with the Join on [" + fullName() + "]. Could not find the local match for [" + matchColumn + "] "//in table["+searchTable+"]?" + " Perhaps an error in a @JoinColumn"; throw new PersistenceException(msg); @@ -566,7 +566,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree } } - String msg = "Error with the Join on [" + getFullBeanName() + String msg = "Error with the Join on [" + fullName() + "]. Could not find the matching foreign key for [" + matchColumn + "] in table[" + searchTable + "]?" + " Perhaps using a @JoinColumn with the name/referencedColumnName attributes swapped? " + " or a @JoinColumn needs an explicit referencedColumnName specified?"; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index a1e28251b..2e8b08c02 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -680,9 +680,9 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST private ExportedProperty findMatch(boolean embedded, BeanProperty prop) { if (hasJoinTable()) { // look for column going to intersection - return findMatch(embedded, prop, prop.getDbColumn(), intersectionJoin); + return findMatch(embedded, prop, prop.dbColumn(), intersectionJoin); } else { - return findMatch(embedded, prop, prop.getDbColumn(), tableJoin); + return findMatch(embedded, prop, prop.dbColumn(), tableJoin); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java index b84889833..1aa792f30 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java @@ -58,7 +58,7 @@ class BeanPropertyAssocManyJsonHelp { */ private void jsonReadTransientUsingObjectMapper(SpiJsonReader readJson, EntityBean parentBean) throws IOException { if (jsonTransient == null) { - throw new IllegalStateException("Jackson ObjectMapper is required to read this Transient property " + many.getFullBeanName()); + throw new IllegalStateException("Jackson ObjectMapper is required to read this Transient property " + many.fullName()); } jsonTransient.jsonReadUsingObjectMapper(many, readJson, parentBean); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java index 8a5eade8b..11fc94c4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManySqlHelp.java @@ -73,7 +73,7 @@ class BeanPropertyAssocManySqlHelp { @Override public void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne embedded) { - sb.append(",").append(p.getDbColumn()); + sb.append(",").append(p.dbColumn()); colCount++; } @@ -84,7 +84,7 @@ class BeanPropertyAssocManySqlHelp { @Override public void visitScalar(BeanProperty p, boolean allowNonNull) { - sb.append(",").append(p.getDbColumn()); + sb.append(",").append(p.dbColumn()); colCount++; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 436cc8d8f..de55dbcad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -129,9 +129,9 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr // limit JoinColumn mapping to the @Id / primary key TableJoinColumn[] columns = tableJoin.columns(); String foreignJoinColumn = columns[0].getForeignDbColumn(); - String foreignIdColumn = targetDescriptor.idProperty().getDbColumn(); + String foreignIdColumn = targetDescriptor.idProperty().dbColumn(); if (!foreignJoinColumn.equalsIgnoreCase(foreignIdColumn)) { - throw new PersistenceException("Mapping limitation - @JoinColumn on " + getFullBeanName() + " needs to map to a primary key as per Issue #529 " + throw new PersistenceException("Mapping limitation - @JoinColumn on " + fullName() + " needs to map to a primary key as per Issue #529 " + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn); } } @@ -218,7 +218,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr if (embedded) { BeanProperty embProp = embeddedPropsMap.get(remainder); if (embProp == null) { - String msg = "Embedded Property " + remainder + " not found in " + getFullBeanName(); + String msg = "Embedded Property " + remainder + " not found in " + fullName(); throw new PersistenceException(msg); } if (chain == null) { @@ -232,7 +232,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return encrypted ? elPlaceHolderEncrypted : elPlaceHolder; } @@ -330,7 +330,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr selectChain.add(discProperty); } if (targetIdBinder == null) { - throw new IllegalStateException("No Id binding property for " + getFullBeanName() + throw new IllegalStateException("No Id binding property for " + fullName() + ". Probably a missing @OneToOne mapping annotation on this relationship?"); } targetIdBinder.buildRawSqlSelectChain(prefix, selectChain); @@ -591,7 +591,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr * Find the matching foreignDbColumn for a given local property. */ private ExportedProperty findMatch(boolean embeddedProp, BeanProperty prop) { - return findMatch(embeddedProp, prop, prop.getDbColumn(), tableJoin); + return findMatch(embeddedProp, prop, prop.dbColumn(), tableJoin); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index ecd0b7a37..4bc051ebb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java @@ -100,7 +100,7 @@ public final class BeanTable { } private void addToJoin(String foreignKeyPrefix, DeployTableJoin join, boolean reverse, String sqlFormulaSelect, boolean complexKey, BeanProperty prop) { - String lc = prop.getDbColumn(); + String lc = prop.dbColumn(); String fk = lc; if (foreignKeyPrefix != null) { fk = owner.getNamingConvention().getForeignKey(foreignKeyPrefix, fk); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java index 419d1052e..a6d3650d6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java @@ -63,8 +63,8 @@ public final class DeployPropertyParser extends DeployParser { if (catchFirst && firstProp == null) { firstProp = elProp; } - addIncludes(elProp.getElPrefix()); - return elProp.getElPlaceholder(encrypted); + addIncludes(elProp.elPrefix()); + return elProp.elPlaceholder(encrypted); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java index e350617d7..045417445 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java @@ -77,7 +77,7 @@ public final class DeployUpdateParser extends DeployParser { return beanDescriptor.baseTable(); } ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression); - return elProp != null ? elProp.getDbColumn() : null; + return elProp != null ? elProp.dbColumn() : null; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java index c14dd6f67..ceb22bf06 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java @@ -29,7 +29,7 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getFullBeanName() { + public String fullName() { return fullName; } @@ -49,12 +49,12 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getElPrefix() { + public String elPrefix() { return elPrefix; } @Override - public ScalarType getScalarType() { + public ScalarType scalarType() { return scalarType; } @@ -74,7 +74,7 @@ abstract class DynamicPropertyBase implements STreeProperty { } @Override - public String getEncryptKeyAsString() { + public String encryptKeyAsString() { return null; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java index bd294d145..aa1ec102a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java @@ -113,9 +113,9 @@ final class FormulaPropertyPath { throw new IllegalStateException("unable to determine scalarType of formula [" + formula + "] for type " + descriptor + " - maybe use a cast like ::String ?"); } // determine scalarType based on first property found by parser - final BeanProperty property = firstProp.getBeanProperty(); + final BeanProperty property = firstProp.beanProperty(); if (!property.isAssocId()) { - return create(property.getScalarType()); + return create(property.scalarType()); } else { return createManyToOne(property); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 97e1efe5e..b16d39184 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -57,7 +57,7 @@ public final class IdBinderEmbedded implements IdBinder { if (i > 0) { sb.append(" and "); } - sb.append(idDesc.getBaseTableAlias()).append(".").append(props[i].getDbColumn()).append("=?"); + sb.append(idDesc.getBaseTableAlias()).append(".").append(props[i].dbColumn()).append("=?"); } sb.append(")"); return sb.toString(); @@ -123,7 +123,7 @@ public final class IdBinderEmbedded implements IdBinder { @Override public BeanProperty findBeanProperty(String dbColumnName) { for (BeanProperty prop : props) { - if (dbColumnName.equalsIgnoreCase(prop.getDbColumn())) { + if (dbColumnName.equalsIgnoreCase(prop.dbColumn())) { return prop; } } @@ -173,7 +173,7 @@ public final class IdBinderEmbedded implements IdBinder { if (i > 0) { sb.append(" and "); } - sb.append(props[i].getDbColumn()).append("=?"); + sb.append(props[i].dbColumn()).append("=?"); } sb.append(")"); } @@ -392,7 +392,7 @@ public final class IdBinderEmbedded implements IdBinder { if (baseTableAlias != null) { sb.append(baseTableAlias).append("."); } - sb.append(props[i].getDbColumn()).append("=?"); + sb.append(props[i].dbColumn()).append("=?"); } return sb.toString(); } @@ -411,7 +411,7 @@ public final class IdBinderEmbedded implements IdBinder { if (baseTableAlias != null) { sb.append(baseTableAlias).append("."); } - sb.append(props[i].getDbColumn()); + sb.append(props[i].dbColumn()); } sb.append(")"); return sb.toString(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index 42055e8ef..b0fd2da18 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java @@ -34,9 +34,9 @@ public final class IdBinderSimple implements IdBinder { public IdBinderSimple(BeanProperty idProperty, MultiValueBind multiValueBind) { this.idProperty = idProperty; - this.scalarType = idProperty.getScalarType(); + this.scalarType = idProperty.scalarType(); this.expectedType = idProperty.type(); - bindIdSql = InternString.intern(idProperty.getDbColumn() + " = ? "); + bindIdSql = InternString.intern(idProperty.dbColumn() + " = ? "); this.multiValueBind = multiValueBind; } @@ -80,7 +80,7 @@ public final class IdBinderSimple implements IdBinder { @Override public BeanProperty findBeanProperty(String dbColumnName) { - if (dbColumnName.equalsIgnoreCase(idProperty.getDbColumn())) { + if (dbColumnName.equalsIgnoreCase(idProperty.dbColumn())) { return idProperty; } return null; @@ -99,9 +99,9 @@ public final class IdBinderSimple implements IdBinder { @Override public String getBindIdInSql(String baseTableAlias) { if (baseTableAlias == null) { - return idProperty.getDbColumn(); + return idProperty.dbColumn(); } else { - return baseTableAlias + "." + idProperty.getDbColumn(); + return baseTableAlias + "." + idProperty.dbColumn(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index 9beaeb8ad..8924da2a1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -225,7 +225,7 @@ public final class DeployBeanPropertyLists { if (versionProperty == null) { versionProperty = prop; } else { - logger.warn("Multiple @Version properties - property " + prop.getFullBeanName() + " not treated as a version property"); + logger.warn("Multiple @Version properties - property " + prop.fullName() + " not treated as a version property"); } } else if (prop.isDraftDirty()) { draftDirty = prop; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java index 7bd82c709..a3fa2797a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java @@ -3,8 +3,6 @@ package io.ebeaninternal.server.deploy.meta; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanTable; -import javax.persistence.JoinColumn; - /** * A join pair of local and foreign properties. */ @@ -87,7 +85,7 @@ public final class DeployTableJoinColumn { if (localDbColumn == null) { BeanProperty idProperty = beanTable.getIdProperty(); if (idProperty != null) { - localDbColumn = idProperty.getDbColumn(); + localDbColumn = idProperty.dbColumn(); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index c756912f8..8a4dfc599 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -199,7 +199,7 @@ final class AnnotationAssocManys extends AnnotationAssoc { if (localId != null) { // add foreign key based on convention String fkColName = namingConvention.getForeignKey(descriptor.getBaseTable(), localId.name()); - prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), fkColName)); + prop.getTableJoin().addJoinColumn(new DeployTableJoinColumn(localId.dbColumn(), fkColName)); } } @@ -386,8 +386,8 @@ final class AnnotationAssocManys extends AnnotationAssoc { BeanProperty localId = localTable.getIdProperty(); if (localId != null) { // add the source to intersection join columns - String fkCol = namingConvention.deriveM2MColumn(localTableName, localId.getDbColumn()); - intJoin.addJoinColumn(new DeployTableJoinColumn(localId.getDbColumn(), fkCol)); + String fkCol = namingConvention.deriveM2MColumn(localTableName, localId.dbColumn()); + intJoin.addJoinColumn(new DeployTableJoinColumn(localId.dbColumn(), fkCol)); } } @@ -396,8 +396,8 @@ final class AnnotationAssocManys extends AnnotationAssoc { BeanProperty otherId = otherTable.getIdProperty(); if (otherId != null) { // set the intersection to dest table join columns - String fkCol = namingConvention.deriveM2MColumn(otherTableName, otherId.getDbColumn()); - destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherId.getDbColumn())); + String fkCol = namingConvention.deriveM2MColumn(otherTableName, otherId.dbColumn()); + destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherId.dbColumn())); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index 5fc82e99a..d10acaedc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -59,9 +59,9 @@ public final class ElPropertyChain implements ElPropertyValue { this.assocId = chain[chain.length - 1].isAssocId(); this.last = chain.length - 1; - this.lastBeanProperty = chain[chain.length - 1].getBeanProperty(); + this.lastBeanProperty = chain[chain.length - 1].beanProperty(); if (lastBeanProperty != null) { - this.scalarType = lastBeanProperty.getScalarType(); + this.scalarType = lastBeanProperty.scalarType(); } else { // case for nested compound type (non-scalar) this.scalarType = null; @@ -77,8 +77,8 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public int getFetchPreference() { - return chain[0].getFetchPreference(); + public int fetchPreference() { + return chain[0].fetchPreference(); } @Override @@ -88,9 +88,9 @@ public final class ElPropertyChain implements ElPropertyValue { private String getElPlaceHolder(String prefix, ElPropertyValue lastElPropertyValue, boolean encrypted) { if (prefix == null) { - return lastElPropertyValue.getElPlaceholder(encrypted); + return lastElPropertyValue.elPlaceholder(encrypted); } - String el = lastElPropertyValue.getElPlaceholder(encrypted); + String el = lastElPropertyValue.elPlaceholder(encrypted); if (!el.contains("${}")) { // typically a secondary table property return el.replace("${", "${" + prefix + "."); @@ -113,7 +113,7 @@ public final class ElPropertyChain implements ElPropertyValue { } int i = 1 + SplitName.count(sinceProperty); for (; i < chain.length; i++) { - if (chain[i].getBeanProperty().containsMany()) { + if (chain[i].beanProperty().containsMany()) { return true; } } @@ -131,7 +131,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getElPrefix() { + public String elPrefix() { return prefix; } @@ -146,7 +146,7 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getElPlaceholder(boolean encrypted) { + public String elPlaceholder(boolean encrypted) { return encrypted ? placeHolderEncrypted : placeHolder; } @@ -218,12 +218,12 @@ public final class ElPropertyChain implements ElPropertyValue { } @Override - public String getDbColumn() { - return lastElPropertyValue.getDbColumn(); + public String dbColumn() { + return lastElPropertyValue.dbColumn(); } @Override - public BeanProperty getBeanProperty() { + public BeanProperty beanProperty() { return lastBeanProperty; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java index ad43abce3..e5e491b98 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java @@ -40,7 +40,7 @@ public interface ElPropertyDeploy { * this property. *

*/ - String getElPrefix(); + String elPrefix(); /** * Return the place holder in the form of ${elPrefix}dbColumn. @@ -48,7 +48,7 @@ public interface ElPropertyDeploy { * The ${elPrefix} is replaced by the appropriate table alias. *

*/ - String getElPlaceholder(boolean encrypted); + String elPlaceholder(boolean encrypted); /** * Return the name of the property. @@ -63,12 +63,12 @@ public interface ElPropertyDeploy { /** * Return the deployment db column for this property. */ - String getDbColumn(); + String dbColumn(); /** * Return the underlying bean property. */ - BeanProperty getBeanProperty(); + BeanProperty beanProperty(); /** * Return true if this is an aggregation property. @@ -79,5 +79,5 @@ public interface ElPropertyDeploy { * Return the fetch preference. This can be used to control which ToMany relationship * is left as a 'join' and which get converted to query join. */ - int getFetchPreference(); + int fetchPreference(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java index a8075090a..418ead12e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java @@ -37,7 +37,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } @@ -49,7 +49,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.getBeanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().getDecryptProperty(propName); } if (not) { request.append("lower(").append(pname).append(") != ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java index bf3871c23..5d9a74759 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java @@ -29,7 +29,7 @@ final class LikeExpression extends AbstractValueExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } String bindValue = getValue(strValue(), caseInsensitive, type, request); @@ -41,7 +41,7 @@ final class LikeExpression extends AbstractValueExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.getBeanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().getDecryptProperty(propName); } if (caseInsensitive) { request.append("lower(").append(pname).append(")"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java index 110442365..552f8d71f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java @@ -28,7 +28,7 @@ final class NativeILikeExpression extends AbstractExpression { ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } request.addBindValue(val); @@ -40,7 +40,7 @@ final class NativeILikeExpression extends AbstractExpression { String pname = propName; ElPropertyValue prop = getElProp(request); if (prop != null && prop.isDbEncrypted()) { - pname = prop.getBeanProperty().getDecryptProperty(propName); + pname = prop.beanProperty().getDecryptProperty(propName); } request.append(pname).append(" ilike ?"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index d6122e67f..b24f9b485 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -83,7 +83,7 @@ public final class SimpleExpression extends AbstractValueExpression { } if (prop.isDbEncrypted()) { // bind the key as well as the value - String encryptKey = prop.getBeanProperty().getEncryptKey().getStringValue(); + String encryptKey = prop.beanProperty().getEncryptKey().getStringValue(); request.addBindEncryptKey(encryptKey); } else if (prop.isLocalEncrypted()) { Object bindVal = prop.localEncrypt(value()); @@ -105,7 +105,7 @@ public final class SimpleExpression extends AbstractValueExpression { return; } if (prop.isDbEncrypted()) { - String dsql = prop.getBeanProperty().getDecryptProperty(propName); + String dsql = prop.beanProperty().getDecryptProperty(propName); request.append(dsql).append(type.bind()); return; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index c284cb39f..7d7fcfebb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -162,7 +162,7 @@ public final class DLoadContext implements LoadContext { */ private void registerSecondaryQuery(OrmQueryProperties props) { ElPropertyValue elGetValue = rootDescriptor.getElGetValue(props.getPath()); - boolean many = elGetValue.getBeanProperty().containsMany(); + boolean many = elGetValue.beanProperty().containsMany(); registerSecondaryNode(many, props); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index ba496c915..c20e68496 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -783,7 +783,7 @@ public final class DefaultPersister implements Persister { for (BeanPropertyAssocMany many : manys) { SqlUpdate sqlDelete = many.deleteByParentId(id, idList); if (t.isLogSummary()) { - t.logSummary("-- Deleting intersection table entries: " + many.getFullBeanName()); + t.logSummary("-- Deleting intersection table entries: " + many.fullName()); } executeSqlUpdate(sqlDelete, t); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index d150188de..dd4f6c670 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -277,7 +277,7 @@ public final class SaveManyBeans extends SaveManyBase { } else if (value instanceof Collection) { additions = (Collection) value; } else { - throw new PersistenceException("Unhandled ManyToMany type " + value.getClass().getName() + " for " + many.getFullBeanName()); + throw new PersistenceException("Unhandled ManyToMany type " + value.getClass().getName() + " for " + many.fullName()); } if (!vanillaCollection) { BeanCollection manyValue = (BeanCollection) value; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index be2bf26c2..4ebba440e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -44,7 +44,7 @@ final class BindableEncryptedProperty implements Bindable { public void dmlAppend(GenerateDmlRequest request) { // columnName = AES_ENCRYPT(?,?) - request.appendColumn(prop.getDbColumn(), prop.getDbBind()); + request.appendColumn(prop.dbColumn(), prop.getDbBind()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index a62135f46..7cb2b104d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -76,7 +76,7 @@ final class BindableIdEmbedded implements BindableId { @Override public void dmlAppend(GenerateDmlRequest request) { for (BeanProperty prop : props) { - request.appendColumn(prop.getDbColumn()); + request.appendColumn(prop.dbColumn()); } } @@ -84,7 +84,7 @@ final class BindableIdEmbedded implements BindableId { public boolean deriveConcatenatedId(PersistRequestBean persist) { if (matches == null) { - String m = "No matches for " + embId.getFullBeanName() + " the concatenated key columns where not found?" + String m = "No matches for " + embId.fullName() + " the concatenated key columns where not found?" + " I expect that the concatenated key was null, and this bean does" + " not have ManyToOne assoc beans matching the primary key columns?"; throw new PersistenceException(m); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 518a236b7..7b50e1e4e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -32,7 +32,7 @@ final class BindableIdScalar implements BindableId { @Override public String getIdentityColumn() { - return uidProp.getDbColumn(); + return uidProp.dbColumn(); } @Override @@ -64,7 +64,7 @@ final class BindableIdScalar implements BindableId { @Override public void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(uidProp.getDbColumn()); + request.appendColumn(uidProp.dbColumn()); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java index 8f50fe7b3..d4129922a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java @@ -38,7 +38,7 @@ class BindableProperty implements Bindable { @Override public final void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(prop.getDbColumn()); + request.appendColumn(prop.dbColumn()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java index db28c3035..56eddd8e1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyVersion.java @@ -38,7 +38,7 @@ final class BindablePropertyVersion implements Bindable { @Override public void dmlAppend(GenerateDmlRequest request) { - request.appendColumn(prop.getDbColumn()); + request.appendColumn(prop.dbColumn()); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java index e4fa26284..60079c015 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java @@ -24,7 +24,7 @@ final class MatchedImportedFactory { private static MatchedImportedProperty findMatch(BeanProperty prop, BeanDescriptor desc) { // find matching against the local database column - String dbColumn = prop.getDbColumn(); + String dbColumn = prop.dbColumn(); for (BeanPropertyAssocOne assocOne1 : desc.propertiesOne()) { if (assocOne1.isImportedPrimaryKey()) { // search using the ImportedId from the assoc one @@ -35,7 +35,7 @@ final class MatchedImportedFactory { } } for (BeanProperty beanProperty : desc.propertiesBaseScalar()) { - if (dbColumn.equals(beanProperty.getDbColumn())) { + if (dbColumn.equals(beanProperty.dbColumn())) { return new MatchedImportedScalar(prop, beanProperty); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index cbe600a51..e7de1fbd4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -488,7 +488,7 @@ final class CQueryBuilder { } private void addRawColumnMapping(PathProperties pathProps, Column column, String propertyName, ElPropertyValue el) { - BeanProperty beanProperty = el.getBeanProperty(); + BeanProperty beanProperty = el.beanProperty(); if (beanProperty.isId()) { if (propertyName.contains(".")) { // For @Id properties we chop off the last part of the path @@ -583,7 +583,7 @@ final class CQueryBuilder { sb.append("r1.attribute_, count(*) from (select "); if (distinct) { sb.append("distinct t0."); - sb.append(request.descriptor().idProperty().getDbColumn()).append(", "); + sb.append(request.descriptor().idProperty().dbColumn()).append(", "); } sb.append(select.getSelectSql()).append(" as attribute_"); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java index c26364364..4323a5a01 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java @@ -59,7 +59,7 @@ final class CQueryOrderBy { return p.toStringFormat(); } - BeanProperty beanProperty = el.getBeanProperty(); + BeanProperty beanProperty = el.beanProperty(); if (beanProperty instanceof BeanPropertyAssoc) { BeanPropertyAssoc ap = (BeanPropertyAssoc) beanProperty; IdBinder idBinder = ap.getTargetDescriptor().getIdBinder(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 698963c75..f7f63ef5b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -221,7 +221,7 @@ public class CQueryPlan implements SpiQueryPlan { DataBind dataBind = new DataBind(dataTimeZone, stmt, conn); if (encryptedProps != null) { for (STreeProperty encryptedProp : encryptedProps) { - dataBind.setString(encryptedProp.getEncryptKeyAsString()); + dataBind.setString(encryptedProp.encryptKeyAsString()); } } return dataBind; @@ -231,7 +231,7 @@ public class CQueryPlan implements SpiQueryPlan { DataBindCapture dataBind = DataBindCapture.of(dataTimeZone); if (encryptedProps != null) { for (STreeProperty encryptedProp : encryptedProps) { - dataBind.setString(encryptedProp.getEncryptKeyAsString()); + dataBind.setString(encryptedProp.encryptKeyAsString()); } } return dataBind; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java index b1b15f019..954ef6e1c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeProperty.java @@ -22,7 +22,7 @@ public interface STreeProperty extends ScalarDataReader { /** * Return the full property name (for error messages). */ - String getFullBeanName(); + String fullName(); /** * Return true if the property is the Id. @@ -54,17 +54,17 @@ public interface STreeProperty extends ScalarDataReader { /** * Return the encryption key as a string value (when the property is encrypted). */ - String getEncryptKeyAsString(); + String encryptKeyAsString(); /** * Return the Expression language prefix (join path). */ - String getElPrefix(); + String elPrefix(); /** * Return the underlying scalar type for the property (for findSingleAttribute). */ - ScalarType getScalarType(); + ScalarType scalarType(); /** * For RawSql build the select chain. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java index cdeb345c0..5ea33f112 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java @@ -63,7 +63,7 @@ public final class SqlBeanLoad { return prop.readSet(ctx, bean); } catch (Exception e) { bean._ebean_getIntercept().setLoadError(prop.getPropertyIndex(), e); - ctx.handleLoadError(prop.getFullBeanName(), e); + ctx.handleLoadError(prop.fullName(), e); return prop.getValue(bean); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index f0b43ef16..551e224fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -417,7 +417,7 @@ public final class SqlTreeBuilder { // add the embedded bean or the *ToOne assoc bean. We skip the check that the *ToOne propName maps to Id property ... selectProps.add(p); } else { - logger.error("property [" + p.getFullBeanName() + "] expected to be an embedded or *ToOne bean for query - excluding it."); + logger.error("property [" + p.fullName() + "] expected to be an embedded or *ToOne bean for query - excluding it."); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java index 31af8813a..623b1dd36 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java @@ -39,7 +39,7 @@ public final class SqlTreeProperties { if (prop.isAggregation()) { if (!aggregation) { aggregation = true; - aggregationPath = prop.getElPrefix(); + aggregationPath = prop.elPrefix(); } if (prop.isAggregationManyToOne()) { aggregationManyToOne = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java index c9ed9ca11..8d452adb4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java @@ -28,7 +28,7 @@ public final class DefaultUpdateQuery implements UpdateQuery { values.setNull(property); } else { final BeanProperty beanProperty = descriptor.getBeanProperty(property); - final ScalarType scalarType = (beanProperty == null) ? null: beanProperty.getScalarType(); + final ScalarType scalarType = (beanProperty == null) ? null: beanProperty.scalarType(); values.set(property, value, scalarType); } return this; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index a8a453bee..85a709118 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -312,7 +312,7 @@ public final class OrmQueryDetail implements Serializable { throw new PersistenceException("Path [" + parentPath + "] not valid from " + d.fullName()); } // add a missing parent path just fetching the Id property - BeanPropertyAssoc assocOne = (BeanPropertyAssoc) el.getBeanProperty(); + BeanPropertyAssoc assocOne = (BeanPropertyAssoc) el.beanProperty(); if (addId) { parentProp = new OrmQueryProperties(parentPath, assocOne.getTargetIdProperty()); } else { @@ -549,8 +549,8 @@ public final class OrmQueryDetail implements Serializable { */ @Override public int compareTo(FetchEntry other) { - int fp = elProp.getFetchPreference(); - int op = other.elProp.getFetchPreference(); + int fp = elProp.fetchPreference(); + int op = other.elProp.fetchPreference(); if (fp == op) { return Integer.compare(index, other.index); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index 0b9bc22d9..bc40fbc54 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -247,7 +247,7 @@ public class TCsvReader implements CsvReader { addDateTime(aLine, null, null); } else if (elProp.isAssocProperty()) { - BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) elProp.getBeanProperty(); + BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne) elProp.beanProperty(); String idProp = assocOne.getBeanDescriptor().getIdBinder().getIdProperty(); addProperty(aLine + "." + idProp); } else { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 0b095dc54..5a09b7286 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -22,10 +22,10 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { BeanDescriptor desc = server.getBeanDescriptor(Customer.class); BeanProperty whenCreatedProperty = desc.whenCreatedProperty(); - assertEquals("cretime", whenCreatedProperty.getDbColumn()); + assertEquals("cretime", whenCreatedProperty.dbColumn()); BeanProperty whenModifiedProperty = desc.whenModifiedProperty(); - assertEquals("updtime", whenModifiedProperty.getDbColumn()); + assertEquals("updtime", whenModifiedProperty.dbColumn()); BeanDescriptor eBasicDesc = server.getBeanDescriptor(EBasic.class); diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index 56ffb4c38..70ce4a9b1 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -21,7 +21,7 @@ public class TestJodaType extends BaseTestCase { SpiEbeanServer server = (SpiEbeanServer) DB.getDefault(); BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); - ScalarType scalarType = beanProperty.getScalarType(); + ScalarType scalarType = beanProperty.scalarType(); assertNotNull(scalarType); } diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index 50c0a7284..159c7453b 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -31,17 +31,17 @@ public class TestELBasic extends BaseTestCase { ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); assertTrue(elBillAddressId instanceof BeanFkeyProperty); - assertEquals("billing_address_id", elBillAddressId.getDbColumn()); + assertEquals("billing_address_id", elBillAddressId.dbColumn()); assertEquals("billingAddress.id", elBillAddressId.name()); - assertNull(elBillAddressId.getElPrefix()); + assertNull(elBillAddressId.elPrefix()); ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); assertTrue(elBillAddressCity instanceof ElPropertyChain); - assertEquals("billingAddress", elBillAddressCity.getElPrefix()); + assertEquals("billingAddress", elBillAddressCity.elPrefix()); assertEquals("city", elBillAddressCity.name()); - assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); - assertEquals("city", elBillAddressCity.getDbColumn()); + assertEquals("${billingAddress}city", elBillAddressCity.elPlaceholder(false)); + assertEquals("city", elBillAddressCity.dbColumn()); // ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country"); @@ -51,10 +51,10 @@ public class TestELBasic extends BaseTestCase { ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); assertTrue(elOrderStatus instanceof ElPropertyChain); - assertEquals("orders", elOrderStatus.getElPrefix()); + assertEquals("orders", elOrderStatus.elPrefix()); assertEquals("status", elOrderStatus.name()); - assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); - assertEquals("status", elOrderStatus.getDbColumn()); + assertEquals("${orders}status", elOrderStatus.elPlaceholder(false)); + assertEquals("status", elOrderStatus.dbColumn()); ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); assertTrue(elOrderCust instanceof ElPropertyChain); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 6dcf22b5a..6cfe3dd5f 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/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(); } } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java index 2dc0b245d..6fe58fe6c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java +++ b/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 scalarType = p.getScalarType(); + ScalarType 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); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java index e117c3ead..e6c0d897d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java +++ b/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"); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java index 4505808ee..e184ea065 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/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())); }