Skip to content

Commit 62a565b

Browse files
committed
repair ZonedDateTime as well
some refactoring
1 parent ef077e8 commit 62a565b

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

src/main/java/info/unterrainer/commons/parentpom/Information.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public class Information {
44
public static final String name = "Parent-POM";
5-
public static final String buildTime = "2021-03-05T08:10:04Z";
5+
public static final String buildTime = "2021-03-05T08:13:18Z";
66
public static final String pomVersion = "0.1.3";
77
}

src/main/java/info/unterrainer/commons/rdbutils/converters/LocalDateTimeConverter.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@
1212
@Converter()
1313
public class LocalDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
1414

15-
DateUtils u;
16-
1715
@Override
18-
public Timestamp convertToDatabaseColumn(final LocalDateTime attribute) {
19-
return attribute == null ? null
20-
: new Timestamp(DateUtils.utcLocalDateTimeToEpoch(attribute.truncatedTo(ChronoUnit.MICROS)));
16+
public Timestamp convertToDatabaseColumn(final LocalDateTime entityValue) {
17+
return entityValue == null ? null
18+
: new Timestamp(DateUtils.utcLocalDateTimeToEpoch(entityValue.truncatedTo(ChronoUnit.MICROS)));
2119
}
2220

2321
@Override
24-
public LocalDateTime convertToEntityAttribute(final Timestamp dbData) {
25-
return dbData == null ? null : DateUtils.epochToUtcLocalDateTime(dbData.getTime());
22+
public LocalDateTime convertToEntityAttribute(final Timestamp dbValue) {
23+
return dbValue == null ? null : DateUtils.epochToUtcLocalDateTime(dbValue.getTime());
2624
}
2725
}

src/main/java/info/unterrainer/commons/rdbutils/converters/ZonedDateTimeConverter.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77
import javax.persistence.AttributeConverter;
88
import javax.persistence.Converter;
99

10+
import info.unterrainer.commons.jreutils.DateUtils;
11+
1012
@Converter(autoApply = true)
1113
public class ZonedDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
1214

1315
@Override
14-
public Timestamp convertToDatabaseColumn(final java.time.LocalDateTime entityValue) {
15-
return entityValue == null ? null : Timestamp.valueOf(entityValue.truncatedTo(ChronoUnit.MICROS));
16+
public Timestamp convertToDatabaseColumn(final LocalDateTime entityValue) {
17+
return entityValue == null ? null
18+
: new Timestamp(DateUtils.utcLocalDateTimeToEpoch(entityValue.truncatedTo(ChronoUnit.MICROS)));
1619
}
1720

1821
@Override
1922
public LocalDateTime convertToEntityAttribute(final Timestamp dbValue) {
20-
return dbValue == null ? null : dbValue.toLocalDateTime();
23+
return dbValue == null ? null : DateUtils.epochToUtcLocalDateTime(dbValue.getTime());
2124
}
2225
}

0 commit comments

Comments
 (0)