Simplify DateTimeType handling for MongoDB

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
openhab · Nov 25, 2024 · e34093e · e34093e
1 parent 157164c
commit e34093e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/...ongodb/src/main/java/org/openhab/persistence/mongodb/internal/MongoDBTypeConversions.java b/...ongodb/src/main/java/org/openhab/persistence/mongodb/internal/MongoDBTypeConversions.java
@@ -125,7 +125,7 @@ public static Object convertValue(State state) {
             HSBType.class, State::toString, //
             QuantityType.class, state -> ((QuantityType<?>) state).toBigDecimal().doubleValue(), //
             PercentType.class, state -> ((PercentType) state).intValue(), //
-            DateTimeType.class, state -> ((DateTimeType) state).getZonedDateTime().toString(), //
+            DateTimeType.class, state -> ((DateTimeType) state).getInstant().atZone(ZoneId.systemDefault()).toString(), //
             StringListType.class, State::toString, //
             DecimalType.class, state -> ((DecimalType) state).toBigDecimal().doubleValue(), //
             RawType.class, MongoDBTypeConversions::handleRawType//
@@ -237,7 +237,7 @@ private static State handleDateTimeItem(Item item, Document doc) {
         if (value instanceof String) {
             return new DateTimeType(ZonedDateTime.parse(doc.getString(MongoDBFields.FIELD_VALUE)));
         } else {
-            return new DateTimeType(ZonedDateTime.ofInstant(((Date) value).toInstant(), ZoneId.systemDefault()));
+            return new DateTimeType(((Date) value).toInstant());
         }
     }
 

diff --git a/...ce.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java b/...ce.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java
@@ -18,6 +18,7 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -212,7 +213,7 @@ public static Stream<Arguments> provideOpenhabItemTypes() {
                 Arguments.of(DataCreationHelper.createItem(RollershutterItem.class, "RollershutterItem",
                         new PercentType(30))),
                 Arguments.of(DataCreationHelper.createItem(DateTimeItem.class, "DateTimeItem",
-                        new DateTimeType(ZonedDateTime.now()))),
+                        new DateTimeType(Instant.now()))),
                 Arguments.of(DataCreationHelper.createItem(ColorItem.class, "ColorItem", new HSBType("180,100,100"))),
                 Arguments.of(
                         DataCreationHelper.createItem(LocationItem.class, "LocationItem", new PointType("51.0,0.0"))),
@@ -397,7 +398,7 @@ private static Object convertValue(State state) {
             value = type.toBigDecimal().doubleValue();
         } else if (state instanceof DateTimeType) {
             DateTimeType type = (DateTimeType) state;
-            value = Date.from(type.getZonedDateTime().toInstant());
+            value = Date.from(type.getInstant());
         } else if (state instanceof DecimalType) {
             DecimalType type = (DecimalType) state;
             value = type.toBigDecimal().doubleValue();

diff --git a/...src/test/java/org/openhab/persistence/mongodb/internal/MongoDBPersistenceServiceTest.java b/...src/test/java/org/openhab/persistence/mongodb/internal/MongoDBPersistenceServiceTest.java
@@ -699,8 +699,9 @@ public void testOldDataQueryAllOpenhabItemTypesSingleCollection(GenericItem item
 
             if (item instanceof DateTimeItem) {
                 // verify just the date part
-                assertEquals(((DateTimeType) item.getState()).getZonedDateTime().toLocalDate(),
-                        ((DateTimeType) result.iterator().next().getState()).getZonedDateTime().toLocalDate());
+                assertEquals(((DateTimeType) item.getState()).getInstant().atZone(ZoneId.systemDefault()).toLocalDate(),
+                        ((DateTimeType) result.iterator().next().getState()).getInstant().atZone(ZoneId.systemDefault())
+                                .toLocalDate());
             } else {
                 VerificationHelper.verifyQueryResult(result, item.getState());
             }

diff --git a/...ce.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/VerificationHelper.java b/...ce.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/VerificationHelper.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -176,7 +177,8 @@ private static Pair<Object, Object> handleDecimalType(Object ev, Document doc) {
 
     private static Pair<Object, Object> handleDateTimeType(Object ev, Document doc) {
         String value = doc.getString(MongoDBFields.FIELD_VALUE);
-        return Pair.of(((DateTimeType) ev).getZonedDateTime().toString(), value != null ? value : new Object());
+        return Pair.of(((DateTimeType) ev).getInstant().atZone(ZoneId.systemDefault()).toString(),
+                value != null ? value : new Object());
     }
 
     private static Pair<Object, Object> handlePercentType(Object ev, Document doc) {