mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
#578 - Deprecated Joda Time API - LocalDate.toDateMidnight() usage causes exception to be thrown, change to LocalDate.toDateTimeAtStartOfDay()
This commit is contained in:
@@ -15,25 +15,30 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
|
||||
super(LocalDate.class, false, Types.DATE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocalDate convertFromMillis(long systemTimeMillis) {
|
||||
return new LocalDate(systemTimeMillis);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long convertToMillis(LocalDate value) {
|
||||
return value.toDateMidnight().getMillis();
|
||||
return value.toDateTimeAtStartOfDay().getMillis();
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocalDate convertFromDate(Date ts) {
|
||||
return new LocalDate(ts.getTime());
|
||||
public LocalDate convertFromDate(Date date) {
|
||||
return new LocalDate(date.getTime());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Date convertToDate(LocalDate t) {
|
||||
return new java.sql.Date(t.toDateTimeAtStartOfDay().getMillis());
|
||||
public Date convertToDate(LocalDate value) {
|
||||
return new java.sql.Date(convertToMillis(value));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object toJdbcType(Object value) {
|
||||
if (value instanceof LocalDate) {
|
||||
return new java.sql.Date(((LocalDate) value).toDateMidnight().getMillis());
|
||||
return convertToDate((LocalDate) value);
|
||||
}
|
||||
return BasicTypeConverter.toDate(value);
|
||||
}
|
||||
@@ -41,14 +46,9 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
|
||||
@Override
|
||||
public LocalDate toBeanType(Object value) {
|
||||
if (value instanceof java.util.Date) {
|
||||
return new LocalDate(((java.util.Date) value).getTime());
|
||||
return convertFromMillis(((java.util.Date) value).getTime());
|
||||
}
|
||||
return (LocalDate) value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocalDate convertFromMillis(long systemTimeMillis) {
|
||||
return new LocalDate(systemTimeMillis);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user