From 26f0605d72859f0aeb3d20946074bebbe53de7dc Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 25 Aug 2022 12:25:38 +1200 Subject: [PATCH] Refactor ScalarType methods from getters to accessors --- .../java/io/ebean/core/type/ScalarType.java | 16 +++++------ .../BeanDescriptorElementEmbeddedMap.java | 2 +- .../BeanDescriptorElementScalarMap.java | 2 +- .../server/deploy/BeanProperty.java | 8 +++--- .../deploy/meta/DeployBeanProperty.java | 6 ++-- .../server/deploy/parse/AnnotationFields.java | 4 +-- .../server/deploy/parse/DeployUtil.java | 10 +++---- .../server/el/ElPropertyChain.java | 2 +- .../ebeaninternal/server/persist/Binder.java | 8 +++--- .../platform/AbstractMultiValueBind.java | 2 +- .../persist/platform/MultiValueBind.java | 2 +- .../platform/PostgresMultiValueBind.java | 2 +- .../server/type/DefaultTypeManager.java | 10 +++---- .../type/PlatformArrayTypeJsonList.java | 2 +- .../server/type/PlatformArrayTypeJsonSet.java | 2 +- .../server/type/ScalarTypeArrayBase.java | 4 +-- .../server/type/ScalarTypeArrayList.java | 4 +-- .../server/type/ScalarTypeArraySet.java | 4 +-- .../server/type/ScalarTypeBase.java | 6 ++-- .../server/type/ScalarTypeBaseDate.java | 2 +- .../server/type/ScalarTypeBaseDateTime.java | 2 +- .../server/type/ScalarTypeBaseVarchar.java | 2 +- .../server/type/ScalarTypeBigDecimal.java | 2 +- .../server/type/ScalarTypeBoolean.java | 6 ++-- .../server/type/ScalarTypeByte.java | 4 +-- .../server/type/ScalarTypeBytesBase.java | 4 +-- .../server/type/ScalarTypeBytesEncrypted.java | 20 ++++++------- .../server/type/ScalarTypeClass.java | 2 +- .../server/type/ScalarTypeCurrency.java | 2 +- .../server/type/ScalarTypeDouble.java | 2 +- .../server/type/ScalarTypeDuration.java | 2 +- .../type/ScalarTypeEncryptedWrapper.java | 26 ++++++++--------- .../server/type/ScalarTypeEnumStandard.java | 4 +-- .../type/ScalarTypeEnumWithMapping.java | 2 +- .../server/type/ScalarTypeFile.java | 4 +-- .../server/type/ScalarTypeFloat.java | 2 +- .../server/type/ScalarTypeInetAddress.java | 2 +- .../server/type/ScalarTypeInteger.java | 2 +- .../server/type/ScalarTypeJodaLocalTime.java | 2 +- .../server/type/ScalarTypeJodaPeriod.java | 2 +- .../server/type/ScalarTypeJsonCollection.java | 4 +-- .../server/type/ScalarTypeJsonList.java | 2 +- .../server/type/ScalarTypeJsonMap.java | 6 ++-- .../server/type/ScalarTypeJsonNode.java | 4 +-- .../type/ScalarTypeJsonObjectMapper.java | 6 ++-- .../server/type/ScalarTypeJsonSet.java | 2 +- .../server/type/ScalarTypeLocalTime.java | 2 +- .../server/type/ScalarTypeLocale.java | 2 +- .../server/type/ScalarTypeLong.java | 2 +- .../server/type/ScalarTypeMathBigInteger.java | 2 +- .../server/type/ScalarTypeMonthDay.java | 2 +- .../server/type/ScalarTypeNotFound.java | 8 +++--- .../server/type/ScalarTypeOffsetTime.java | 2 +- .../server/type/ScalarTypePeriod.java | 2 +- .../server/type/ScalarTypePostgresHstore.java | 4 +-- .../server/type/ScalarTypeShort.java | 2 +- .../server/type/ScalarTypeStringBase.java | 2 +- .../server/type/ScalarTypeTime.java | 2 +- .../server/type/ScalarTypeTimeZone.java | 2 +- .../server/type/ScalarTypeUUIDBase.java | 2 +- .../server/type/ScalarTypeUUIDBinary.java | 2 +- .../server/type/ScalarTypeUUIDVarchar.java | 2 +- .../server/type/ScalarTypeWrapper.java | 28 +++++++++---------- .../server/type/ScalarTypeYear.java | 2 +- .../server/type/ScalarTypeZoneId.java | 2 +- .../server/type/ScalarTypeZoneOffset.java | 2 +- .../server/type/DefaultTypeFactoryTest.java | 6 ++-- .../server/type/ScalarTypeJodaPeriodTest.java | 2 +- .../server/type/ScalarTypeOffsetTimeTest.java | 2 +- .../server/type/ScalarTypePeriodTest.java | 2 +- .../type/ScalarTypePostgresHstoreTest.java | 2 +- .../server/type/ScalarTypeTimeZoneTest.java | 2 +- .../server/type/ScalarTypeZoneIdTest.java | 2 +- .../server/type/ScalarTypeZoneOffsetTest.java | 2 +- .../server/type/TestTypeManager.java | 6 ++-- .../model/build/ModelBuildContext.java | 2 +- .../io/ebean/postgis/ScalarTypePgisBase.java | 8 +++--- .../postgis/latte/ScalarTypeGeoLatteBase.java | 8 +++--- 78 files changed, 167 insertions(+), 167 deletions(-) diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java index 6de4b8cd3..9523fd9d5 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java @@ -34,7 +34,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData /** * Return true for types that do mutation detection based on json content. */ - default boolean isJsonMapper() { + default boolean jsonMapper() { return false; } @@ -42,14 +42,14 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * Return true if this is a binary type and can not support parse() and format() from/to string. * This allows Ebean to optimise marshalling types to string. */ - default boolean isBinaryType() { + default boolean binary() { return false; } /** * Return true if this is a mutable scalar type (like hstore). */ - default boolean isMutable() { + default boolean mutable() { return false; } @@ -67,7 +67,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * If a BeanProperty has no explicit length defined then this length should * be assigned. */ - default int getLength() { + default int length() { return 0; } @@ -77,7 +77,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * If it is native to JDBC then its values/instances do not need to be * converted to and from an associated JDBC type. */ - boolean isJdbcNative(); + boolean jdbcNative(); /** * Return the type as per java.sql.Types that this maps to. @@ -85,14 +85,14 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * This type should be consistent with the toJdbcType() method in converting * the type to the appropriate type for binding to preparedStatements. */ - int getJdbcType(); + int jdbcType(); /** * Return the type that matches the bean property type. *

* This represents the 'logical' type rather than the JDBC type this maps to. */ - Class getType(); + Class type(); /** * Read the value from the resultSet and convert if necessary to the logical @@ -161,7 +161,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData /** * Return the type this maps to for JSON document stores. */ - DocPropertyType getDocType(); + DocPropertyType docType(); /** * Convert the value into a long version value. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java index 664e40da9..e6518ad50 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java @@ -23,7 +23,7 @@ class BeanDescriptorElementEmbeddedMap extends BeanDescriptorElementEmbedded< BeanDescriptorElementEmbeddedMap(BeanDescriptorMap owner, DeployBeanDescriptor deploy, ElementHelp elementHelp) { super(owner, deploy, elementHelp); this.scalarTypeKey = firstBaseScalarType(); - this.stringKey = String.class.equals(scalarTypeKey.getType()); + this.stringKey = String.class.equals(scalarTypeKey.type()); } @Override 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 d9f6b4b25..a3da1779e 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 @@ -28,7 +28,7 @@ class BeanDescriptorElementScalarMap extends BeanDescriptorElement { } this.scalarTypeKey = props[0].scalarType(); this.scalarTypeVal = props[1].scalarType(); - this.stringKey = String.class.equals(scalarTypeKey.getType()); + this.stringKey = String.class.equals(scalarTypeKey.type()); } @Override 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 f04adf431..9468379a2 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 @@ -416,7 +416,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { * Return true if the underlying type is mutable. */ public boolean isMutableScalarType() { - return scalarType != null && scalarType.isMutable(); + return scalarType != null && scalarType.mutable(); } /** @@ -703,7 +703,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { } private Object cacheDataConvert(Object value) { - if (value == null || scalarType.isBinaryType()) { + if (value == null || scalarType.binary()) { return value; } else { // convert to string as an optimisation for java object serialisation @@ -942,7 +942,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { @Override public int jdbcType() { - return scalarType == null ? 0 : scalarType.getJdbcType(); + return scalarType == null ? 0 : scalarType.jdbcType(); } @Override @@ -1467,7 +1467,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { */ public void docStoreMapping(DocMappingBuilder mapping, String prefix) { if (mapping.includesProperty(prefix, name)) { - DocPropertyType type = scalarType.getDocType(); + DocPropertyType type = scalarType.docType(); DocPropertyOptions options = docOptions.copy(); if (isKeywordType(type, options)) { type = DocPropertyType.KEYWORD; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 655f4c101..847401b1c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -175,7 +175,7 @@ public class DeployBeanProperty { this.propertyType = propertyType; this.genericType = null; this.scalarType = wrapScalarType(propertyType, scalarType, typeConverter); - this.dbType = (scalarType == null) ? 0 : scalarType.getJdbcType(); + this.dbType = (scalarType == null) ? 0 : scalarType.jdbcType(); } public DeployBeanProperty(DeployBeanDescriptor desc, Class propertyType, Type genericType) { @@ -240,7 +240,7 @@ public class DeployBeanProperty { */ public int getDbLength() { if (dbLength == 0 && scalarType != null) { - return scalarType.getLength(); + return scalarType.length(); } return dbLength; @@ -1145,7 +1145,7 @@ public class DeployBeanProperty { } boolean isJsonMapper() { - return scalarType != null && scalarType.isJsonMapper(); + return scalarType != null && scalarType.jsonMapper(); } boolean isJsonType() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index 331b6926d..abedce6e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -386,7 +386,7 @@ final class AnnotationFields extends AnnotationParser { private void setEncryption(DeployBeanProperty prop, boolean dbEncString, int dbLen) { util.checkEncryptKeyManagerDefined(prop.getFullBeanName()); ScalarType st = prop.getScalarType(); - if (byte[].class.equals(st.getType())) { + if (byte[].class.equals(st.type())) { // Always using Java client encryption rather than DB for encryption // of binary data (partially as this is not supported on all db's etc) // This could be reviewed at a later stage. @@ -401,7 +401,7 @@ final class AnnotationFields extends AnnotationParser { DbEncrypt dbEncrypt = util.getDbPlatform().dbEncrypt(); if (dbEncrypt != null) { // check if we have a DB encryption function for this type - int jdbcType = prop.getScalarType().getJdbcType(); + int jdbcType = prop.getScalarType().jdbcType(); DbEncryptFunction dbEncryptFunction = dbEncrypt.getDbEncryptFunction(jdbcType); if (dbEncryptFunction != null) { // Use DB functions to encrypt and decrypt diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index a8cbe5fdf..459da0229 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -104,7 +104,7 @@ public final class DeployUtil { EnumType type = enumerated != null ? enumerated.value() : null; ScalarType scalarType = typeManager.createEnumScalarType(enumClass, type); prop.setScalarType(scalarType); - prop.setDbType(scalarType.getJdbcType()); + prop.setDbType(scalarType.jdbcType()); } catch (IllegalStateException e) { throw new PersistenceException("Error mapping property " + prop.getFullBeanName() + " - " + e.getMessage()); } @@ -126,7 +126,7 @@ public final class DeployUtil { ScalarType scalarType = getScalarType(property); if (scalarType != null) { // set the jdbc type this maps to - property.setDbType(scalarType.getJdbcType()); + property.setDbType(scalarType.jdbcType()); property.setScalarType(scalarType); property.checkPrimitiveBoolean(); } @@ -156,7 +156,7 @@ public final class DeployUtil { */ void setDbMap(DeployBeanProperty prop, DbMap dbMap) { ScalarType scalarType = typeManager.getDbMapScalarType(); - int dbType = scalarType.getJdbcType(); + int dbType = scalarType.jdbcType(); prop.setDbType(dbType); prop.setScalarType(scalarType); if (dbType == Types.VARCHAR) { @@ -176,7 +176,7 @@ public final class DeployUtil { if (scalarType == null) { throw new RuntimeException("No ScalarType for @DbArray type for [" + prop.getFullBeanName() + "]"); } - int dbType = scalarType.getJdbcType(); + int dbType = scalarType.jdbcType(); prop.setDbType(dbType); prop.setScalarType(scalarType); if (scalarType instanceof ScalarTypeArray) { @@ -240,7 +240,7 @@ public final class DeployUtil { void setLobType(DeployBeanProperty prop) { ScalarType scalarType = prop.getScalarType(); if (scalarType instanceof ScalarTypeWrapper) { - int lobType = scalarType.getJdbcType() == Types.VARCHAR ? dbCLOBType : dbBLOBType; + int lobType = scalarType.jdbcType() == Types.VARCHAR ? dbCLOBType : dbBLOBType; prop.setDbType(lobType); } else { // is String or byte[] ? used to determine if its a CLOB or BLOB 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 9579bfc79..3a9631737 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 @@ -229,7 +229,7 @@ public final class ElPropertyChain implements ElPropertyValue { @Override public int jdbcType() { - return scalarType == null ? 0 : scalarType.getJdbcType(); + return scalarType == null ? 0 : scalarType.jdbcType(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java index de8e16eb0..afb416012 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -145,7 +145,7 @@ public final class Binder { public boolean isMultiValueSupported(Class cls) { try { ScalarType scalarType = getScalarType(cls); - return multiValueBind.isTypeSupported(scalarType.getJdbcType()); + return multiValueBind.isTypeSupported(scalarType.jdbcType()); } catch (PersistenceException e) { return false; } @@ -173,18 +173,18 @@ public final class Binder { Collection values = wrapper.getValues(); ScalarType type = getScalarType(wrapper.getType()); - int dbType = type.getJdbcType(); + int dbType = type.jdbcType(); // let the multiValueBind decide what to do with the value multiValueBind.bindMultiValues(dataBind, values, type, one -> bindObject(dataBind, one, dbType)); return values; } else { ScalarType type = getScalarType(value.getClass()); - if (!type.isJdbcNative()) { + if (!type.jdbcNative()) { // convert to a JDBC native type value = type.toJdbcType(value); } - bindObject(dataBind, value, type.getJdbcType()); + bindObject(dataBind, value, type.jdbcType()); return value; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java index 2c2ed1645..f28805a01 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java @@ -44,7 +44,7 @@ abstract class AbstractMultiValueBind extends MultiValueBind { @Override public void bindMultiValues(DataBind dataBind, Collection values, ScalarType type, BindOne bindOne) throws SQLException { - String arrayType = getArrayType(type.getJdbcType()); + String arrayType = getArrayType(type.jdbcType()); if (arrayType == null) { super.bindMultiValues(dataBind, values, type, bindOne); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java index 1a15b8438..dd06f4f29 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java @@ -44,7 +44,7 @@ public class MultiValueBind { */ public void bindMultiValues(DataBind dataBind, Collection values, ScalarType type, BindOne bindOne) throws SQLException { for (Object value : values) { - if (!type.isJdbcNative()) { + if (!type.jdbcNative()) { value = type.toJdbcType(value); } bindOne.bind(value); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java index f7d86f55e..fa2cbb767 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java @@ -10,7 +10,7 @@ public final class PostgresMultiValueBind extends AbstractMultiValueBind { @Override public String getInExpression(boolean not, ScalarType type, int size) { - int dbType = type.getJdbcType(); + int dbType = type.jdbcType(); if (dbType == ExtraDbTypes.UUID) { return (not) ? " != all(?::uuid[])" : " = any(?::uuid[])"; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index ca2c35609..8bb9680e7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -215,14 +215,14 @@ public final class DefaultTypeManager implements TypeManager { */ @Override public void add(ScalarType scalarType) { - typeMap.put(scalarType.getType(), scalarType); + typeMap.put(scalarType.type(), scalarType); logAdd(scalarType); } private void logAdd(ScalarType scalarType) { if (log.isLoggable(TRACE)) { String msg = "ScalarType register [" + scalarType.getClass().getName() + "]"; - msg += " for [" + scalarType.getType().getName() + "]"; + msg += " for [" + scalarType.type().getName() + "]"; log.log(TRACE, msg); } } @@ -410,7 +410,7 @@ public final class DefaultTypeManager implements TypeManager { if (genericType instanceof Class) { ScalarType found = getScalarType((Class)genericType); if (found != null) { - return found.getDocType(); + return found.docType(); } } return DocPropertyType.OBJECT; @@ -468,7 +468,7 @@ public final class DefaultTypeManager implements TypeManager { scalarType = getScalarType(type); if (scalarType != null) { - if (jdbcType == 0 || scalarType.getJdbcType() == jdbcType) { + if (jdbcType == 0 || scalarType.jdbcType() == jdbcType) { // matching type return scalarType; } @@ -851,7 +851,7 @@ public final class DefaultTypeManager implements TypeManager { databasePlatform.setDbFalseLiteral(booleanType.getDbFalseLiteral()); // always register Types.BOOLEAN to our boolean type nativeMap.put(Types.BOOLEAN, booleanType); - if (booleanType.getJdbcType() == Types.BIT) { + if (booleanType.jdbcType() == Types.BIT) { // for MapBeans ... BIT types are assumed to be booleans nativeMap.put(Types.BIT, booleanType); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java index 8b3232b28..c48b0343c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java @@ -36,6 +36,6 @@ class PlatformArrayTypeJsonList implements PlatformArrayTypeFactory { @Override public ScalarType typeForEnum(ScalarType scalarType, boolean nullable) { final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType); - return new ScalarTypeJsonList.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter); + return new ScalarTypeJsonList.VarcharWithConverter(scalarType.docType(), nullable, false, converter); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java index a5c7595f7..d67722b8f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java @@ -36,6 +36,6 @@ class PlatformArrayTypeJsonSet implements PlatformArrayTypeFactory { @Override public ScalarType typeForEnum(ScalarType scalarType, boolean nullable) { final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType); - return new ScalarTypeJsonSet.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter); + return new ScalarTypeJsonSet.VarcharWithConverter(scalarType.docType(), nullable, false, converter); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java index b0d742956..87d96187b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java @@ -71,13 +71,13 @@ abstract class ScalarTypeArrayBase extends ScalarTypeJsonCollection { protected abstract T fromArray(Object[] array1); static String arrayTypeFor(ScalarType scalarType) { - switch (scalarType.getJdbcType()) { + switch (scalarType.jdbcType()) { case Types.INTEGER: return "integer"; case Types.VARCHAR: return "varchar"; default: - throw new IllegalArgumentException("JdbcType [" + scalarType.getJdbcType() + "] not supported for @DbArray mapping on set."); + throw new IllegalArgumentException("JdbcType [" + scalarType.jdbcType() + "] not supported for @DbArray mapping on set."); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 56ec0127e..35bd40a97 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -77,7 +77,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase implements ScalarTyp @Override public ScalarTypeArrayList typeForEnum(ScalarType scalarType, boolean nullable) { - return new ScalarTypeArrayList(nullable, arrayTypeFor(scalarType), scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType)); + return new ScalarTypeArrayList(nullable, arrayTypeFor(scalarType), scalarType.docType(), new ArrayElementConverter.EnumConverter(scalarType)); } } @@ -92,7 +92,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase implements ScalarTyp } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return docPropertyType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java index 666d52b10..3a9b69849 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java @@ -71,7 +71,7 @@ class ScalarTypeArraySet extends ScalarTypeArrayBase implements ScalarTypeA @Override public ScalarType typeForEnum(ScalarType scalarType, boolean nullable) { - return new ScalarTypeArraySet(nullable, arrayTypeFor(scalarType), scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType)); + return new ScalarTypeArraySet(nullable, arrayTypeFor(scalarType), scalarType.docType(), new ArrayElementConverter.EnumConverter(scalarType)); } } @@ -86,7 +86,7 @@ class ScalarTypeArraySet extends ScalarTypeArrayBase implements ScalarTypeA } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return docPropertyType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java index 93ab0a6a6..a3a01fe1a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java @@ -19,17 +19,17 @@ abstract class ScalarTypeBase implements ScalarType { } @Override - public boolean isJdbcNative() { + public boolean jdbcNative() { return jdbcNative; } @Override - public int getJdbcType() { + public int jdbcType() { return jdbcType; } @Override - public Class getType() { + public Class type() { return type; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java index a736f6bcd..db7d392fd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -106,7 +106,7 @@ abstract class ScalarTypeBaseDate extends ScalarTypeBase { protected abstract String toIsoFormat(T value); @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.DATE; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java index cd97fc731..d42491d0d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -139,7 +139,7 @@ abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.DATETIME; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java index 75eaa17b5..86b142173 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -123,7 +123,7 @@ abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.TEXT; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java index 815d5e193..d35679398 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java @@ -92,7 +92,7 @@ class ScalarTypeBigDecimal extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.DOUBLE; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java index 848b0fc2a..cc173aff7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java @@ -146,7 +146,7 @@ public final class ScalarTypeBoolean { } @Override - public int getLength() { + public int length() { return 1; } @@ -233,7 +233,7 @@ public final class ScalarTypeBoolean { } @Override - public int getLength() { + public int length() { return Math.max(trueValue.length(), falseValue.length()); } @@ -358,7 +358,7 @@ public final class ScalarTypeBoolean { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.BOOLEAN; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java index 5437ecb77..1d37a8566 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java @@ -25,7 +25,7 @@ final class ScalarTypeByte extends ScalarTypeBase { } @Override - public boolean isBinaryType() { + public boolean binary() { return true; } @@ -71,7 +71,7 @@ final class ScalarTypeByte extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.BINARY; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java index 51f811ede..32d0ba67c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java @@ -22,7 +22,7 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { } @Override - public boolean isBinaryType() { + public boolean binary() { return true; } @@ -96,7 +96,7 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.BINARY; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java index 301f5e2ae..a49ea668c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -27,7 +27,7 @@ public final class ScalarTypeBytesEncrypted implements ScalarType { } @Override - public boolean isBinaryType() { + public boolean binary() { return true; } @@ -38,23 +38,23 @@ public final class ScalarTypeBytesEncrypted implements ScalarType { } @Override - public int getJdbcType() { - return baseType.getJdbcType(); + public int jdbcType() { + return baseType.jdbcType(); } @Override - public int getLength() { - return baseType.getLength(); + public int length() { + return baseType.length(); } @Override - public Class getType() { + public Class type() { return byte[].class; } @Override - public boolean isJdbcNative() { - return baseType.isJdbcNative(); + public boolean jdbcNative() { + return baseType.jdbcNative(); } @Override @@ -75,8 +75,8 @@ public final class ScalarTypeBytesEncrypted implements ScalarType { } @Override - public DocPropertyType getDocType() { - return baseType.getDocType(); + public DocPropertyType docType() { + return baseType.docType(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java index 44fb1c475..f5e45a84e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java @@ -13,7 +13,7 @@ final class ScalarTypeClass extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 255; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java index 194e43c32..cc2568e43 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java @@ -12,7 +12,7 @@ final class ScalarTypeCurrency extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 3; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java index 392cb3bdb..6e80cc5de 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java @@ -91,7 +91,7 @@ final class ScalarTypeDouble extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.DOUBLE; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java index 5daff6f4c..a3385b521 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java @@ -104,7 +104,7 @@ class ScalarTypeDuration extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.KEYWORD; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java index e05c674a1..605f1ccad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -31,13 +31,13 @@ public final class ScalarTypeEncryptedWrapper implements ScalarType, Local } @Override - public boolean isBinaryType() { - return wrapped.isBinaryType(); + public boolean binary() { + return wrapped.binary(); } @Override - public boolean isMutable() { - return wrapped.isMutable(); + public boolean mutable() { + return wrapped.mutable(); } @Override @@ -80,22 +80,22 @@ public final class ScalarTypeEncryptedWrapper implements ScalarType, Local } @Override - public int getJdbcType() { - return byteArrayType.getJdbcType(); + public int jdbcType() { + return byteArrayType.jdbcType(); } @Override - public int getLength() { - return byteArrayType.getLength(); + public int length() { + return byteArrayType.length(); } @Override - public Class getType() { - return wrapped.getType(); + public Class type() { + return wrapped.type(); } @Override - public boolean isJdbcNative() { + public boolean jdbcNative() { return false; } @@ -146,8 +146,8 @@ public final class ScalarTypeEncryptedWrapper implements ScalarType, Local } @Override - public DocPropertyType getDocType() { - return wrapped.getDocType(); + public DocPropertyType docType() { + return wrapped.docType(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index d33b06af4..a359ba3ef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -73,7 +73,7 @@ final class ScalarTypeEnumStandard { } @Override - public int getLength() { + public int length() { return length; } @@ -248,7 +248,7 @@ final class ScalarTypeEnumStandard { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.ENUM; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index 287c11f60..9054a4546 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -64,7 +64,7 @@ class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase implemen * Return the DB column length for storing the enum value. */ @Override - public int getLength() { + public int length() { return length; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java index 73037a58a..23c59d744 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java @@ -43,7 +43,7 @@ final class ScalarTypeFile extends ScalarTypeBase { } @Override - public boolean isBinaryType() { + public boolean binary() { return true; } @@ -117,7 +117,7 @@ final class ScalarTypeFile extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.BINARY; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java index 66f2d206b..5c65f26a1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java @@ -91,7 +91,7 @@ final class ScalarTypeFloat extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.FLOAT; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java index 166a81280..613fb7f7c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java @@ -14,7 +14,7 @@ final class ScalarTypeInetAddress extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 50; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java index 164646899..35e00d40f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java @@ -102,7 +102,7 @@ final class ScalarTypeInteger extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.INTEGER; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java index b9e434773..617faa38f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java @@ -112,7 +112,7 @@ class ScalarTypeJodaLocalTime extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.KEYWORD; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java index 5c319c6ef..731e44760 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java @@ -12,7 +12,7 @@ final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 50; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java index e78f6b02d..8ceee543f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java @@ -52,7 +52,7 @@ abstract class ScalarTypeJsonCollection extends ScalarTypeBase implements * Consider as a mutable type. Use the isDirty() method to check for dirty state. */ @Override - public boolean isMutable() { + public boolean mutable() { return true; } @@ -76,7 +76,7 @@ abstract class ScalarTypeJsonCollection extends ScalarTypeBase implements } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return docPropertyType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java index 4abd85931..74b23c799 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -118,7 +118,7 @@ final class ScalarTypeJsonList { } @Override - public final boolean isJsonMapper() { + public final boolean jsonMapper() { return keepSource; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java index 96030c23f..db5ee25b7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java @@ -123,7 +123,7 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase { * Map is a mutable type. Use the isDirty() method to check for dirty state. */ @Override - public final boolean isMutable() { + public final boolean mutable() { return true; } @@ -136,7 +136,7 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase { } @Override - public final boolean isJsonMapper() { + public final boolean jsonMapper() { return keepSource; } @@ -244,7 +244,7 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase { } @Override - public final DocPropertyType getDocType() { + public final DocPropertyType docType() { return DocPropertyType.OBJECT; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java index 5efcb2c7b..69e1661d0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java @@ -100,7 +100,7 @@ abstract class ScalarTypeJsonNode extends ScalarTypeBase { * Map is a mutable type. Use the isDirty() method to check for dirty state. */ @Override - public boolean isMutable() { + public boolean mutable() { return true; } @@ -196,7 +196,7 @@ abstract class ScalarTypeJsonNode extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.OBJECT; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java index 94bfd4c88..c8bb1a88d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java @@ -70,12 +70,12 @@ final class ScalarTypeJsonObjectMapper { } @Override - public boolean isMutable() { + public boolean mutable() { return true; } @Override - public boolean isJsonMapper() { + public boolean jsonMapper() { return true; } @@ -198,7 +198,7 @@ final class ScalarTypeJsonObjectMapper { } @Override - public final DocPropertyType getDocType() { + public final DocPropertyType docType() { return docType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index 354d793d7..32f8e67c5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -116,7 +116,7 @@ final class ScalarTypeJsonSet { } @Override - public final boolean isJsonMapper() { + public final boolean jsonMapper() { return keepSource; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java index b859b56c6..ef417b786 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java @@ -102,7 +102,7 @@ class ScalarTypeLocalTime extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.KEYWORD; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java index 88190593a..7eb53e37b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java @@ -12,7 +12,7 @@ final class ScalarTypeLocale extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 20; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java index cb9427967..93ed58576 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java @@ -101,7 +101,7 @@ final class ScalarTypeLong extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.LONG; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java index b6855e4ad..f84fa4871 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java @@ -96,7 +96,7 @@ final class ScalarTypeMathBigInteger extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.LONG; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java index f655894ee..a90b238bb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java @@ -111,7 +111,7 @@ final class ScalarTypeMonthDay extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.KEYWORD; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java index ef0495296..4f1305144 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java @@ -24,17 +24,17 @@ class ScalarTypeNotFound implements ScalarType { private ScalarTypeNotFound() { } @Override - public boolean isJdbcNative() { + public boolean jdbcNative() { throw new UnsupportedOperationException(); } @Override - public int getJdbcType() { + public int jdbcType() { throw new UnsupportedOperationException(); } @Override - public Class getType() { + public Class type() { throw new UnsupportedOperationException(); } @@ -79,7 +79,7 @@ class ScalarTypeNotFound implements ScalarType { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { throw new UnsupportedOperationException(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java index e1f241b51..72702721b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java @@ -12,7 +12,7 @@ final class ScalarTypeOffsetTime extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 25; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java index 9b0175173..ceb34c865 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java @@ -12,7 +12,7 @@ final class ScalarTypePeriod extends ScalarTypeBaseVarchar { } @Override - public int getLength() { + public int length() { return 20; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java index 2f33dc929..799ebef96 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java @@ -27,7 +27,7 @@ final class ScalarTypePostgresHstore extends ScalarTypeBase { } @Override - public boolean isMutable() { + public boolean mutable() { return true; } @@ -114,7 +114,7 @@ final class ScalarTypePostgresHstore extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.OBJECT; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java index 11bfa7b22..41c3716c4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java @@ -87,7 +87,7 @@ final class ScalarTypeShort extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.SHORT; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java index 6878fbb5b..457749757 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java @@ -91,7 +91,7 @@ abstract class ScalarTypeStringBase extends ScalarTypeBase { } @Override - public DocPropertyType getDocType() { + public DocPropertyType docType() { return DocPropertyType.TEXT; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java index e8bcca79d..ffab3f274 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java @@ -93,7 +93,7 @@ final class ScalarTypeTime extends ScalarTypeBase