Simplify DateTimeType handling for InfluxDB

Signed-off-by: Jacob Laursen <[email protected]>

Author: jlaur

bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java

@@ -14,8 +14,6 @@
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.util.TimeZone;
 
 import javax.measure.Unit;
 
@@ -85,7 +83,7 @@ public static Object stateToObject(State state) {
         } else if (state instanceof OpenClosedType) {
             value = state == OpenClosedType.OPEN ? DIGITAL_VALUE_ON : DIGITAL_VALUE_OFF;
         } else if (state instanceof DateTimeType type) {
-            value = type.getZonedDateTime().toInstant().toEpochMilli();
+            value = type.getInstant().toEpochMilli();
         } else {
             value = state.toFullString();
         }
@@ -140,9 +138,7 @@ public static State objectToState(@Nullable Object value, Item itemToSetState) {
         } else if (item instanceof RollershutterItem) {
             return new PercentType(valueStr);
         } else if (item instanceof DateTimeItem) {
-            Instant i = Instant.ofEpochMilli(new BigDecimal(valueStr).longValue());
-            ZonedDateTime z = ZonedDateTime.ofInstant(i, TimeZone.getDefault().toZoneId());
-            return new DateTimeType(z);
+            return new DateTimeType(Instant.ofEpochMilli(new BigDecimal(valueStr).longValue()));
         } else if (item instanceof PlayerItem) {
             try {
                 return PlayPauseType.valueOf(valueStr);

bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java

@@ -21,7 +21,6 @@
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
 import javax.measure.Unit;
@@ -130,8 +129,7 @@ public void convertDateTimeToState() {
         long val = System.currentTimeMillis();
         DateTimeItem item = new DateTimeItem("name");
 
-        DateTimeType expected = new DateTimeType(
-                ZonedDateTime.ofInstant(Instant.ofEpochMilli(val), ZoneId.systemDefault()));
+        DateTimeType expected = new DateTimeType(Instant.ofEpochMilli(val));
         assertThat(InfluxDBStateConvertUtils.objectToState(val, item), equalTo(expected));
     }