public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ClassCastException for LocalDateTime (#13425)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen
2022-09-21 19:10:02 +02:00
committed by GitHub
parent 487811fdfd
commit 3e5dde0474
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/db/JdbcBaseDAO.java
View File

@@ -583,8 +583,14 @@ public class JdbcBaseDAO {
return ((Number) v).longValue(); return ((Number) v).longValue();
} else if (v instanceof java.sql.Date) { } else if (v instanceof java.sql.Date) {
return ((java.sql.Date) v).getTime(); return ((java.sql.Date) v).getTime();
} else if (v instanceof LocalDateTime) {
return ((LocalDateTime) v).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
} else if (v instanceof Instant) {
return ((Instant) v).toEpochMilli();
} else if (v instanceof java.sql.Timestamp) {
return ((java.sql.Timestamp) v).getTime();
} }
return ((java.sql.Timestamp) v).getTime(); throw new UnsupportedOperationException("Date of type " + v.getClass().getName() + " is not supported");
} }
protected Integer objectAsInteger(Object v) { protected Integer objectAsInteger(Object v) {

5
bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/db/JdbcBaseDAOTest.java
View File

@@ -89,6 +89,11 @@ public class JdbcBaseDAOTest {
assertInstanceOf(DateTimeType.class, dateTimeType); assertInstanceOf(DateTimeType.class, dateTimeType);
assertThat(dateTimeType, is(DateTimeType.valueOf("2021-02-01T23:30:02.049"))); assertThat(dateTimeType, is(DateTimeType.valueOf("2021-02-01T23:30:02.049")));
dateTimeType = jdbcBaseDAO.objectAsState(new DateTimeItem("testDateTimeItem"), null,
LocalDateTime.parse("2021-02-01T23:30:02.049"));
assertInstanceOf(DateTimeType.class, dateTimeType);
assertThat(dateTimeType, is(DateTimeType.valueOf("2021-02-01T23:30:02.049")));
State hsbType = jdbcBaseDAO.objectAsState(new ColorItem("testColorItem"), null, "184,100,52"); State hsbType = jdbcBaseDAO.objectAsState(new ColorItem("testColorItem"), null, "184,100,52");
assertInstanceOf(HSBType.class, hsbType); assertInstanceOf(HSBType.class, hsbType);
assertThat(hsbType, is(HSBType.valueOf("184,100,52"))); assertThat(hsbType, is(HSBType.valueOf("184,100,52")));