From fd4d757f87815b13333d8f94d18b5385c38710b1 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Tue, 18 Nov 2014 01:20:26 +1300 Subject: [PATCH] WIP Java8 types - ScalarTypeDuration etc --- .../com/avaje/ebean/config/ServerConfig.java | 46 +++++- .../deploy/meta/DeployBeanProperty.java | 2 +- .../server/type/DecimalUtils.java | 2 +- .../server/type/DefaultTypeManager.java | 22 ++- .../server/type/EnumToDbIntegerMap.java | 7 +- .../server/type/ScalarTypeBaseDate.java | 2 +- .../server/type/ScalarTypeBaseDateTime.java | 7 +- .../server/type/ScalarTypeDate.java | 4 +- .../server/type/ScalarTypeDayOfWeek.java | 22 +++ .../server/type/ScalarTypeDuration.java | 3 +- .../type/ScalarTypeDurationWithNanos.java | 2 +- .../server/type/ScalarTypeEnum.java | 2 +- .../server/type/ScalarTypeEnumStandard.java | 4 +- .../type/ScalarTypeEnumWithMapping.java | 2 +- .../type/ScalarTypeJodaDateMidnight.java | 4 +- .../server/type/ScalarTypeJodaLocalDate.java | 4 +- .../server/type/ScalarTypeLocalDate.java | 5 +- .../server/type/ScalarTypeLocalDateTime.java | 3 +- .../server/type/ScalarTypeMonth.java | 22 +++ .../server/type/ScalarTypeOffsetDateTime.java | 2 +- .../server/type/ScalarTypeOffsetTime.java | 39 +++++ .../server/type/ScalarTypeUtilDate.java | 6 +- .../server/type/ScalarTypeYearMonthDate.java | 67 +++++++++ .../server/type/ScalarTypeZoneId.java | 40 +++++ .../server/type/ScalarTypeZoneOffset.java | 39 +++++ .../server/type/ScalarTypeZonedDateTime.java | 62 ++++++++ .../server/type/ConvertInetAddressTest.java | 4 - .../ebeaninternal/server/type/JsonTester.java | 47 ++++++ .../server/type/ScalarTypeDurationTest.java | 19 +-- .../type/ScalarTypeDurationWithNanosTest.java | 19 +-- .../server/type/ScalarTypeInstantTest.java | 23 +-- .../type/ScalarTypeLocalDateTimeTest.java | 17 +++ .../server/type/ScalarTypeLocalTimeTest.java | 22 +-- .../ScalarTypeLocalTimeWithNanosTest.java | 22 +-- .../type/ScalarTypeOffsetDateTimeTest.java | 19 ++- .../server/type/ScalarTypeOffsetTimeTest.java | 39 +++++ .../type/ScalarTypeYearMonthDateTest.java | 56 +++++++ .../server/type/ScalarTypeYearTest.java | 21 +-- .../server/type/ScalarTypeZoneIdTest.java | 40 +++++ .../server/type/ScalarTypeZoneOffsetTest.java | 46 ++++++ .../type/ScalarTypeZonedDateTimeTest.java | 79 ++++++++++ .../TestScalarTypeUUIDBinaryConversion.java | 2 +- .../tests/model/types/SomeNewTypesBean.java | 142 ++++++++++++++++++ .../com/avaje/tests/types/TestNewTypes.java | 89 +++++++++++ 44 files changed, 981 insertions(+), 145 deletions(-) create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonth.java create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTime.java create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java create mode 100644 src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java create mode 100644 src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java create mode 100644 src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java create mode 100644 src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java create mode 100644 src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java create mode 100644 src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java create mode 100644 src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java create mode 100644 src/test/java/com/avaje/tests/types/TestNewTypes.java diff --git a/src/main/java/com/avaje/ebean/config/ServerConfig.java b/src/main/java/com/avaje/ebean/config/ServerConfig.java index a7e322eb7..88a45be1e 100644 --- a/src/main/java/com/avaje/ebean/config/ServerConfig.java +++ b/src/main/java/com/avaje/ebean/config/ServerConfig.java @@ -222,7 +222,7 @@ public class ServerConfig { * Setting to indicate if UUID should be stored as binary(16) or varchar(40). */ private boolean uuidStoreAsBinary; - + private List persistControllers = new ArrayList(); private List> persistListeners = new ArrayList>(); @@ -246,9 +246,13 @@ public class ServerConfig { private boolean collectQueryStatsByNode; private boolean collectQueryOrigins; - + private JsonFactory jsonFactory; + private boolean localTimeWithNanos; + + private boolean durationWithNanos; + /** * Construct a Server Configuration for programmatically creating an * EbeanServer. @@ -878,6 +882,43 @@ public class ServerConfig { this.uuidStoreAsBinary = uuidStoreAsBinary; } + /** + * Return true if LocalTime should be persisted with nanos precision. + */ + public boolean isLocalTimeWithNanos() { + return localTimeWithNanos; + } + + /** + * Set to true if LocalTime should be persisted with nanos precision. + *

+ * Otherwise it is persisted using java.sql.Time which is seconds precision. + *

+ */ + public void setLocalTimeWithNanos(boolean localTimeWithNanos) { + this.localTimeWithNanos = localTimeWithNanos; + } + + /** + * Return true if Duration should be persisted with nanos precision (SQL DECIMAL). + *

+ * Otherwise it is persisted with second precision (SQL INTEGER). + *

+ */ + public boolean isDurationWithNanos() { + return durationWithNanos; + } + + /** + * Set to true if Duration should be persisted with nanos precision (SQL DECIMAL). + *

+ * Otherwise it is persisted with second precision (SQL INTEGER). + *

+ */ + public void setDurationWithNanos(boolean durationWithNanos) { + this.durationWithNanos = durationWithNanos; + } + /** * Set to true to run the DDL generation on startup. */ @@ -1383,6 +1424,7 @@ public class ServerConfig { databaseBooleanFalse = p.get("databaseBooleanFalse", null); databasePlatformName = p.get("databasePlatformName", null); uuidStoreAsBinary = p.getBoolean("uuidStoreAsBinary", false); + localTimeWithNanos = p.getBoolean("localTimeWithNanos", false); lazyLoadBatchSize = p.getInt("lazyLoadBatchSize", 1); queryBatchSize = p.getInt("queryBatchSize", DEFAULT_QUERY_BATCH_SIZE); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 277319337..3251fb22b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -414,7 +414,7 @@ public class DeployBeanProperty { ScalarTypeEnum etype = (ScalarTypeEnum) scalarType; // check dbColName IN ('A', 'I', 'D') - return "check (" + dbColumn + " in " + etype.getContraintInValues() + ")"; + return "check (" + dbColumn + " in " + etype.getConstraintInValues() + ")"; } return null; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java b/src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java index 235e94882..e84fd7644 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java @@ -68,7 +68,7 @@ public final class DecimalUtils { public static Instant toInstant(BigDecimal value) { long seconds = value.longValue(); - int nanoseconds = DecimalUtils.extractNanosecondDecimal(value, seconds); + int nanoseconds = extractNanosecondDecimal(value, seconds); return Instant.ofEpochSecond(seconds, nanoseconds); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java index 1d8b4533d..39cd6ae16 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java @@ -10,7 +10,7 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; -import java.time.OffsetDateTime; +import java.time.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -144,7 +144,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable { this.extraTypeFactory = new DefaultTypeFactory(config); initialiseStandard(jsonDateTime, clobType, blobType, config.isUuidStoreAsBinary()); - initialiseJavaTimeTypes(jsonDateTime); + initialiseJavaTimeTypes(jsonDateTime, config); initialiseJodaTypes(jsonDateTime); if (bootupClasses != null) { @@ -599,12 +599,28 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable { return propParamTypes[1]; } - protected void initialiseJavaTimeTypes(JsonConfig.DateTime mode) { + protected void initialiseJavaTimeTypes(JsonConfig.DateTime mode, ServerConfig config) { if (ClassUtil.isPresent("java.time.LocalDate", this.getClass())) { logger.debug("Registering java.time data types"); typeMap.put(java.time.LocalDate.class, new ScalarTypeLocalDate()); typeMap.put(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(mode)); typeMap.put(OffsetDateTime.class, new ScalarTypeOffsetDateTime(mode)); + typeMap.put(ZonedDateTime.class, new ScalarTypeZonedDateTime(mode)); + typeMap.put(Instant.class, new ScalarTypeInstant(mode)); + + typeMap.put(DayOfWeek.class, new ScalarTypeDayOfWeek()); + typeMap.put(Month.class, new ScalarTypeMonth()); + typeMap.put(Year.class, new ScalarTypeYear()); + typeMap.put(YearMonth.class, new ScalarTypeYearMonthDate()); + typeMap.put(OffsetTime.class, new ScalarTypeOffsetTime()); + typeMap.put(ZoneId.class, new ScalarTypeZoneId()); + typeMap.put(ZoneOffset.class, new ScalarTypeZoneOffset()); + + boolean localTimeNanos = config.isLocalTimeWithNanos(); + typeMap.put(java.time.LocalTime.class, (localTimeNanos)? new ScalarTypeLocalTimeWithNanos() : new ScalarTypeLocalTime()); + + boolean durationNanos = config.isDurationWithNanos(); + typeMap.put(Duration.class, (durationNanos)? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java index c4f0dbb20..432bfc0cd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java @@ -15,7 +15,12 @@ public class EnumToDbIntegerMap extends EnumToDbValueMap { return Types.INTEGER; } - @Override + public EnumToDbIntegerMap add(Object beanValue, Integer dbValue) { + addInternal(beanValue, dbValue); + return this; + } + + @Override public EnumToDbIntegerMap add(Object beanValue, String stringDbValue) { try { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java index 8cc4de223..7e485192d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -23,7 +23,7 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { /** * Convert the target value to millis. */ - public abstract long convertToMillis(Object value); + public abstract long convertToMillis(T value); /** * Convert to java.sql.Date from the target Date type. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java index b267544a3..a4f02d489 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -93,9 +93,8 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { } case VALUE_NUMBER_FLOAT: { BigDecimal value = ctx.getDecimalValue(); - //Instant instant = DecimalUtils.toInstant(value); Timestamp timestamp = DecimalUtils.toTimestamp(value); - convertFromTimestamp(timestamp);//Timestamp.from(instant)); + return convertFromTimestamp(timestamp); } default: { String jsonDateTime = ctx.getText(); @@ -109,10 +108,12 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { switch (mode) { case ISO8601: { - generator.writeNumber(toJsonISO8601(value)); + generator.writeFieldName(name); + generator.writeString(toJsonISO8601(value)); break; } case NANOS: { + generator.writeFieldName(name); generator.writeNumber(toJsonNanos(value)); break; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java index d9b10644f..21b373007 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java @@ -16,8 +16,8 @@ public class ScalarTypeDate extends ScalarTypeBaseDate { } @Override - public long convertToMillis(Object value) { - return ((Date) value).getTime(); + public long convertToMillis(Date value) { + return value.getTime(); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java new file mode 100644 index 000000000..73fa4d3f0 --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java @@ -0,0 +1,22 @@ +package com.avaje.ebeaninternal.server.type; + +import java.time.DayOfWeek; + +/** + * ScalarType mapping for Month enum. + */ +public class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping { + + static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap(); + + static { + DayOfWeek[] values = DayOfWeek.values(); + for (DayOfWeek value : values) { + beanDbMap.add(value, value.getValue()); + } + } + + public ScalarTypeDayOfWeek() { + super(beanDbMap, DayOfWeek.class, 1); + } +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java index 4439b15a9..7e5937b45 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java @@ -15,7 +15,7 @@ import java.sql.Types; import java.time.Duration; /** - * ScalarType for java.time.Duration + * ScalarType for java.time.Duration (with seconds precision). */ public class ScalarTypeDuration extends ScalarTypeBase { @@ -81,7 +81,6 @@ public class ScalarTypeDuration extends ScalarTypeBase { } } - @Override public String formatValue(Duration v) { return v.toString(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java index ab0f8065a..1ff246375 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java @@ -15,7 +15,7 @@ import java.sql.Types; import java.time.Duration; /** - * ScalarType for java.time.Duration with Nanos precision. + * ScalarType for java.time.Duration (with Nanos precision). *

* Stored in the DB as DECIMAL value. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java index 1e279ee1d..f9479adcd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java @@ -8,6 +8,6 @@ public interface ScalarTypeEnum { /** * Return the IN values for DB constraint construction. */ - public String getContraintInValues(); + public String getConstraintInValues(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java index 19ee664d6..ca327675a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -41,7 +41,7 @@ public class ScalarTypeEnumStandard { /** * Return the IN values for DB constraint construction. */ - public String getContraintInValues() { + public String getConstraintInValues() { StringBuilder sb = new StringBuilder(); @@ -129,7 +129,7 @@ public class ScalarTypeEnumStandard { /** * Return the IN values for DB constraint construction. */ - public String getContraintInValues() { + public String getConstraintInValues() { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index dc97c9f56..a7f26f86e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -25,7 +25,7 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i /** * Return the IN values for DB constraint construction. */ - public String getContraintInValues() { + public String getConstraintInValues() { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java index bc3514f4f..244b8c127 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java @@ -20,8 +20,8 @@ public class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate } @Override - public long convertToMillis(Object value) { - return ((DateMidnight) value).getMillis(); + public long convertToMillis(DateMidnight value) { + return value.getMillis(); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java index 20f125361..f06639ec4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java @@ -17,8 +17,8 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate { } @Override - public long convertToMillis(Object value) { - return ((LocalDate) value).toDateMidnight().getMillis(); + public long convertToMillis(LocalDate value) { + return value.toDateMidnight().getMillis(); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java index ed83eb957..5ffef6b3f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java @@ -19,9 +19,8 @@ public class ScalarTypeLocalDate extends ScalarTypeBaseDate { } @Override - public long convertToMillis(Object value) { - LocalDate localDate = (LocalDate) value; - ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault()); + public long convertToMillis(LocalDate value) { + ZonedDateTime zonedDateTime = value.atStartOfDay(ZoneId.systemDefault()); return zonedDateTime.toInstant().toEpochMilli(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java index 2bce3d064..b0452f95e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java @@ -6,6 +6,7 @@ import java.sql.Timestamp; import java.sql.Types; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.ZonedDateTime; /** @@ -34,7 +35,7 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime { + + public ScalarTypeOffsetTime() { + super(OffsetTime.class); + } + + @Override + public int getLength() { + return 25; + } + + @Override + public String formatValue(OffsetTime v) { + return v.toString(); + } + + @Override + public OffsetTime parse(String value) { + return OffsetTime.parse(value); + } + + @Override + public OffsetTime convertFromDbString(String dbValue) { + return OffsetTime.parse(dbValue); + } + + @Override + public String convertToDbString(OffsetTime beanValue) { + return beanValue.toString(); + } + +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java index a5550e748..51af106ef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java @@ -91,12 +91,10 @@ public class ScalarTypeUtilDate { @Override - public long convertToMillis(Object value) { - java.sql.Date date = BasicTypeConverter.toDate(value); - return date.getTime(); + public long convertToMillis(java.util.Date value) { + return value.getTime(); } - @Override public Date convertFromDate(java.sql.Date ts) { return new java.util.Date(ts.getTime()); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java new file mode 100644 index 000000000..f602c771b --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java @@ -0,0 +1,67 @@ +package com.avaje.ebeaninternal.server.type; + +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; + +import java.sql.Date; +import java.sql.Timestamp; +import java.sql.Types; +import java.time.LocalDate; +import java.time.YearMonth; +import java.time.ZoneId; +import java.time.ZonedDateTime; + +/** + * ScalarType for java.time.LocalDate. This maps to a JDBC Date. + */ +public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate { + + public ScalarTypeYearMonthDate() { + super(YearMonth.class, false, Types.DATE); + } + + protected LocalDate toLocalDate(YearMonth yearMonth) { + return LocalDate.of(yearMonth.getYear(), yearMonth.getMonth(), 1); + } + + protected YearMonth fromLocalDate(LocalDate localDate) { + return YearMonth.of(localDate.getYear(), localDate.getMonth()); + } + + @Override + public YearMonth convertFromMillis(long systemTimeMillis) { + return fromLocalDate(new Timestamp(systemTimeMillis).toLocalDateTime().toLocalDate()); + } + + @Override + public long convertToMillis(YearMonth value) { + LocalDate localDate = toLocalDate(value); + ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault()); + return zonedDateTime.toInstant().toEpochMilli(); + } + + @Override + public YearMonth convertFromDate(Date ts) { + return fromLocalDate(ts.toLocalDate()); + } + + @Override + public Date convertToDate(YearMonth t) { + return Date.valueOf(toLocalDate(t)); + } + + @Override + public Object toJdbcType(Object value) { + if (value instanceof Date) return value; + if (value instanceof YearMonth) return Date.valueOf(toLocalDate((YearMonth) value)); + if (value instanceof LocalDate) return Date.valueOf((LocalDate)value); + return BasicTypeConverter.toDate(value); + } + + @Override + public YearMonth toBeanType(Object value) { + if (value instanceof YearMonth) return (YearMonth) value; + if (value instanceof LocalDate) return fromLocalDate((LocalDate) value); + return fromLocalDate(BasicTypeConverter.toDate(value).toLocalDate()); + } + +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java new file mode 100644 index 000000000..0ac3a7fee --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java @@ -0,0 +1,40 @@ +package com.avaje.ebeaninternal.server.type; + +import java.time.OffsetTime; +import java.time.ZoneId; + +/** + * ScalarType for java.time.OffsetTime stored as DB VARCHAR + */ +public class ScalarTypeZoneId extends ScalarTypeBaseVarchar { + + public ScalarTypeZoneId() { + super(ZoneId.class); + } + + @Override + public int getLength() { + return 60; + } + + @Override + public String formatValue(ZoneId v) { + return v.toString(); + } + + @Override + public ZoneId parse(String value) { + return ZoneId.of(value); + } + + @Override + public ZoneId convertFromDbString(String dbValue) { + return ZoneId.of(dbValue); + } + + @Override + public String convertToDbString(ZoneId beanValue) { + return beanValue.toString(); + } + +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java new file mode 100644 index 000000000..194396283 --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java @@ -0,0 +1,39 @@ +package com.avaje.ebeaninternal.server.type; + +import java.time.ZoneOffset; + +/** + * ScalarType for java.time.OffsetTime stored as DB VARCHAR + */ +public class ScalarTypeZoneOffset extends ScalarTypeBaseVarchar { + + public ScalarTypeZoneOffset() { + super(ZoneOffset.class); + } + + @Override + public int getLength() { + return 60; + } + + @Override + public String formatValue(ZoneOffset v) { + return v.toString(); + } + + @Override + public ZoneOffset parse(String value) { + return ZoneOffset.of(value); + } + + @Override + public ZoneOffset convertFromDbString(String dbValue) { + return ZoneOffset.of(dbValue); + } + + @Override + public String convertToDbString(ZoneOffset beanValue) { + return beanValue.toString(); + } + +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java new file mode 100644 index 000000000..1f72ee1b4 --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java @@ -0,0 +1,62 @@ +package com.avaje.ebeaninternal.server.type; + +import com.avaje.ebean.config.JsonConfig; + +import java.sql.Timestamp; +import java.sql.Types; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; + +/** + * ScalarType for ZonedDateTime. + */ +public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime { + + public ScalarTypeZonedDateTime(JsonConfig.DateTime mode) { + super(mode, ZonedDateTime.class, true, Types.TIMESTAMP); + } + + @Override + protected String toJsonNanos(ZonedDateTime value) { + return toJsonNanos(value.toEpochSecond(), value.getNano()); + } + + @Override + protected String toJsonISO8601(ZonedDateTime value) { + return value.toInstant().toString(); + } + + @Override + public long convertToMillis(ZonedDateTime value) { + return value.toInstant().toEpochMilli(); + } + + @Override + public ZonedDateTime convertFromMillis(long systemTimeMillis) { + return ZonedDateTime.ofInstant(Instant.ofEpochMilli(systemTimeMillis), ZoneId.systemDefault()); + } + + @Override + public ZonedDateTime convertFromTimestamp(Timestamp ts) { + return ZonedDateTime.ofInstant(ts.toInstant(), ZoneId.systemDefault()); + } + + @Override + public Timestamp convertToTimestamp(ZonedDateTime t) { + return Timestamp.from(t.toInstant()); + } + + @Override + public Object toJdbcType(Object value) { + if (value instanceof Timestamp) return value; + return convertToTimestamp((ZonedDateTime)value); + } + + @Override + public ZonedDateTime toBeanType(Object value) { + if (value instanceof ZonedDateTime) return (ZonedDateTime) value; + return convertFromTimestamp((Timestamp)value); + } +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java index 6fbdf23f1..04b4890be 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java @@ -19,11 +19,7 @@ public class ConvertInetAddressTest { String uriAddr6 = ConvertInetAddresses.toUriString(addr6); Assert.assertEquals("["+ip6addr+"]", uriAddr6); Assert.assertEquals(ip6addr, addr6.getHostAddress()); - - } - - @Test public void toUriString() { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java b/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java new file mode 100644 index 000000000..552427fdd --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java @@ -0,0 +1,47 @@ +package com.avaje.ebeaninternal.server.type; + +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + +import java.io.IOException; +import java.io.StringWriter; + +import static org.junit.Assert.assertEquals; + +/** + * Base class to help json testing. + */ +public class JsonTester { + + protected JsonFactory factory = new JsonFactory(); + + protected ScalarType type; + + public JsonTester(ScalarType type ) { + this.type = type; + } + + public void test(T value) throws IOException { + + StringWriter writer = new StringWriter(); + + JsonGenerator generator = factory.createGenerator(writer); + generator.writeStartObject(); + type.jsonWrite(generator, "key", value); + generator.writeEndObject(); + generator.flush(); + + JsonParser parser = factory.createParser(writer.toString()); + JsonToken token = parser.nextToken(); + assertEquals(JsonToken.START_OBJECT, token); + token = parser.nextToken(); + assertEquals(JsonToken.FIELD_NAME, token); + token = parser.nextToken(); + + T val1 = type.jsonRead(parser, token); + assertEquals(value, val1); + + } +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java index 0f7f4e12d..b092c9554 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -1,5 +1,6 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.config.JsonConfig; import com.avaje.ebean.text.TextException; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; @@ -99,23 +100,9 @@ public class ScalarTypeDurationTest { Duration duration = Duration.ofSeconds(1234); - StringWriter writer = new StringWriter(); - JsonFactory factory = new JsonFactory(); - JsonGenerator generator = factory.createGenerator(writer); - generator.writeStartObject(); - type.jsonWrite(generator, "key", duration); - generator.writeEndObject(); - generator.flush(); + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(duration); - JsonParser parser = factory.createParser(writer.toString()); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.START_OBJECT, token); - token = parser.nextToken(); - assertEquals(JsonToken.FIELD_NAME, token); - token = parser.nextToken(); - - Duration val1 = type.jsonRead(parser, token); - assertEquals(duration, val1); } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index c5958f238..e9796f47e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -99,23 +99,8 @@ public class ScalarTypeDurationWithNanosTest { Duration duration = Duration.ofSeconds(323, 1500000); - StringWriter writer = new StringWriter(); - JsonFactory factory = new JsonFactory(); - JsonGenerator generator = factory.createGenerator(writer); - generator.writeStartObject(); - type.jsonWrite(generator, "key", duration); - generator.writeEndObject(); - generator.flush(); - - JsonParser parser = factory.createParser(writer.toString()); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.START_OBJECT, token); - token = parser.nextToken(); - assertEquals(JsonToken.FIELD_NAME, token); - token = parser.nextToken(); - - Duration val1 = type.jsonRead(parser, token); - assertEquals(duration, val1); + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(duration); } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java index 54f06997c..863618cc5 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -102,23 +102,16 @@ public class ScalarTypeInstantTest { Instant now = Instant.now(); - StringWriter writer = new StringWriter(); - JsonFactory factory = new JsonFactory(); - JsonGenerator generator = factory.createGenerator(writer); - generator.writeStartObject(); - type.jsonWrite(generator, "key", now); - generator.writeEndObject(); - generator.flush(); + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(now); - JsonParser parser = factory.createParser(writer.toString()); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.START_OBJECT, token); - token = parser.nextToken(); - assertEquals(JsonToken.FIELD_NAME, token); - token = parser.nextToken(); + ScalarTypeInstant typeNanos = new ScalarTypeInstant(JsonConfig.DateTime.NANOS); + jsonTester = new JsonTester(typeNanos); + jsonTester.test(now); - Instant val1 = type.jsonRead(parser, token); - assertEquals(now, val1); + ScalarTypeInstant typeIso = new ScalarTypeInstant(JsonConfig.DateTime.ISO8601); + jsonTester = new JsonTester(typeIso); + jsonTester.test(now); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java index 1a669cc16..86d3cbd83 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java @@ -61,4 +61,21 @@ public class ScalarTypeLocalDateTimeTest { Timestamp timestamp1 = type.convertToTimestamp(val1); assertEquals(timestamp, timestamp1); } + + @Test + public void testJson() throws Exception { + + LocalDateTime now = LocalDateTime.now(); + + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(now); + + ScalarTypeLocalDateTime typeNanos = new ScalarTypeLocalDateTime(JsonConfig.DateTime.NANOS); + jsonTester = new JsonTester(typeNanos); + jsonTester.test(now); + + ScalarTypeLocalDateTime typeIso = new ScalarTypeLocalDateTime(JsonConfig.DateTime.ISO8601); + jsonTester = new JsonTester(typeIso); + jsonTester.test(now); + } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index 43256a58f..379fb9d5a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -94,28 +94,10 @@ public class ScalarTypeLocalTimeTest { @Test public void testJsonRead() throws Exception { - LocalTime localTime = LocalTime.of(9, 23, 45); - - StringWriter writer = new StringWriter(); - JsonFactory factory = new JsonFactory(); - JsonGenerator generator = factory.createGenerator(writer); - generator.writeStartObject(); - type.jsonWrite(generator, "key", localTime); - generator.writeEndObject(); - generator.flush(); - - JsonParser parser = factory.createParser(writer.toString()); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.START_OBJECT, token); - token = parser.nextToken(); - assertEquals(JsonToken.FIELD_NAME, token); - token = parser.nextToken(); - - LocalTime val1 = type.jsonRead(parser, token); - assertEquals(localTime, val1); - + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(localTime); } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index fae98e930..b002ae46b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -95,25 +95,11 @@ public class ScalarTypeLocalTimeWithNanosTest { LocalTime localTime = LocalTime.of(9, 23, 45); - - StringWriter writer = new StringWriter(); - JsonFactory factory = new JsonFactory(); - JsonGenerator generator = factory.createGenerator(writer); - generator.writeStartObject(); - type.jsonWrite(generator, "key", localTime); - generator.writeEndObject(); - generator.flush(); - - JsonParser parser = factory.createParser(writer.toString()); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.START_OBJECT, token); - token = parser.nextToken(); - assertEquals(JsonToken.FIELD_NAME, token); - token = parser.nextToken(); - - LocalTime val1 = type.jsonRead(parser, token); - assertEquals(localTime, val1); + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(localTime); } + + } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index 34531c2f0..9cef51320 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -7,7 +7,6 @@ import java.sql.Timestamp; import java.time.OffsetDateTime; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; public class ScalarTypeOffsetDateTimeTest { @@ -25,7 +24,6 @@ public class ScalarTypeOffsetDateTimeTest { long toMillis = type.convertToMillis(OffsetDateTime.now()); assertTrue(toMillis - now < 10); - } @Test @@ -59,4 +57,21 @@ public class ScalarTypeOffsetDateTimeTest { assertEquals(timestamp, timestamp1); } + + @Test + public void testJson() throws Exception { + + OffsetDateTime now = OffsetDateTime.now(); + + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(now); + + ScalarTypeOffsetDateTime typeNanos = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.NANOS); + jsonTester = new JsonTester(typeNanos); + jsonTester.test(now); + + ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601); + jsonTester = new JsonTester(typeIso); + jsonTester.test(now); + } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java new file mode 100644 index 000000000..12aa1b0fe --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java @@ -0,0 +1,39 @@ +package com.avaje.ebeaninternal.server.type; + +import org.junit.Test; + +import java.time.OffsetTime; + +import static org.junit.Assert.assertEquals; + +public class ScalarTypeOffsetTimeTest { + + ScalarTypeOffsetTime type = new ScalarTypeOffsetTime(); + + @Test + public void testGetLength() throws Exception { + + assertEquals(25, type.getLength()); + } + + @Test + public void testFormatParse() throws Exception { + + OffsetTime now = OffsetTime.now(); + String value = type.formatValue(now); + OffsetTime offsetTime = type.parse(value); + + assertEquals(now, offsetTime); + } + + @Test + public void testConvertDb() throws Exception { + + OffsetTime now = OffsetTime.now(); + String value = type.convertToDbString(now); + OffsetTime offsetTime = type.convertFromDbString(value); + + assertEquals(now, offsetTime); + } + +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java new file mode 100644 index 000000000..3db9b9bd2 --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java @@ -0,0 +1,56 @@ +package com.avaje.ebeaninternal.server.type; + +import org.junit.Test; + +import java.sql.Date; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.YearMonth; + +import static org.junit.Assert.*; + +public class ScalarTypeYearMonthDateTest { + + ScalarTypeYearMonthDate type = new ScalarTypeYearMonthDate(); + + @Test + public void testConvertFromMillis() throws Exception { + + LocalDate today = LocalDate.now(); + LocalDate firstMonthDay = today.withDayOfMonth(1); + Date date = Date.valueOf(firstMonthDay); + long epochMilli = date.getTime(); + + YearMonth yearMonth = type.convertFromMillis(epochMilli); + long val1 = type.convertToMillis(yearMonth); + + assertEquals(epochMilli, val1); + } + + @Test + public void testConvertDate() throws Exception { + + LocalDate today = LocalDate.now(); + LocalDate firstMonthDay = today.withDayOfMonth(1); + Date date = Date.valueOf(firstMonthDay); + + YearMonth yearMonth = type.convertFromDate(date); + Date date1 = type.convertToDate(yearMonth); + assertEquals(date, date1); + } + + + @Test + public void testToJdbcType() throws Exception { + + LocalDate today = LocalDate.now(); + LocalDate firstMonthDay = today.withDayOfMonth(1); + Date date = Date.valueOf(firstMonthDay); + + YearMonth yearMonth = type.toBeanType(date); + Object val1 = type.toJdbcType(yearMonth); + assertEquals(date, val1); + } + +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java index f43153b00..6c125b057 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -90,25 +90,10 @@ public class ScalarTypeYearTest { } @Test - public void testJsonRead() throws Exception { + public void testJson() throws Exception { - StringWriter writer = new StringWriter(); - JsonFactory factory = new JsonFactory(); - JsonGenerator generator = factory.createGenerator(writer); - generator.writeStartObject(); - type.jsonWrite(generator, "key", Year.of(2013)); - generator.writeEndObject(); - generator.flush(); - - JsonParser parser = factory.createParser(writer.toString()); - JsonToken token = parser.nextToken(); - assertEquals(JsonToken.START_OBJECT, token); - token = parser.nextToken(); - assertEquals(JsonToken.FIELD_NAME, token); - token = parser.nextToken(); - - Year year = type.jsonRead(parser, token); - assertEquals(Year.of(2013), year); + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(Year.of(2013)); } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java new file mode 100644 index 000000000..ac59b0da5 --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java @@ -0,0 +1,40 @@ +package com.avaje.ebeaninternal.server.type; + +import org.junit.Test; + +import java.time.ZoneId; + +import static org.junit.Assert.*; + +public class ScalarTypeZoneIdTest { + + ScalarTypeZoneId type = new ScalarTypeZoneId(); + + @Test + public void testGetLength() throws Exception { + + assertEquals(60, type.getLength()); + } + + @Test + public void testFormatParse() throws Exception { + + ZoneId zoneId = ZoneId.systemDefault(); + String value = type.formatValue(zoneId); + + ZoneId val1 = type.parse(value); + assertEquals(zoneId, val1); + } + + + @Test + public void testConvertDb() throws Exception { + + ZoneId zoneId = ZoneId.systemDefault(); + String value = type.convertToDbString(zoneId); + + ZoneId val1 = type.convertFromDbString(value); + assertEquals(zoneId, val1); + } + +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java new file mode 100644 index 000000000..d233a7418 --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java @@ -0,0 +1,46 @@ +package com.avaje.ebeaninternal.server.type; + +import org.junit.Test; + +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; + +import static org.junit.Assert.assertEquals; + +public class ScalarTypeZoneOffsetTest { + + ScalarTypeZoneOffset type = new ScalarTypeZoneOffset(); + + @Test + public void testGetLength() throws Exception { + + assertEquals(60, type.getLength()); + } + + @Test + public void testFormatParse() throws Exception { + + ZonedDateTime now = ZonedDateTime.now(); + ZoneOffset offset = now.getOffset(); + + String value = type.formatValue(offset); + + ZoneOffset val1 = type.parse(value); + assertEquals(offset, val1); + } + + + @Test + public void testConvertDb() throws Exception { + + ZonedDateTime now = ZonedDateTime.now(); + ZoneOffset offset = now.getOffset(); + + String value = type.convertToDbString(offset); + + ZoneId val1 = type.convertFromDbString(value); + assertEquals(offset, val1); + } + +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java new file mode 100644 index 000000000..31b3cae55 --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -0,0 +1,79 @@ +package com.avaje.ebeaninternal.server.type; + +import com.avaje.ebean.config.JsonConfig; +import org.junit.Test; + +import java.sql.Timestamp; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import static org.junit.Assert.*; + +public class ScalarTypeZonedDateTimeTest { + + + ScalarTypeZonedDateTime type = new ScalarTypeZonedDateTime(JsonConfig.DateTime.MILLIS); + + ZonedDateTime warmUp = ZonedDateTime.now(); + + @Test + public void testConvertToMillis() throws Exception { + + warmUp.hashCode(); + + long now = System.currentTimeMillis(); + long toMillis = type.convertToMillis(ZonedDateTime.now()); + + assertTrue(toMillis - now < 10); + + } + + @Test + public void testConvertFromTimestamp() throws Exception { + + Timestamp now = new Timestamp(System.currentTimeMillis()); + + ZonedDateTime val1 = type.convertFromTimestamp(now); + Timestamp timestamp = type.convertToTimestamp(val1); + + assertEquals(now, timestamp); + } + + + @Test + public void testToJdbcType() throws Exception { + + Object jdbcType = type.toJdbcType(ZonedDateTime.now()); + assertTrue(jdbcType instanceof Timestamp); + } + + @Test + public void testToBeanType() throws Exception { + + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + ZonedDateTime localDateTime = type.toBeanType(timestamp); + + assertNotNull(localDateTime); + + Timestamp timestamp1 = type.convertToTimestamp(localDateTime); + assertEquals(timestamp, timestamp1); + + } + + @Test + public void testJson() throws Exception { + + ZonedDateTime now = ZonedDateTime.now(); + + JsonTester jsonTester = new JsonTester(type); + jsonTester.test(now); + + ScalarTypeZonedDateTime typeNanos = new ScalarTypeZonedDateTime(JsonConfig.DateTime.NANOS); + jsonTester = new JsonTester(typeNanos); + jsonTester.test(now); + + ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601); + jsonTester = new JsonTester(typeIso); + jsonTester.test(now); + } +} \ No newline at end of file diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java index 0049ae40b..9a760a3d8 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java @@ -15,7 +15,7 @@ public class TestScalarTypeUUIDBinaryConversion { byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id); Assert.assertEquals(16, bytes.length); - UUID id2 = (UUID)ScalarTypeUUIDBinary.convertFromBytes(bytes); + UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes); Assert.assertEquals(id, id2); } diff --git a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java new file mode 100644 index 000000000..2267f3bca --- /dev/null +++ b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java @@ -0,0 +1,142 @@ +package com.avaje.tests.model.types; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Version; +import java.time.*; + +@Entity +public class SomeNewTypesBean { + + @Id + Long id; + + @Version + Long version; + + DayOfWeek dayOfWeek; + + Month month; + + Year year; + + YearMonth yearMonth; + + LocalDate localDate; + + LocalDateTime localDateTime; + + OffsetDateTime offsetDateTime; + + ZonedDateTime zonedDateTime; + + Instant instant; + + ZoneId zoneId; + + ZoneOffset zoneOffset; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public DayOfWeek getDayOfWeek() { + return dayOfWeek; + } + + public void setDayOfWeek(DayOfWeek dayOfWeek) { + this.dayOfWeek = dayOfWeek; + } + + public Month getMonth() { + return month; + } + + public void setMonth(Month month) { + this.month = month; + } + + public Year getYear() { + return year; + } + + public void setYear(Year year) { + this.year = year; + } + + public YearMonth getYearMonth() { + return yearMonth; + } + + public void setYearMonth(YearMonth yearMonth) { + this.yearMonth = yearMonth; + } + + public LocalDate getLocalDate() { + return localDate; + } + + public void setLocalDate(LocalDate localDate) { + this.localDate = localDate; + } + + public LocalDateTime getLocalDateTime() { + return localDateTime; + } + + public void setLocalDateTime(LocalDateTime localDateTime) { + this.localDateTime = localDateTime; + } + + public OffsetDateTime getOffsetDateTime() { + return offsetDateTime; + } + + public void setOffsetDateTime(OffsetDateTime offsetDateTime) { + this.offsetDateTime = offsetDateTime; + } + + public ZonedDateTime getZonedDateTime() { + return zonedDateTime; + } + + public void setZonedDateTime(ZonedDateTime zonedDateTime) { + this.zonedDateTime = zonedDateTime; + } + + public Instant getInstant() { + return instant; + } + + public void setInstant(Instant instant) { + this.instant = instant; + } + + public ZoneId getZoneId() { + return zoneId; + } + + public void setZoneId(ZoneId zoneId) { + this.zoneId = zoneId; + } + + public ZoneOffset getZoneOffset() { + return zoneOffset; + } + + public void setZoneOffset(ZoneOffset zoneOffset) { + this.zoneOffset = zoneOffset; + } +} diff --git a/src/test/java/com/avaje/tests/types/TestNewTypes.java b/src/test/java/com/avaje/tests/types/TestNewTypes.java new file mode 100644 index 000000000..9e738879a --- /dev/null +++ b/src/test/java/com/avaje/tests/types/TestNewTypes.java @@ -0,0 +1,89 @@ +package com.avaje.tests.types; + +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.tests.model.types.SomeNewTypesBean; +import org.junit.Test; + +import java.io.IOException; +import java.time.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +public class TestNewTypes extends BaseTestCase { + + @Test + public void testInsertUpdate() throws IOException { + + SomeNewTypesBean bean = new SomeNewTypesBean(); + bean.setLocalDate(LocalDate.now()); + bean.setLocalDateTime(LocalDateTime.now()); + bean.setOffsetDateTime(OffsetDateTime.now()); + bean.setZonedDateTime(ZonedDateTime.now()); + bean.setInstant(Instant.now()); + bean.setYear(Year.now()); + bean.setMonth(Month.APRIL); + bean.setDayOfWeek(DayOfWeek.WEDNESDAY); + bean.setZoneId(ZoneId.systemDefault()); + bean.setZoneOffset(ZonedDateTime.now().getOffset()); + bean.setYearMonth(YearMonth.of(2014, 9)); + + + Ebean.save(bean); + + bean.setYear(Year.now().minusYears(2)); + bean.setMonth(Month.SEPTEMBER); + + Ebean.save(bean); + + SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId()); + + assertEquals(bean.getZoneId(), fetched.getZoneId()); + assertEquals(bean.getZoneOffset(), fetched.getZoneOffset()); + assertEquals(bean.getMonth(), fetched.getMonth()); + assertEquals(bean.getYear(), fetched.getYear()); + assertEquals(bean.getYearMonth(), fetched.getYearMonth()); + assertEquals(bean.getLocalDate(), fetched.getLocalDate()); + assertEquals(bean.getLocalDateTime(), fetched.getLocalDateTime()); + assertEquals(bean.getOffsetDateTime(), fetched.getOffsetDateTime()); + assertEquals(bean.getInstant(), fetched.getInstant()); + + String asJson = Ebean.json().toJson(fetched); + System.out.println(asJson); + + SomeNewTypesBean toBean = Ebean.json().toBean(SomeNewTypesBean.class, asJson); + + assertEquals(bean.getZoneId(), toBean.getZoneId()); + assertEquals(bean.getZoneOffset(), toBean.getZoneOffset()); + assertEquals(bean.getMonth(), toBean.getMonth()); + assertEquals(bean.getYear(), toBean.getYear()); + assertEquals(bean.getYearMonth(), toBean.getYearMonth()); + assertEquals(bean.getLocalDate(), toBean.getLocalDate()); + assertEquals(bean.getLocalDateTime(), toBean.getLocalDateTime()); + assertEquals(bean.getOffsetDateTime(), toBean.getOffsetDateTime()); + assertEquals(bean.getInstant(), toBean.getInstant()); + + } + + @Test + public void testInsertNull() { + + SomeNewTypesBean bean = new SomeNewTypesBean(); + + Ebean.save(bean); + + SomeNewTypesBean fetched = Ebean.find(SomeNewTypesBean.class, bean.getId()); + + assertNull(fetched.getZoneId()); + assertNull(fetched.getZoneOffset()); + assertNull(fetched.getMonth()); + assertNull(fetched.getYear()); + assertNull(fetched.getYearMonth()); + assertNull(fetched.getLocalDate()); + assertNull(fetched.getLocalDateTime()); + assertNull(fetched.getOffsetDateTime()); + assertNull(fetched.getInstant()); + + } +}