github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#658 - REFACTOR: Simplify LocalDateTime -> Timestamp conversion, use Timestamp.valueOf()

Browse Source
This commit is contained in:
Robin Bygrave
2016-04-21 20:11:39 +12:00
parent 00d4298065
commit 523ddbab63
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+7 -10
View File
@@ -6,7 +6,6 @@ import java.sql.Timestamp;
import java.sql.Types;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
/**
* ScalarType for java.sql.Timestamp.
@@ -24,7 +23,7 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
@Override
public long convertToMillis(LocalDateTime value) {
return value.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
return Timestamp.valueOf(value).getTime();
}
@Override
@@ -33,20 +32,18 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
}
@Override
protected String toJsonISO8601(LocalDateTime value) {
return value.atZone(ZoneId.systemDefault()).toInstant().toString();
protected String toJsonISO8601(LocalDateTime dateTime) {
return dateTime.atZone(ZoneId.systemDefault()).toInstant().toString();
}
@Override
public LocalDateTime convertFromTimestamp(Timestamp ts) {
return ts.toLocalDateTime();
public LocalDateTime convertFromTimestamp(Timestamp timestamp) {
return timestamp.toLocalDateTime();
}
@Override
public Timestamp convertToTimestamp(LocalDateTime t) {
ZonedDateTime zonedDateTime = t.atZone(ZoneId.systemDefault());
return Timestamp.from(zonedDateTime.toInstant());
public Timestamp convertToTimestamp(LocalDateTime dateTime) {
return Timestamp.valueOf(dateTime);
}
@Override