From 10686b08b13767dd395e03286a9416fd5418f515 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 19:50:21 +0100
Subject: [PATCH 01/52] Simplify DateTimeType handling for Automower

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/AutomowerHandlerFactory.java     |  9 +++----
 .../internal/things/AutomowerHandler.java     | 26 +++----------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerHandlerFactory.java b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerHandlerFactory.java
index 6f5b5108ddcac..70187832151ff 100644
--- a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerHandlerFactory.java
+++ b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/AutomowerHandlerFactory.java
@@ -27,7 +27,6 @@
 import org.openhab.binding.automower.internal.things.AutomowerHandler;
 import org.openhab.core.auth.client.oauth2.OAuthFactory;
 import org.openhab.core.config.discovery.DiscoveryService;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
@@ -56,14 +55,12 @@ public class AutomowerHandlerFactory extends BaseThingHandlerFactory {
     private final OAuthFactory oAuthFactory;
     protected final @NonNullByDefault({}) HttpClient httpClient;
     private @Nullable ServiceRegistration<?> automowerDiscoveryServiceRegistration;
-    private final TimeZoneProvider timeZoneProvider;
 
     @Activate
-    public AutomowerHandlerFactory(@Reference OAuthFactory oAuthFactory, @Reference HttpClientFactory httpClientFactory,
-            @Reference TimeZoneProvider timeZoneProvider) {
+    public AutomowerHandlerFactory(@Reference OAuthFactory oAuthFactory,
+            @Reference HttpClientFactory httpClientFactory) {
         this.oAuthFactory = oAuthFactory;
         this.httpClient = httpClientFactory.getCommonHttpClient();
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -80,7 +77,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         }
 
         if (AutomowerHandler.SUPPORTED_THING_TYPES.contains(thing.getThingTypeUID())) {
-            return new AutomowerHandler(thing, timeZoneProvider);
+            return new AutomowerHandler(thing);
         }
 
         return null;
diff --git a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java
index b0a87a253cd4b..1a8b9ef1faca1 100644
--- a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java
+++ b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java
@@ -15,7 +15,6 @@
 import static org.openhab.binding.automower.internal.AutomowerBindingConstants.*;
 
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
@@ -36,7 +35,6 @@
 import org.openhab.binding.automower.internal.rest.api.automowerconnect.dto.RestrictedReason;
 import org.openhab.binding.automower.internal.rest.api.automowerconnect.dto.State;
 import org.openhab.binding.automower.internal.rest.exceptions.AutomowerCommunicationException;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.PointType;
@@ -76,7 +74,6 @@ public class AutomowerHandler extends BaseThingHandler {
     private static final long DEFAULT_POLLING_INTERVAL_S = TimeUnit.MINUTES.toSeconds(10);
 
     private final Logger logger = LoggerFactory.getLogger(AutomowerHandler.class);
-    private final TimeZoneProvider timeZoneProvider;
 
     private AtomicReference<String> automowerId = new AtomicReference<>(NO_ID);
     private long lastQueryTimeMs = 0L;
@@ -97,9 +94,8 @@ public class AutomowerHandler extends BaseThingHandler {
         }
     };
 
-    public AutomowerHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
+    public AutomowerHandler(Thing thing) {
         super(thing);
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -287,7 +283,7 @@ private void updateChannelState(@Nullable Mower mower) {
             }
 
             updateState(CHANNEL_STATUS_LAST_UPDATE,
-                    new DateTimeType(toZonedDateTime(mower.getAttributes().getMetadata().getStatusTimestamp())));
+                    new DateTimeType(Instant.ofEpochMilli(mower.getAttributes().getMetadata().getStatusTimestamp())));
             updateState(CHANNEL_STATUS_BATTERY,
                     new QuantityType<>(mower.getAttributes().getBattery().getBatteryPercent(), Units.PERCENT));
 
@@ -297,7 +293,7 @@ private void updateChannelState(@Nullable Mower mower) {
             if (errorCodeTimestamp == 0L) {
                 updateState(CHANNEL_STATUS_ERROR_TIMESTAMP, UnDefType.NULL);
             } else {
-                updateState(CHANNEL_STATUS_ERROR_TIMESTAMP, new DateTimeType(toZonedDateTime(errorCodeTimestamp)));
+                updateState(CHANNEL_STATUS_ERROR_TIMESTAMP, new DateTimeType(Instant.ofEpochMilli(errorCodeTimestamp)));
             }
 
             long nextStartTimestamp = mower.getAttributes().getPlanner().getNextStartTimestamp();
@@ -305,7 +301,7 @@ private void updateChannelState(@Nullable Mower mower) {
             if (nextStartTimestamp == 0L) {
                 updateState(CHANNEL_PLANNER_NEXT_START, UnDefType.NULL);
             } else {
-                updateState(CHANNEL_PLANNER_NEXT_START, new DateTimeType(toZonedDateTime(nextStartTimestamp)));
+                updateState(CHANNEL_PLANNER_NEXT_START, new DateTimeType(Instant.ofEpochMilli(nextStartTimestamp)));
             }
             updateState(CHANNEL_PLANNER_OVERRIDE_ACTION,
                     new StringType(mower.getAttributes().getPlanner().getOverride().getAction()));
@@ -339,18 +335,4 @@ private void initializeProperties(@Nullable Mower mower) {
 
         updateProperties(properties);
     }
-
-    /**
-     * Converts timestamp returned by the Automower API into local time-zone.
-     * Timestamp returned by the API doesn't have offset and it always in the current time zone - it can be treated as
-     * UTC.
-     * Method builds a ZonedDateTime with same hour value but in the current system timezone.
-     *
-     * @param timestamp - Automower API timestamp
-     * @return ZonedDateTime in system timezone
-     */
-    private ZonedDateTime toZonedDateTime(long timestamp) {
-        Instant timestampInstant = Instant.ofEpochMilli(timestamp);
-        return ZonedDateTime.ofInstant(timestampInstant, timeZoneProvider.getTimeZone());
-    }
 }

From ad21f636970ab302e265d3c3a3aa34ee8437205f Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 11 Nov 2024 20:28:16 +0100
Subject: [PATCH 02/52] Simplify DateTimeType handling for aWATTar

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../org/openhab/binding/awattar/internal/AwattarUtil.java   | 5 -----
 .../awattar/internal/handler/AwattarBestPriceHandler.java   | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarUtil.java b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarUtil.java
index e6ba28341c077..37ee5e6695585 100644
--- a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarUtil.java
+++ b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/AwattarUtil.java
@@ -21,7 +21,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.i18n.TimeZoneProvider;
-import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.unit.Units;
 
@@ -47,10 +46,6 @@ public static ZonedDateTime getCalendarForHour(int hour, ZoneId zone) {
         return ZonedDateTime.now(zone).truncatedTo(ChronoUnit.DAYS).plusHours(hour);
     }
 
-    public static DateTimeType getDateTimeType(long time, TimeZoneProvider tz) {
-        return new DateTimeType(ZonedDateTime.ofInstant(Instant.ofEpochMilli(time), tz.getTimeZone()));
-    }
-
     public static QuantityType<Time> getDuration(long millis) {
         long minutes = millis / 60000;
         return QuantityType.valueOf(minutes, Units.MINUTE);
diff --git a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestPriceHandler.java b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestPriceHandler.java
index 39540ae5de466..3c92426dd3c46 100644
--- a/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestPriceHandler.java
+++ b/bundles/org.openhab.binding.awattar/src/main/java/org/openhab/binding/awattar/internal/handler/AwattarBestPriceHandler.java
@@ -20,7 +20,6 @@
 import static org.openhab.binding.awattar.internal.AwattarBindingConstants.CHANNEL_REMAINING;
 import static org.openhab.binding.awattar.internal.AwattarBindingConstants.CHANNEL_START;
 import static org.openhab.binding.awattar.internal.AwattarUtil.getCalendarForHour;
-import static org.openhab.binding.awattar.internal.AwattarUtil.getDateTimeType;
 import static org.openhab.binding.awattar.internal.AwattarUtil.getDuration;
 import static org.openhab.binding.awattar.internal.AwattarUtil.getMillisToNextMinute;
 
@@ -43,6 +42,7 @@
 import org.openhab.binding.awattar.internal.AwattarNonConsecutiveBestPriceResult;
 import org.openhab.binding.awattar.internal.AwattarPrice;
 import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
@@ -188,10 +188,10 @@ public void refreshChannel(ChannelUID channelUID) {
                 state = OnOffType.from(result.isActive());
                 break;
             case CHANNEL_START:
-                state = getDateTimeType(result.getStart(), timeZoneProvider);
+                state = new DateTimeType(Instant.ofEpochMilli(result.getStart()));
                 break;
             case CHANNEL_END:
-                state = getDateTimeType(result.getEnd(), timeZoneProvider);
+                state = new DateTimeType(Instant.ofEpochMilli(result.getEnd()));
                 break;
             case CHANNEL_COUNTDOWN:
                 diff = result.getStart() - Instant.now().toEpochMilli();

From 4293ee8bfba28787804502158f02a4e9f329f300 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 16 Nov 2024 12:22:01 +0100
Subject: [PATCH 03/52] Simplify DateTimeType handling for Broadlink

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/handler/FloureonThermostatHandler.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.broadlinkthermostat/src/main/java/org/openhab/binding/broadlinkthermostat/internal/handler/FloureonThermostatHandler.java b/bundles/org.openhab.binding.broadlinkthermostat/src/main/java/org/openhab/binding/broadlinkthermostat/internal/handler/FloureonThermostatHandler.java
index 585bcea6fa68d..a43e94c449369 100644
--- a/bundles/org.openhab.binding.broadlinkthermostat/src/main/java/org/openhab/binding/broadlinkthermostat/internal/handler/FloureonThermostatHandler.java
+++ b/bundles/org.openhab.binding.broadlinkthermostat/src/main/java/org/openhab/binding/broadlinkthermostat/internal/handler/FloureonThermostatHandler.java
@@ -16,6 +16,7 @@
 
 import java.io.IOException;
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -212,7 +213,7 @@ private void handleRemoteLockCommand(ChannelUID channelUID, Command command) {
 
     private void handleSetTimeCommand(ChannelUID channelUID, Command command) {
         if (command instanceof DateTimeType dateTimeCommand) {
-            ZonedDateTime zonedDateTime = dateTimeCommand.getZonedDateTime();
+            ZonedDateTime zonedDateTime = dateTimeCommand.getInstant().atZone(ZoneId.systemDefault());
             try {
                 new SetTimeCommand(tob(zonedDateTime.getHour()), tob(zonedDateTime.getMinute()),
                         tob(zonedDateTime.getSecond()), tob(zonedDateTime.getDayOfWeek().getValue()))

From 7a2244945c14a0c2e14bd5a20766eb21cb03f4a0 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:09:59 +0100
Subject: [PATCH 04/52] Simplify DateTimeType handling for deCONZ

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../test/java/org/openhab/binding/deconz/DeconzTest.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java b/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java
index e8eff1e747348..d17bd44e90cc0 100644
--- a/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java
+++ b/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java
@@ -19,8 +19,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -119,10 +118,9 @@ public static <T> T getObjectFromJson(String filename, Class<T> clazz, Gson gson
     @Test
     public void dateTimeConversionTest() {
         DateTimeType dateTime = Util.convertTimestampToDateTime("2020-08-22T11:09Z");
-        assertEquals(new DateTimeType(ZonedDateTime.parse("2020-08-22T11:09:00Z")), dateTime);
+        assertEquals(new DateTimeType(Instant.parse("2020-08-22T11:09:00Z")), dateTime);
 
         dateTime = Util.convertTimestampToDateTime("2020-08-22T11:09:47");
-        assertEquals(new DateTimeType(ZonedDateTime.parse("2020-08-22T11:09:47Z")).toZone(ZoneId.systemDefault()),
-                dateTime);
+        assertEquals(new DateTimeType(Instant.parse("2020-08-22T11:09:47Z")), dateTime);
     }
 }

From 4a49239e33898d70d813ede142a7fb0249f3f68a Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Thu, 14 Nov 2024 22:36:58 +0100
Subject: [PATCH 05/52] Simplify DateTimeType handling for DWD Unwetter

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/dto/DwdWarningsDataTest.java     | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/bundles/org.openhab.binding.dwdunwetter/src/test/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsDataTest.java b/bundles/org.openhab.binding.dwdunwetter/src/test/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsDataTest.java
index 96b8207eecec9..c9bf4317b4434 100644
--- a/bundles/org.openhab.binding.dwdunwetter/src/test/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsDataTest.java
+++ b/bundles/org.openhab.binding.dwdunwetter/src/test/java/org/openhab/binding/dwdunwetter/internal/dto/DwdWarningsDataTest.java
@@ -21,7 +21,6 @@
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
-import java.time.ZoneId;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -105,31 +104,22 @@ public void testGetCeiling() {
 
     @Test
     public void testGetExpires() {
-        // Conversion is needed as getExpires returns the Date with the System Default Zone
-        assertThat(((DateTimeType) warningsData.getExpires(0)).getZonedDateTime().withZoneSameInstant(ZoneId.of("UTC"))
-                .toString(), is("2018-12-22T18:00Z[UTC]"));
-        assertThat(((DateTimeType) warningsData.getExpires(1)).getZonedDateTime().withZoneSameInstant(ZoneId.of("UTC"))
-                .toString(), is("2018-12-23T01:00Z[UTC]"));
+        assertThat(((DateTimeType) warningsData.getExpires(0)).getInstant().toString(), is("2018-12-22T18:00:00Z"));
+        assertThat(((DateTimeType) warningsData.getExpires(1)).getInstant().toString(), is("2018-12-23T01:00:00Z"));
         assertThat(warningsData.getExpires(2), is(UnDefType.UNDEF));
     }
 
     @Test
     public void testGetOnset() {
-        // Conversion is needed as getOnset returns the Date with the System Default Zone
-        assertThat(((DateTimeType) warningsData.getOnset(0)).getZonedDateTime().withZoneSameInstant(ZoneId.of("UTC"))
-                .toString(), is("2018-12-21T10:00Z[UTC]"));
-        assertThat(((DateTimeType) warningsData.getOnset(1)).getZonedDateTime().withZoneSameInstant(ZoneId.of("UTC"))
-                .toString(), is("2018-12-22T18:00Z[UTC]"));
+        assertThat(((DateTimeType) warningsData.getOnset(0)).getInstant().toString(), is("2018-12-21T10:00:00Z"));
+        assertThat(((DateTimeType) warningsData.getOnset(1)).getInstant().toString(), is("2018-12-22T18:00:00Z"));
         assertThat(warningsData.getOnset(2), is(UnDefType.UNDEF));
     }
 
     @Test
     public void testGetEffective() {
-        // Conversion is needed as getEffective returns the Date with the System Default Zone
-        assertThat(((DateTimeType) warningsData.getEffective(0)).getZonedDateTime()
-                .withZoneSameInstant(ZoneId.of("UTC")).toString(), is("2018-12-22T03:02Z[UTC]"));
-        assertThat(((DateTimeType) warningsData.getEffective(1)).getZonedDateTime()
-                .withZoneSameInstant(ZoneId.of("UTC")).toString(), is("2018-12-22T10:15Z[UTC]"));
+        assertThat(((DateTimeType) warningsData.getEffective(0)).getInstant().toString(), is("2018-12-22T03:02:00Z"));
+        assertThat(((DateTimeType) warningsData.getEffective(1)).getInstant().toString(), is("2018-12-22T10:15:00Z"));
         assertThat(warningsData.getEffective(2), is(UnDefType.UNDEF));
     }
 

From 9d993ca8a3566696fba805528e66e3944408abb6 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 10 Nov 2024 21:27:11 +0100
Subject: [PATCH 06/52] Simplify DateTimeType handling for Ecovacs

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../ecovacs/internal/handler/EcovacsVacuumHandler.java        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java
index ea4b782091c96..8a9953c551cd3 100644
--- a/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java
+++ b/bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java
@@ -14,7 +14,6 @@
 
 import static org.openhab.binding.ecovacs.internal.EcovacsBindingConstants.*;
 
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -584,8 +583,7 @@ private void pollData() {
             if (!cleanLogRecords.isEmpty()) {
                 CleanLogRecord record = cleanLogRecords.get(0);
 
-                updateState(CHANNEL_ID_LAST_CLEAN_START,
-                        new DateTimeType(record.timestamp.toInstant().atZone(ZoneId.systemDefault())));
+                updateState(CHANNEL_ID_LAST_CLEAN_START, new DateTimeType(record.timestamp.toInstant()));
                 updateState(CHANNEL_ID_LAST_CLEAN_DURATION, new QuantityType<>(record.cleaningDuration, Units.SECOND));
                 updateState(CHANNEL_ID_LAST_CLEAN_AREA, new QuantityType<>(record.cleanedArea, SIUnits.SQUARE_METRE));
                 if (device.hasCapability(DeviceCapability.EXTENDED_CLEAN_LOG_RECORD)) {

From b4197152435b470b76fb6d32ce32a390595dac13 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Tue, 19 Nov 2024 20:38:08 +0100
Subject: [PATCH 07/52] Simplify DateTimeType handling for EVCC

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/evcc/internal/EvccHandler.java    | 25 +++++++++++--------
 .../binding/evcc/internal/api/EvccAPI.java    |  7 +++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccHandler.java b/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccHandler.java
index 50f0c76e531e8..918459a2dca0d 100644
--- a/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccHandler.java
+++ b/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccHandler.java
@@ -14,8 +14,10 @@
 
 import static org.openhab.binding.evcc.internal.EvccBindingConstants.*;
 
+import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -79,7 +81,7 @@ public class EvccHandler extends BaseThingHandler {
     private Set<String> vehicleFeatureHeating = new HashSet<String>();
     private Set<String> loadpointFeatureHeating = new HashSet<String>();
 
-    Map<String, Triple<Boolean, Float, ZonedDateTime>> vehiclePlans = new HashMap<>();
+    Map<String, Triple<Boolean, Float, Instant>> vehiclePlans = new HashMap<>();
 
     public EvccHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
         super(thing);
@@ -284,7 +286,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                             }
                         }
                         case CHANNEL_VEHICLE_PLAN_ENABLED, CHANNEL_HEATING_PLAN_ENABLED -> {
-                            Triple<Boolean, Float, ZonedDateTime> planValues = vehiclePlans.get(vehicleName);
+                            Triple<Boolean, Float, Instant> planValues = vehiclePlans.get(vehicleName);
                             if (command == OnOffType.ON) {
                                 evccAPI.setVehiclePlan(vehicleName, planValues.getMiddle().intValue(),
                                         planValues.getRight());
@@ -299,7 +301,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                             }
                         }
                         case CHANNEL_VEHICLE_PLAN_SOC -> {
-                            Triple<Boolean, Float, ZonedDateTime> planValues = vehiclePlans.get(vehicleName);
+                            Triple<Boolean, Float, Instant> planValues = vehiclePlans.get(vehicleName);
                             if (command instanceof QuantityType<?> qt) {
                                 vehiclePlans.put(vehicleName, new Triple<>(planValues.getLeft(),
                                         qt.toUnit(Units.PERCENT).floatValue(), planValues.getRight()));
@@ -318,7 +320,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                             }
                         }
                         case CHANNEL_HEATING_PLAN_TEMPERATURE -> {
-                            Triple<Boolean, Float, ZonedDateTime> planValues = vehiclePlans.get(vehicleName);
+                            Triple<Boolean, Float, Instant> planValues = vehiclePlans.get(vehicleName);
                             if (command instanceof QuantityType<?> qt) {
                                 vehiclePlans.put(vehicleName, new Triple<>(planValues.getLeft(),
                                         qt.toUnit(SIUnits.CELSIUS).floatValue(), planValues.getRight()));
@@ -337,14 +339,14 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                             }
                         }
                         case CHANNEL_VEHICLE_PLAN_TIME, CHANNEL_HEATING_PLAN_TIME -> {
-                            Triple<Boolean, Float, ZonedDateTime> planValues = vehiclePlans.get(vehicleName);
+                            Triple<Boolean, Float, Instant> planValues = vehiclePlans.get(vehicleName);
                             if (command instanceof DateTimeType dtt) {
-                                vehiclePlans.put(vehicleName, new Triple<>(planValues.getLeft(), planValues.getMiddle(),
-                                        dtt.getZonedDateTime()));
+                                vehiclePlans.put(vehicleName,
+                                        new Triple<>(planValues.getLeft(), planValues.getMiddle(), dtt.getInstant()));
                                 if (planValues.getLeft()) {
                                     try {
                                         evccAPI.setVehiclePlan(vehicleName, planValues.getMiddle().intValue(),
-                                                dtt.getZonedDateTime());
+                                                dtt.getInstant());
                                     } catch (DateTimeParseException e) {
                                         logger.debug("Failed to set vehicle plan time: ", e);
                                     }
@@ -967,15 +969,16 @@ private void updateChannelsVehicle(String vehicleName, @Nullable String loadpoin
             plan = vehicle.getPlan();
         }
         if (plan == null && vehiclePlans.get(vehicleName) == null) {
-            vehiclePlans.put(vehicleName, new Triple<>(false, 100f, ZonedDateTime.now().plusHours(12)));
+            vehiclePlans.put(vehicleName, new Triple<>(false, 100f, Instant.now().plus(12, ChronoUnit.HOURS)));
         } else if (plan != null) {
-            vehiclePlans.put(vehicleName, new Triple<>(true, plan.getSoC(), ZonedDateTime.parse(plan.getTime())));
+            vehiclePlans.put(vehicleName,
+                    new Triple<>(true, plan.getSoC(), ZonedDateTime.parse(plan.getTime()).toInstant()));
         }
         updateVehiclePlanChannel(uid, vehicleName, channelGroup, isHeating);
     }
 
     private void updateVehiclePlanChannel(ThingUID uid, String vehicleName, String channelGroup, boolean isHeating) {
-        Triple<Boolean, Float, ZonedDateTime> planValues = vehiclePlans.get(vehicleName);
+        Triple<Boolean, Float, Instant> planValues = vehiclePlans.get(vehicleName);
 
         if (isHeating) {
             ChannelUID channel = new ChannelUID(uid, channelGroup, CHANNEL_HEATING_PLAN_ENABLED);
diff --git a/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/api/EvccAPI.java b/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/api/EvccAPI.java
index d5d80b076acd3..6928822bf2aa6 100644
--- a/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/api/EvccAPI.java
+++ b/bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/api/EvccAPI.java
@@ -16,7 +16,7 @@
 import static org.openhab.binding.evcc.internal.EvccBindingConstants.LONG_CONNECTION_TIMEOUT_MILLISEC;
 
 import java.io.IOException;
-import java.time.ZoneId;
+import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -147,9 +147,8 @@ public String setVehicleLimitSoC(String vehicleName, int limitSoC) throws EvccAp
         return httpRequest(this.host + EVCC_REST_API + "vehicles/" + vehicleName + "/limitsoc/" + limitSoC, "POST");
     }
 
-    public String setVehiclePlan(String vehicleName, int planSoC, ZonedDateTime planTime) throws EvccApiException {
-        ZoneId zoneId = timeZoneProvider.getTimeZone();
-        ZonedDateTime adjustedTime = planTime.withZoneSameInstant(zoneId);
+    public String setVehiclePlan(String vehicleName, int planSoC, Instant planTime) throws EvccApiException {
+        ZonedDateTime adjustedTime = planTime.atZone(timeZoneProvider.getTimeZone());
         String formattedTime = adjustedTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
         return httpRequest(
                 this.host + EVCC_REST_API + "vehicles/" + vehicleName + "/plan/soc/" + planSoC + "/" + formattedTime,

From 65a280470ad912e9090a9552e057fc371c034682 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 25 Nov 2024 22:56:28 +0100
Subject: [PATCH 08/52] Simplify DateTimeType handling for Exec

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../openhab/binding/exec/internal/handler/ExecHandler.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/handler/ExecHandler.java b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/handler/ExecHandler.java
index bf3e54ff55359..47f73fa5be1a2 100644
--- a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/handler/ExecHandler.java
+++ b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/handler/ExecHandler.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
-import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -296,9 +295,7 @@ public void execute() {
             }
 
             updateState(OUTPUT, new StringType(transformedResponse));
-
-            DateTimeType stampType = new DateTimeType(ZonedDateTime.now());
-            updateState(LAST_EXECUTION, stampType);
+            updateState(LAST_EXECUTION, new DateTimeType());
         }
     }
 

From 271a490dc005670304844c316ed1c8a109937366 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 20:38:13 +0100
Subject: [PATCH 09/52] Simplify DateTimeType handling for Fine Offset Weather
 Station

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 ...ineOffsetWeatherStationHandlerFactory.java |  7 ++--
 .../FineOffsetGatewayDiscoveryService.java    |  6 +---
 .../internal/domain/ConversionContext.java    | 34 -------------------
 .../internal/domain/Measurand.java            | 22 ++++++------
 .../internal/domain/MeasureType.java          | 23 ++++++-------
 .../internal/domain/Protocol.java             |  6 ++--
 .../handler/FineOffsetGatewayHandler.java     |  8 ++---
 .../service/ELVGatewayQueryService.java       |  9 ++---
 .../service/FineOffsetDataParser.java         | 13 ++++---
 .../FineOffsetGatewayQueryService.java        | 12 ++-----
 .../service/FineOffsetDataParserTest.java     | 22 ++++--------
 11 files changed, 46 insertions(+), 116 deletions(-)
 delete mode 100644 bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/ConversionContext.java

diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/FineOffsetWeatherStationHandlerFactory.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/FineOffsetWeatherStationHandlerFactory.java
index 8fb854f32c855..1069a1177e05f 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/FineOffsetWeatherStationHandlerFactory.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/FineOffsetWeatherStationHandlerFactory.java
@@ -22,7 +22,6 @@
 import org.openhab.binding.fineoffsetweatherstation.internal.handler.FineOffsetGatewayHandler;
 import org.openhab.binding.fineoffsetweatherstation.internal.handler.FineOffsetSensorHandler;
 import org.openhab.core.i18n.LocaleProvider;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
@@ -49,17 +48,15 @@ public class FineOffsetWeatherStationHandlerFactory extends BaseThingHandlerFact
     private final ChannelTypeRegistry channelTypeRegistry;
     private final TranslationProvider translationProvider;
     private final LocaleProvider localeProvider;
-    private final TimeZoneProvider timeZoneProvider;
 
     @Activate
     public FineOffsetWeatherStationHandlerFactory(@Reference FineOffsetGatewayDiscoveryService gatewayDiscoveryService,
             @Reference ChannelTypeRegistry channelTypeRegistry, @Reference TranslationProvider translationProvider,
-            @Reference LocaleProvider localeProvider, @Reference TimeZoneProvider timeZoneProvider) {
+            @Reference LocaleProvider localeProvider) {
         this.gatewayDiscoveryService = gatewayDiscoveryService;
         this.channelTypeRegistry = channelTypeRegistry;
         this.translationProvider = translationProvider;
         this.localeProvider = localeProvider;
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -73,7 +70,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
 
         if (THING_TYPE_GATEWAY.equals(thingTypeUID) && thing instanceof Bridge bridge) {
             return new FineOffsetGatewayHandler(bridge, gatewayDiscoveryService, channelTypeRegistry,
-                    translationProvider, localeProvider, timeZoneProvider);
+                    translationProvider, localeProvider);
         }
         if (THING_TYPE_SENSOR.equals(thingTypeUID)) {
             return new FineOffsetSensorHandler(thing);
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/discovery/FineOffsetGatewayDiscoveryService.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/discovery/FineOffsetGatewayDiscoveryService.java
index 8d3135f90eb79..5a72b4f3987eb 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/discovery/FineOffsetGatewayDiscoveryService.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/discovery/FineOffsetGatewayDiscoveryService.java
@@ -21,7 +21,6 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
-import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -37,7 +36,6 @@
 import org.openhab.binding.fineoffsetweatherstation.internal.FineOffsetWeatherStationBindingConstants;
 import org.openhab.binding.fineoffsetweatherstation.internal.Utils;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Command;
-import org.openhab.binding.fineoffsetweatherstation.internal.domain.ConversionContext;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Protocol;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.response.MeasuredValue;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.response.SensorDevice;
@@ -195,10 +193,8 @@ private void discovered(String ip, int port, byte[] macAddr, String name) {
 
     @Nullable
     private Protocol determineProtocol(FineOffsetGatewayConfiguration config) {
-        ConversionContext conversionContext = new ConversionContext(ZoneOffset.UTC);
         for (Protocol protocol : Protocol.values()) {
-            try (GatewayQueryService gatewayQueryService = protocol.getGatewayQueryService(config, null,
-                    conversionContext)) {
+            try (GatewayQueryService gatewayQueryService = protocol.getGatewayQueryService(config, null)) {
                 Collection<MeasuredValue> result = gatewayQueryService.getMeasuredValues();
                 logger.trace("found {} measured values via protocol {}", result.size(), protocol);
                 if (!result.isEmpty()) {
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/ConversionContext.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/ConversionContext.java
deleted file mode 100644
index 1915cd4629966..0000000000000
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/ConversionContext.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2010-2024 Contributors to the openHAB project
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.openhab.binding.fineoffsetweatherstation.internal.domain;
-
-import java.time.ZoneId;
-
-import org.eclipse.jdt.annotation.NonNullByDefault;
-
-/**
- * @author Andreas Berger - Initial contribution
- */
-@NonNullByDefault
-public class ConversionContext {
-
-    private final ZoneId zoneId;
-
-    public ConversionContext(ZoneId zoneId) {
-        this.zoneId = zoneId;
-    }
-
-    public ZoneId getZoneId() {
-        return zoneId;
-    }
-}
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Measurand.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Measurand.java
index 6de3d6911fcfb..aeb019c0d41f0 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Measurand.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Measurand.java
@@ -246,19 +246,19 @@ public enum Measurand {
         return MEASURANDS.get(code);
     }
 
-    private int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel, ConversionContext context,
+    private int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel,
             @Nullable ParserCustomizationType customizationType, List<MeasuredValue> result,
             DebugDetails debugDetails) {
         int subOffset = 0;
         for (Parser parser : parsers) {
-            subOffset += parser.extractMeasuredValues(data, offset + subOffset, channel, context, customizationType,
-                    result, debugDetails);
+            subOffset += parser.extractMeasuredValues(data, offset + subOffset, channel, customizationType, result,
+                    debugDetails);
         }
         return subOffset;
     }
 
     private interface Parser {
-        int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel, ConversionContext context,
+        int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel,
                 @Nullable ParserCustomizationType customizationType, List<MeasuredValue> result,
                 DebugDetails debugDetails);
     }
@@ -271,7 +271,7 @@ public Skip(int skip) {
         }
 
         @Override
-        public int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel, ConversionContext context,
+        public int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel,
                 @Nullable ParserCustomizationType customizationType, List<MeasuredValue> result,
                 DebugDetails debugDetails) {
             debugDetails.addDebugDetails(offset, skip, "skipped");
@@ -312,11 +312,9 @@ public SingleChannelMeasurand(Measurand measurand, @Nullable Integer channel) {
             this.channel = channel;
         }
 
-        public int extractMeasuredValues(byte[] data, int offset, ConversionContext context,
-                @Nullable ParserCustomizationType customizationType, List<MeasuredValue> result,
-                DebugDetails debugDetails) {
-            return measurand.extractMeasuredValues(data, offset, channel, context, customizationType, result,
-                    debugDetails);
+        public int extractMeasuredValues(byte[] data, int offset, @Nullable ParserCustomizationType customizationType,
+                List<MeasuredValue> result, DebugDetails debugDetails) {
+            return measurand.extractMeasuredValues(data, offset, channel, customizationType, result, debugDetails);
         }
 
         public String getDebugString() {
@@ -353,11 +351,11 @@ private static class MeasurandParser implements Parser {
         }
 
         @Override
-        public int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel, ConversionContext context,
+        public int extractMeasuredValues(byte[] data, int offset, @Nullable Integer channel,
                 @Nullable ParserCustomizationType customizationType, List<MeasuredValue> result,
                 DebugDetails debugDetails) {
             MeasureType measureType = getMeasureType(customizationType);
-            State state = measureType.toState(data, offset, context);
+            State state = measureType.toState(data, offset);
             if (state != null) {
                 debugDetails.addDebugDetails(offset, measureType.getByteSize(),
                         measureType.name() + ": " + state.toFullString());
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java
index 8a3fbc6855000..f8253dfe4f779 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/MeasureType.java
@@ -45,7 +45,6 @@
 import static org.openhab.core.library.unit.Units.PERCENT;
 
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.function.BiFunction;
 
 import javax.measure.Unit;
@@ -97,7 +96,7 @@ public enum MeasureType {
     CO2(PARTS_PER_MILLION, 2, CHANNEL_TYPE_CO2, Utils::toUInt16),
 
     WATER_LEAK_DETECTION(1, CHANNEL_TYPE_WATER_LEAK_DETECTION,
-            (data, offset, context) -> OnOffType.from(toUInt8(data[offset]) != 0)),
+            (data, offset) -> OnOffType.from(toUInt8(data[offset]) != 0)),
 
     LIGHTNING_DISTANCE(KILO(METRE), 1, CHANNEL_TYPE_LIGHTNING_DISTANCE, (data, offset) -> {
         int distance = toUInt8(data[offset]);
@@ -107,25 +106,23 @@ public enum MeasureType {
         return distance;
     }),
 
-    LIGHTNING_COUNTER(4, CHANNEL_TYPE_LIGHTNING_COUNTER,
-            (data, offset, context) -> new DecimalType(toUInt32(data, offset))),
+    LIGHTNING_COUNTER(4, CHANNEL_TYPE_LIGHTNING_COUNTER, (data, offset) -> new DecimalType(toUInt32(data, offset))),
 
-    LIGHTNING_TIME(4, CHANNEL_TYPE_LIGHTNING_TIME, (data, offset, context) -> {
+    LIGHTNING_TIME(4, CHANNEL_TYPE_LIGHTNING_TIME, (data, offset) -> {
         int epochSecond = toUInt32(data, offset);
         if (epochSecond == 0xFFFFFFFF) {
             return UnDefType.UNDEF;
         }
-        return new DateTimeType(ZonedDateTime.ofInstant(Instant.ofEpochSecond(epochSecond), context.getZoneId()));
+        return new DateTimeType(Instant.ofEpochSecond(epochSecond));
     }),
 
     MILLIWATT_PER_SQUARE_METRE(MILLI(Units.WATT).divide(SQUARE_METRE), 2, CHANNEL_TYPE_UV_RADIATION,
             (data, offset) -> Utils.toUInt16(data, offset) / 10.),
 
-    BYTE(1, null, (data, offset, context) -> new DecimalType(toUInt8(data[offset]))),
+    BYTE(1, null, (data, offset) -> new DecimalType(toUInt8(data[offset]))),
     MEMORY(Units.BYTE, 4, null, Utils::toUInt32),
 
-    DATE_TIME2(6, null, (data, offset, context) -> new DateTimeType(
-            ZonedDateTime.ofInstant(Instant.ofEpochSecond(toUInt32(data, offset)), context.getZoneId())));
+    DATE_TIME2(6, null, (data, offset) -> new DateTimeType(Instant.ofEpochSecond(toUInt32(data, offset))));
 
     private final int byteSize;
     private final @Nullable ChannelTypeUID channelTypeUID;
@@ -139,7 +136,7 @@ public enum MeasureType {
      */
     MeasureType(Unit<?> unit, int byteSize, @Nullable ChannelTypeUID channelTypeUID,
             BiFunction<byte[], Integer, @Nullable Number> valueExtractor) {
-        this(byteSize, channelTypeUID, (bytes, offset, context) -> {
+        this(byteSize, channelTypeUID, (bytes, offset) -> {
             Number value = valueExtractor.apply(bytes, offset);
             return value == null ? UnDefType.UNDEF : new QuantityType<>(value, unit);
         });
@@ -164,12 +161,12 @@ public int getByteSize() {
         return channelTypeUID;
     }
 
-    public @Nullable State toState(byte[] data, int offset, ConversionContext context) {
-        return stateConverter.toState(data, offset, context);
+    public @Nullable State toState(byte[] data, int offset) {
+        return stateConverter.toState(data, offset);
     }
 
     private interface StateConverter {
         @Nullable
-        State toState(byte[] data, int offset, ConversionContext context);
+        State toState(byte[] data, int offset);
     }
 }
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Protocol.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Protocol.java
index f1845779d9fea..a435132aaac1e 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Protocol.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Protocol.java
@@ -44,12 +44,12 @@ public enum Protocol {
     }
 
     public GatewayQueryService getGatewayQueryService(FineOffsetGatewayConfiguration config,
-            @Nullable ThingStatusListener thingStatusListener, ConversionContext conversionContext) {
-        return queryServiceFactory.newInstance(config, thingStatusListener, conversionContext);
+            @Nullable ThingStatusListener thingStatusListener) {
+        return queryServiceFactory.newInstance(config, thingStatusListener);
     }
 
     private interface GatewayQueryServiceFactory {
         GatewayQueryService newInstance(FineOffsetGatewayConfiguration config,
-                @Nullable ThingStatusListener thingStatusListener, ConversionContext conversionContext);
+                @Nullable ThingStatusListener thingStatusListener);
     }
 }
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetGatewayHandler.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetGatewayHandler.java
index 74f992b6036da..a63a4eed03072 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetGatewayHandler.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/handler/FineOffsetGatewayHandler.java
@@ -32,14 +32,12 @@
 import org.openhab.binding.fineoffsetweatherstation.internal.FineOffsetGatewayConfiguration;
 import org.openhab.binding.fineoffsetweatherstation.internal.FineOffsetSensorConfiguration;
 import org.openhab.binding.fineoffsetweatherstation.internal.discovery.FineOffsetGatewayDiscoveryService;
-import org.openhab.binding.fineoffsetweatherstation.internal.domain.ConversionContext;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.SensorGatewayBinding;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.response.MeasuredValue;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.response.SensorDevice;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.response.SystemInfo;
 import org.openhab.binding.fineoffsetweatherstation.internal.service.GatewayQueryService;
 import org.openhab.core.i18n.LocaleProvider;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Channel;
@@ -76,7 +74,6 @@ public class FineOffsetGatewayHandler extends BaseBridgeHandler {
 
     private final Logger logger = LoggerFactory.getLogger(FineOffsetGatewayHandler.class);
     private final Bundle bundle;
-    private final ConversionContext conversionContext;
 
     private @Nullable GatewayQueryService gatewayQueryService;
 
@@ -94,7 +91,7 @@ public class FineOffsetGatewayHandler extends BaseBridgeHandler {
 
     public FineOffsetGatewayHandler(Bridge bridge, FineOffsetGatewayDiscoveryService gatewayDiscoveryService,
             ChannelTypeRegistry channelTypeRegistry, TranslationProvider translationProvider,
-            LocaleProvider localeProvider, TimeZoneProvider timeZoneProvider) {
+            LocaleProvider localeProvider) {
         super(bridge);
         this.bridgeUID = bridge.getUID();
         this.gatewayDiscoveryService = gatewayDiscoveryService;
@@ -102,7 +99,6 @@ public FineOffsetGatewayHandler(Bridge bridge, FineOffsetGatewayDiscoveryService
         this.translationProvider = translationProvider;
         this.localeProvider = localeProvider;
         this.bundle = FrameworkUtil.getBundle(FineOffsetGatewayDiscoveryService.class);
-        this.conversionContext = new ConversionContext(timeZoneProvider.getTimeZone());
     }
 
     @Override
@@ -112,7 +108,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
     @Override
     public void initialize() {
         FineOffsetGatewayConfiguration config = getConfigAs(FineOffsetGatewayConfiguration.class);
-        gatewayQueryService = config.protocol.getGatewayQueryService(config, this::updateStatus, conversionContext);
+        gatewayQueryService = config.protocol.getGatewayQueryService(config, this::updateStatus);
 
         updateStatus(ThingStatus.UNKNOWN);
         fetchAndUpdateSensors();
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/ELVGatewayQueryService.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/ELVGatewayQueryService.java
index eefeadf73f216..0deb958180dc5 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/ELVGatewayQueryService.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/ELVGatewayQueryService.java
@@ -20,7 +20,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.fineoffsetweatherstation.internal.FineOffsetGatewayConfiguration;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Command;
-import org.openhab.binding.fineoffsetweatherstation.internal.domain.ConversionContext;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.DebugDetails;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Protocol;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.SensorGatewayBinding;
@@ -39,13 +38,10 @@ public class ELVGatewayQueryService extends GatewayQueryService {
 
     private final FineOffsetDataParser fineOffsetDataParser;
 
-    private final ConversionContext conversionContext;
-
     public ELVGatewayQueryService(FineOffsetGatewayConfiguration config,
-            @Nullable ThingStatusListener thingStatusListener, ConversionContext conversionContext) {
+            @Nullable ThingStatusListener thingStatusListener) {
         super(config, thingStatusListener);
         this.fineOffsetDataParser = new FineOffsetDataParser(Protocol.ELV);
-        this.conversionContext = conversionContext;
     }
 
     @Override
@@ -81,8 +77,7 @@ public List<MeasuredValue> getMeasuredValues() {
             return Collections.emptyList();
         }
         DebugDetails debugDetails = new DebugDetails(data, Command.CMD_WS980_LIVEDATA, Protocol.ELV);
-        List<MeasuredValue> measuredValues = fineOffsetDataParser.getMeasuredValues(data, conversionContext,
-                debugDetails);
+        List<MeasuredValue> measuredValues = fineOffsetDataParser.getMeasuredValues(data, debugDetails);
         logger.trace("{}", debugDetails);
         return measuredValues;
     }
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParser.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParser.java
index b52de52f9e31b..6c1c03e6bc5a1 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParser.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParser.java
@@ -26,7 +26,6 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.fineoffsetweatherstation.internal.Utils;
-import org.openhab.binding.fineoffsetweatherstation.internal.domain.ConversionContext;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.DebugDetails;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Measurand;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Protocol;
@@ -152,7 +151,7 @@ public Map<SensorGatewayBinding, SensorDevice> getRegisteredSensors(byte[] data,
         return new SystemInfo(frequency, date, dst, useWh24);
     }
 
-    List<MeasuredValue> getMeasuredValues(byte[] data, ConversionContext context, DebugDetails debugDetails) {
+    List<MeasuredValue> getMeasuredValues(byte[] data, DebugDetails debugDetails) {
         /*
          * Pos| Length | Description
          * -------------------------------------------------
@@ -176,14 +175,14 @@ List<MeasuredValue> getMeasuredValues(byte[] data, ConversionContext context, De
             idx++; // at index 5 there is an additional Byte being set to 0x04
             debugDetails.addDebugDetails(5, 1, "ELV extra byte");
         }
-        return readMeasuredValues(data, idx, context, protocol.getParserCustomizationType(), debugDetails);
+        return readMeasuredValues(data, idx, protocol.getParserCustomizationType(), debugDetails);
     }
 
-    List<MeasuredValue> getRainData(byte[] data, ConversionContext context, DebugDetails debugDetails) {
-        return readMeasuredValues(data, 5, context, Measurand.ParserCustomizationType.RAIN_READING, debugDetails);
+    List<MeasuredValue> getRainData(byte[] data, DebugDetails debugDetails) {
+        return readMeasuredValues(data, 5, Measurand.ParserCustomizationType.RAIN_READING, debugDetails);
     }
 
-    private List<MeasuredValue> readMeasuredValues(byte[] data, int idx, ConversionContext context,
+    private List<MeasuredValue> readMeasuredValues(byte[] data, int idx,
             Measurand.@Nullable ParserCustomizationType protocol, DebugDetails debugDetails) {
         var size = toUInt16(data, 3);
 
@@ -198,7 +197,7 @@ private List<MeasuredValue> readMeasuredValues(byte[] data, int idx, ConversionC
             } else {
                 debugDetails.addDebugDetails(idx - 1, 1, "measurand " + measurand.getDebugString());
             }
-            idx += measurand.extractMeasuredValues(data, idx, context, protocol, result, debugDetails);
+            idx += measurand.extractMeasuredValues(data, idx, protocol, result, debugDetails);
         }
         return result;
     }
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetGatewayQueryService.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetGatewayQueryService.java
index fa4d736d34560..1bbc84393b18f 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetGatewayQueryService.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetGatewayQueryService.java
@@ -21,7 +21,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.fineoffsetweatherstation.internal.FineOffsetGatewayConfiguration;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Command;
-import org.openhab.binding.fineoffsetweatherstation.internal.domain.ConversionContext;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.DebugDetails;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Protocol;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.SensorGatewayBinding;
@@ -44,13 +43,10 @@ public class FineOffsetGatewayQueryService extends GatewayQueryService {
 
     private final FineOffsetDataParser fineOffsetDataParser;
 
-    private final ConversionContext conversionContext;
-
     public FineOffsetGatewayQueryService(FineOffsetGatewayConfiguration config,
-            @Nullable ThingStatusListener thingStatusListener, ConversionContext conversionContext) {
+            @Nullable ThingStatusListener thingStatusListener) {
         super(config, thingStatusListener);
         this.fineOffsetDataParser = new FineOffsetDataParser(PROTOCOL);
-        this.conversionContext = conversionContext;
     }
 
     @Override
@@ -95,8 +91,7 @@ public Collection<MeasuredValue> getMeasuredValues() {
         byte[] data = executeCommand(Command.CMD_GW1000_LIVEDATA);
         if (data != null) {
             DebugDetails debugDetails = new DebugDetails(data, Command.CMD_GW1000_LIVEDATA, PROTOCOL);
-            List<MeasuredValue> measuredValues = fineOffsetDataParser.getMeasuredValues(data, conversionContext,
-                    debugDetails);
+            List<MeasuredValue> measuredValues = fineOffsetDataParser.getMeasuredValues(data, debugDetails);
             for (MeasuredValue measuredValue : measuredValues) {
                 valuePerChannel.put(measuredValue.getChannelId(), measuredValue);
             }
@@ -106,8 +101,7 @@ public Collection<MeasuredValue> getMeasuredValues() {
         data = executeCommand(Command.CMD_READ_RAIN);
         if (data != null) {
             DebugDetails debugDetails = new DebugDetails(data, Command.CMD_READ_RAIN, PROTOCOL);
-            List<MeasuredValue> measuredRainValues = fineOffsetDataParser.getRainData(data, conversionContext,
-                    debugDetails);
+            List<MeasuredValue> measuredRainValues = fineOffsetDataParser.getRainData(data, debugDetails);
             for (MeasuredValue measuredValue : measuredRainValues) {
                 valuePerChannel.put(measuredValue.getChannelId(), measuredValue);
             }
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/test/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParserTest.java b/bundles/org.openhab.binding.fineoffsetweatherstation/src/test/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParserTest.java
index 79e08e250fd7d..e9c008b107c6e 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/test/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParserTest.java
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/test/java/org/openhab/binding/fineoffsetweatherstation/internal/service/FineOffsetDataParserTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.fineoffsetweatherstation.internal.service;
 
-import java.time.ZoneOffset;
 import java.util.List;
 
 import org.assertj.core.api.Assertions;
@@ -20,7 +19,6 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Command;
-import org.openhab.binding.fineoffsetweatherstation.internal.domain.ConversionContext;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.DebugDetails;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.Protocol;
 import org.openhab.binding.fineoffsetweatherstation.internal.domain.response.MeasuredValue;
@@ -37,8 +35,7 @@ void testLiveDataWH45() {
         byte[] bytes = HexUtils.hexToBytes(
                 "FFFF2700510100D306280827EF0927EF020045074F0A00150B00000C0000150000000016000117001900000E0000100000110021120000002113000005850D00007000D12E0060005A005B005502AE028F0633");
         DebugDetails debugDetails = new DebugDetails(bytes, Command.CMD_GW1000_LIVEDATA, Protocol.DEFAULT);
-        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes, debugDetails);
         Assertions.assertThat(data)
                 .extracting(MeasuredValue::getChannelId, measuredValue -> measuredValue.getState().toString())
                 .containsExactly(new Tuple("temperature-indoor", "21.1 °C"), new Tuple("humidity-indoor", "40 %"),
@@ -63,8 +60,7 @@ void testLiveDataWithManySensors() {
         byte[] bytes = HexUtils.hexToBytes(
                 "FFFF27007B0100D206240826CC0926CC02004907450A00760B00160C001F150001C00C16000017002A00144D00372C381A0085223E1B00A72333580059005A00620000000061FFFFFFFF60FF1900380E000010002D1100A012000000A013000000A00D009F63004D417000CF2C00250020001B0018020B021E06722164");
         DebugDetails debugDetails = new DebugDetails(bytes, Command.CMD_GW1000_LIVEDATA, Protocol.DEFAULT);
-        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes, debugDetails);
         Assertions.assertThat(data)
                 .extracting(MeasuredValue::getChannelId, measuredValue -> measuredValue.getState().toString())
                 .containsExactly(new Tuple("temperature-indoor", "21 °C"), new Tuple("humidity-indoor", "36 %"),
@@ -99,8 +95,7 @@ void testLiveDataWH34AndWh45() {
         byte[] bytes = HexUtils.hexToBytes(
                 "FFFF2700540100CA063E0826EC0926EC02007A074C0A002F0B001F0C0023150000032016000017001A0086225558005A00620000000661654A5AF1601B1900266300884B7000CE3F001D00240016001E041A037B0695");
         DebugDetails debugDetails = new DebugDetails(bytes, Command.CMD_GW1000_LIVEDATA, Protocol.DEFAULT);
-        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes, debugDetails);
         Assertions.assertThat(data)
                 .extracting(MeasuredValue::getChannelId,
                         measuredValue -> measuredValue.getState() instanceof DateTimeType dateTimeState
@@ -131,8 +126,7 @@ void testLiveDataWithHeapFreeMeasurand() {
         byte[] bytes = HexUtils.hexToBytes(
                 "FFFF27002F01010B062A0826C10926C1020011074D0A004C0B000C0C000D15000226C816006317011900136C0001FED864");
         DebugDetails debugDetails = new DebugDetails(bytes, Command.CMD_GW1000_LIVEDATA, Protocol.DEFAULT);
-        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+        List<MeasuredValue> data = new FineOffsetDataParser(Protocol.DEFAULT).getMeasuredValues(bytes, debugDetails);
         Assertions.assertThat(data)
                 .extracting(MeasuredValue::getChannelId, measuredValue -> measuredValue.getState().toString())
                 .containsExactly(new Tuple("temperature-indoor", "26.7 °C"), new Tuple("humidity-indoor", "42 %"),
@@ -150,7 +144,7 @@ void testLiveDataELV() {
                 "FFFF0B00500401010B0201120300620401120501120629072108254B09254B0A01480B00040C000A0E000000001000000021110000002E120000014F130000100714000012FD15000B4BB816086917056D35");
         DebugDetails debugDetails = new DebugDetails(data, Command.CMD_WS980_LIVEDATA, Protocol.ELV);
         List<MeasuredValue> measuredValues = new FineOffsetDataParser(Protocol.ELV).getMeasuredValues(data,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+                debugDetails);
         Assertions.assertThat(measuredValues)
                 .extracting(MeasuredValue::getChannelId, measuredValue -> measuredValue.getState().toString())
                 .containsExactly(new Tuple("temperature-indoor", "26.7 °C"),
@@ -171,8 +165,7 @@ void testRainData() {
         byte[] data = HexUtils
                 .hexToBytes("FFFF5700290E000010000000001100000024120000003113000005030D00000F0064880000017A017B0030");
         DebugDetails debugDetails = new DebugDetails(data, Command.CMD_READ_RAIN, Protocol.DEFAULT);
-        List<MeasuredValue> measuredValues = new FineOffsetDataParser(Protocol.DEFAULT).getRainData(data,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+        List<MeasuredValue> measuredValues = new FineOffsetDataParser(Protocol.DEFAULT).getRainData(data, debugDetails);
         Assertions.assertThat(measuredValues)
                 .extracting(MeasuredValue::getChannelId, measuredValue -> measuredValue.getState().toString())
                 .containsExactly(new Tuple("rain-rate", "0 mm/h"), new Tuple("rain-day", "0 mm"),
@@ -187,8 +180,7 @@ void testRainDataW90() {
                 "FFFF5700398000008300000009840000000985000000C786000000C7810000870064006400640064006400640064006400640064880900007A02BF");
         Assertions.assertThat(Command.CMD_READ_RAIN.isResponseValid(data)).isTrue();
         DebugDetails debugDetails = new DebugDetails(data, Command.CMD_READ_RAIN, Protocol.DEFAULT);
-        List<MeasuredValue> measuredValues = new FineOffsetDataParser(Protocol.DEFAULT).getRainData(data,
-                new ConversionContext(ZoneOffset.UTC), debugDetails);
+        List<MeasuredValue> measuredValues = new FineOffsetDataParser(Protocol.DEFAULT).getRainData(data, debugDetails);
         Assertions.assertThat(measuredValues)
                 .extracting(MeasuredValue::getChannelId, measuredValue -> measuredValue.getState().toString())
                 .containsExactly(new Tuple("piezo-rain-rate", "0 mm/h"), new Tuple("piezo-rain-day", "0.9 mm"),

From 500254cc92b62990dd960f0c8969df64f62faf54 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 10 Nov 2024 00:33:11 +0100
Subject: [PATCH 10/52] Simplify DateTimeType handling for Flume

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/flume/internal/handler/FlumeDeviceHandler.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bundles/org.openhab.binding.flume/src/main/java/org/openhab/binding/flume/internal/handler/FlumeDeviceHandler.java b/bundles/org.openhab.binding.flume/src/main/java/org/openhab/binding/flume/internal/handler/FlumeDeviceHandler.java
index 5933d1e38afd9..5e10c2277d6dd 100644
--- a/bundles/org.openhab.binding.flume/src/main/java/org/openhab/binding/flume/internal/handler/FlumeDeviceHandler.java
+++ b/bundles/org.openhab.binding.flume/src/main/java/org/openhab/binding/flume/internal/handler/FlumeDeviceHandler.java
@@ -20,7 +20,6 @@
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -193,8 +192,7 @@ public void updateDeviceChannel(@Nullable FlumeApiDevice apiDevice, String chann
                 updateState(CHANNEL_DEVICE_LOWBATTERY, (percent <= 25) ? OnOffType.ON : OnOffType.OFF);
                 break;
             case CHANNEL_DEVICE_LASTSEEN:
-                updateState(CHANNEL_DEVICE_LASTSEEN,
-                        new DateTimeType(ZonedDateTime.ofInstant(apiDevice.lastSeen, ZoneId.systemDefault())));
+                updateState(CHANNEL_DEVICE_LASTSEEN, new DateTimeType(apiDevice.lastSeen));
                 break;
         }
     }

From c8387db71ebb3ae9d96e107d6518b69f18b2888f Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 25 Nov 2024 22:53:13 +0100
Subject: [PATCH 11/52] Simplify DateTimeType handling for FMI Weather

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/fmiweather/internal/AbstractWeatherHandler.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/AbstractWeatherHandler.java b/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/AbstractWeatherHandler.java
index 4843b9509c698..e6f26c66c31da 100644
--- a/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/AbstractWeatherHandler.java
+++ b/bundles/org.openhab.binding.fmiweather/src/main/java/org/openhab/binding/fmiweather/internal/AbstractWeatherHandler.java
@@ -16,8 +16,6 @@
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ScheduledFuture;
@@ -60,7 +58,6 @@
 @NonNullByDefault
 public abstract class AbstractWeatherHandler extends BaseThingHandler {
 
-    private static final ZoneId UTC = ZoneId.of("UTC");
     protected static final String PROP_LONGITUDE = "longitude";
     protected static final String PROP_LATITUDE = "latitude";
     protected static final String PROP_NAME = "name";
@@ -202,8 +199,7 @@ protected static long ceilToEvenMinutes(long epochSeconds, int roundMinutes) {
      */
     protected <T extends Quantity<T>> void updateEpochSecondStateIfLinked(ChannelUID channelUID, long epochSecond) {
         if (isLinked(channelUID)) {
-            updateState(channelUID, new DateTimeType(ZonedDateTime.ofInstant(Instant.ofEpochSecond(epochSecond), UTC)
-                    .withZoneSameInstant(ZoneId.systemDefault())));
+            updateState(channelUID, new DateTimeType(Instant.ofEpochSecond(epochSecond)));
         }
     }
 

From 766c524a7e90cdc312f65637cd569e43d18fc640 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 25 Nov 2024 22:21:31 +0100
Subject: [PATCH 12/52] Simplify DateTimeType handling for FreeboxOS

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../freeboxos/internal/handler/ApiConsumerHandler.java |  3 ++-
 .../freeboxos/internal/handler/FreeplugHandler.java    |  4 ++--
 .../freeboxos/internal/handler/KeyfobHandler.java      | 10 +++-------
 .../binding/freeboxos/internal/handler/PirHandler.java |  5 +----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/ApiConsumerHandler.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/ApiConsumerHandler.java
index e3a4034249f58..928e56d770780 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/ApiConsumerHandler.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/ApiConsumerHandler.java
@@ -13,6 +13,7 @@
 package org.openhab.binding.freeboxos.internal.handler;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -288,7 +289,7 @@ protected void updateIfActive(String channelId, State state) {
         }
     }
 
-    protected void updateChannelDateTimeState(String channelId, @Nullable ZonedDateTime timestamp) {
+    protected void updateChannelDateTimeState(String channelId, @Nullable Instant timestamp) {
         updateIfActive(channelId, timestamp == null ? UnDefType.NULL : new DateTimeType(timestamp));
     }
 
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/FreeplugHandler.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/FreeplugHandler.java
index 6efc5485be67f..cc8a59d6fed1d 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/FreeplugHandler.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/FreeplugHandler.java
@@ -14,7 +14,7 @@
 
 import static org.openhab.binding.freeboxos.internal.FreeboxOsBindingConstants.*;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -84,7 +84,7 @@ protected void internalPoll() throws FreeboxException {
                     "internalPoll is not possible because MAC address is undefined for the thing " + thing.getUID());
         }
         getManager(FreeplugManager.class).getPlug(mac).ifPresent(plug -> {
-            updateChannelDateTimeState(LAST_SEEN, ZonedDateTime.now().minusSeconds(plug.inactive()));
+            updateChannelDateTimeState(LAST_SEEN, Instant.now().minusSeconds(plug.inactive()));
 
             updateChannelString(LINE_STATUS, plug.ethPortStatus());
             updateChannelOnOff(REACHABLE, plug.hasNetwork());
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/KeyfobHandler.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/KeyfobHandler.java
index 524330a22da22..7105dbbf9ce97 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/KeyfobHandler.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/KeyfobHandler.java
@@ -15,8 +15,6 @@
 import static org.openhab.binding.freeboxos.internal.FreeboxOsBindingConstants.*;
 
 import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -50,11 +48,9 @@ public KeyfobHandler(Thing thing) {
     @Override
     protected State getChannelState(String channelId, EndpointState state, Optional<Endpoint> endPoint) {
         if (channelId.startsWith(KEYFOB_PUSHED)) {
-            return Objects.requireNonNull(endPoint.map(ep -> ep
-                    .getLastChange().map(
-                            change -> (State) (KEYFOB_PUSHED.equals(channelId) ? new DecimalType(change.value())
-                                    : new DateTimeType(ZonedDateTime
-                                            .ofInstant(Instant.ofEpochSecond(change.timestamp()), ZoneOffset.UTC))))
+            return Objects.requireNonNull(endPoint.map(ep -> ep.getLastChange()
+                    .map(change -> (State) (KEYFOB_PUSHED.equals(channelId) ? new DecimalType(change.value())
+                            : new DateTimeType(Instant.ofEpochSecond(change.timestamp()))))
                     .orElse(UnDefType.UNDEF)).orElse(UnDefType.UNDEF));
         }
         String value = state.value();
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/PirHandler.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/PirHandler.java
index 191189e4f9411..461dde03de92c 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/PirHandler.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/PirHandler.java
@@ -15,8 +15,6 @@
 import static org.openhab.binding.freeboxos.internal.FreeboxOsBindingConstants.*;
 
 import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -48,8 +46,7 @@ public PirHandler(Thing thing) {
     protected State getChannelState(String channelId, EndpointState state, Optional<Endpoint> endPoint) {
         if (PIR_TAMPER_UPDATE.equals(channelId) || PIR_TRIGGER_UPDATE.equals(channelId)) {
             return Objects.requireNonNull(endPoint.map(ep -> ep.getLastChange()
-                    .map(change -> (State) new DateTimeType(
-                            ZonedDateTime.ofInstant(Instant.ofEpochSecond(change.timestamp()), ZoneOffset.UTC)))
+                    .map(change -> (State) new DateTimeType(Instant.ofEpochSecond(change.timestamp())))
                     .orElse(UnDefType.UNDEF)).orElse(UnDefType.UNDEF));
         }
 

From ffca3d3bfab09f26c4a68254e1d2ed82cf4025ad Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 23:09:13 +0100
Subject: [PATCH 13/52] Simplify DateTimeType handling for Groupe PSA

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../groupepsa/internal/GroupePSAHandlerFactory.java       | 8 ++------
 .../groupepsa/internal/things/GroupePSAHandler.java       | 8 ++------
 .../groupepsa/internal/things/GroupePSAHandlerTest.java   | 6 +-----
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/GroupePSAHandlerFactory.java b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/GroupePSAHandlerFactory.java
index 3fad2e7622682..8f242c1e5b8fc 100644
--- a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/GroupePSAHandlerFactory.java
+++ b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/GroupePSAHandlerFactory.java
@@ -22,7 +22,6 @@
 import org.openhab.binding.groupepsa.internal.bridge.GroupePSABridgeHandler;
 import org.openhab.binding.groupepsa.internal.things.GroupePSAHandler;
 import org.openhab.core.auth.client.oauth2.OAuthFactory;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
@@ -48,15 +47,12 @@ public class GroupePSAHandlerFactory extends BaseThingHandlerFactory {
 
     private final OAuthFactory oAuthFactory;
     private final HttpClient httpClient;
-    private final TimeZoneProvider timeZoneProvider;
 
     @Activate
     public GroupePSAHandlerFactory(final @Reference OAuthFactory oAuthFactory, //
-            final @Reference HttpClientFactory httpClientFactory, //
-            final @Reference TimeZoneProvider timeZoneProvider) {
+            final @Reference HttpClientFactory httpClientFactory) {
         this.oAuthFactory = oAuthFactory;
         this.httpClient = httpClientFactory.getCommonHttpClient();
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -69,7 +65,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
         if (THING_TYPE_VEHICLE.equals(thingTypeUID)) {
-            return new GroupePSAHandler(thing, timeZoneProvider);
+            return new GroupePSAHandler(thing);
         } else if (THING_TYPE_BRIDGE.equals(thingTypeUID)) {
             return new GroupePSABridgeHandler((Bridge) thing, oAuthFactory, httpClient);
         }
diff --git a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
index 4018ae5110d36..40bbeb11505c1 100644
--- a/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
+++ b/bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
@@ -50,7 +50,6 @@
 import org.openhab.binding.groupepsa.internal.rest.api.dto.Service;
 import org.openhab.binding.groupepsa.internal.rest.api.dto.VehicleStatus;
 import org.openhab.binding.groupepsa.internal.rest.exceptions.GroupePSACommunicationException;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OpenClosedType;
@@ -93,8 +92,6 @@ public class GroupePSAHandler extends BaseThingHandler {
 
     private final Logger logger = LoggerFactory.getLogger(GroupePSAHandler.class);
 
-    private final TimeZoneProvider timeZoneProvider;
-
     private @Nullable String id = null;
     private long lastQueryTimeNs = 0L;
 
@@ -102,9 +99,8 @@ public class GroupePSAHandler extends BaseThingHandler {
     private long maxQueryFrequencyNanos = TimeUnit.MINUTES.toNanos(1);
     private long onlineIntervalM;
 
-    public GroupePSAHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
+    public GroupePSAHandler(Thing thing) {
         super(thing);
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -424,7 +420,7 @@ protected <T1, T2, T3, T4 extends Quantity<T4>> void updateState(String channelI
 
     protected void updateState(String channelID, @Nullable ZonedDateTime date) {
         if (date != null) {
-            updateState(channelID, new DateTimeType(date).toZone(timeZoneProvider.getTimeZone()));
+            updateState(channelID, new DateTimeType(date));
         } else {
             updateState(channelID, UnDefType.UNDEF);
         }
diff --git a/bundles/org.openhab.binding.groupepsa/src/test/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandlerTest.java b/bundles/org.openhab.binding.groupepsa/src/test/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandlerTest.java
index 9b5e0d78a6e53..1f586689a28ae 100644
--- a/bundles/org.openhab.binding.groupepsa/src/test/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandlerTest.java
+++ b/bundles/org.openhab.binding.groupepsa/src/test/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandlerTest.java
@@ -18,7 +18,6 @@
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.time.ZoneId;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -35,7 +34,6 @@
 import org.openhab.binding.groupepsa.internal.rest.exceptions.GroupePSACommunicationException;
 import org.openhab.core.auth.client.oauth2.OAuthFactory;
 import org.openhab.core.config.core.Configuration;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.StringType;
 import org.openhab.core.thing.Bridge;
@@ -67,7 +65,6 @@ public class GroupePSAHandlerTest {
 
     private @NonNullByDefault({}) @Mock OAuthFactory oAuthFactory;
     private @NonNullByDefault({}) @Mock HttpClient httpClient;
-    private @NonNullByDefault({}) @Mock TimeZoneProvider timeZoneProvider;
 
     static String getResourceFileAsString(String fileName) throws GroupePSACommunicationException {
         try (InputStream is = GroupePSAConnectApi.class.getResourceAsStream(fileName)) {
@@ -90,7 +87,7 @@ public void setUp() throws GroupePSACommunicationException {
 
         // Create real objects
         bridgeHandler = spy(new GroupePSABridgeHandler(bridge, oAuthFactory, httpClient));
-        thingHandler = spy(new GroupePSAHandler(thing, timeZoneProvider));
+        thingHandler = spy(new GroupePSAHandler(thing));
         api = spy(new GroupePSAConnectApi(httpClient, bridgeHandler, "clientId", "realm"));
 
         // Setup API mock
@@ -124,7 +121,6 @@ public void setUp() throws GroupePSACommunicationException {
         thingHandler.setCallback(thingCallback);
         doReturn(bridge).when(thingHandler).getBridge();
         doNothing().when(thingHandler).buildDoorChannels(any());
-        doReturn(ZoneId.systemDefault()).when(timeZoneProvider).getTimeZone();
     }
 
     @AfterEach

From 836a2794a4858976423152087f82aa736366ffea Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 21:33:36 +0100
Subject: [PATCH 14/52] Simplify DateTimeType handling for Helios easyControls

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/HeliosEasyControlsHandler.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
index 3b8dad53beca3..25c8a894881d1 100644
--- a/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
+++ b/bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
@@ -324,7 +324,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                 value = command == OnOffType.ON ? "1" : "0";
             } else if (command instanceof DateTimeType dateTimeCommand) {
                 try {
-                    ZonedDateTime d = dateTimeCommand.getZonedDateTime();
+                    ZonedDateTime d = dateTimeCommand.getInstant().atZone(ZoneId.systemDefault());
                     if (channelId.equals(HeliosEasyControlsBindingConstants.SYS_DATE)) {
                         setSysDateTime(d);
                     } else if (channelId.equals(HeliosEasyControlsBindingConstants.BYPASS_FROM)) {
@@ -332,7 +332,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     } else if (channelId.equals(HeliosEasyControlsBindingConstants.BYPASS_TO)) {
                         this.setBypass(false, d.getDayOfMonth(), d.getMonthValue());
                     } else {
-                        value = formatDate(channelId, dateTimeCommand.getZonedDateTime());
+                        value = formatDate(channelId, d);
                     }
                 } catch (InterruptedException e) {
                     logger.debug(
@@ -534,11 +534,13 @@ public void readValue(String variableName) {
     }
 
     private void updateSysDate(DateTimeType dateTime) {
-        this.updateSysDateTime(dateTime.getZonedDateTime(), true, sysDate.getOffset().getTotalSeconds() / 60 / 60);
+        this.updateSysDateTime(dateTime.getInstant().atZone(ZoneId.systemDefault()), true,
+                sysDate.getOffset().getTotalSeconds() / 60 / 60);
     }
 
     private void updateSysTime(DateTimeType dateTime) {
-        this.updateSysDateTime(dateTime.getZonedDateTime(), false, sysDate.getOffset().getTotalSeconds() / 60 / 60);
+        this.updateSysDateTime(dateTime.getInstant().atZone(ZoneId.systemDefault()), false,
+                sysDate.getOffset().getTotalSeconds() / 60 / 60);
     }
 
     private void updateUtcOffset(int utcOffset) {

From 18d26a8da73ec27c93ad3f1c2ae55709318e6a98 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 18:18:35 +0100
Subject: [PATCH 15/52] Simplify DateTimeType handling for Hydrawise

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/handler/HydrawiseControllerHandler.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
index 218a9ed92ae94..9c2f4dcb21e40 100644
--- a/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
+++ b/bundles/org.openhab.binding.hydrawise/src/main/java/org/openhab/binding/hydrawise/internal/handler/HydrawiseControllerHandler.java
@@ -16,6 +16,7 @@
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -211,20 +212,20 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     }
                     break;
                 case CHANNEL_ZONE_SUSPENDUNTIL:
-                    if (!(command instanceof DateTimeType)) {
+                    if (!(command instanceof DateTimeType dateTimeCommand)) {
                         logger.warn("Invalid command type for suspend {}", command.getClass().getName());
                         return;
                     }
                     if (allCommand) {
                         client.suspendAllRelays(controllerId,
-                                ((DateTimeType) command).getZonedDateTime().format(DATE_FORMATTER));
+                                dateTimeCommand.getInstant().atZone(ZoneId.systemDefault()).format(DATE_FORMATTER));
                     } else if (zone != null) {
                         client.suspendRelay(zone.id,
-                                ((DateTimeType) command).getZonedDateTime().format(DATE_FORMATTER));
+                                dateTimeCommand.getInstant().atZone(ZoneId.systemDefault()).format(DATE_FORMATTER));
                     }
                     break;
                 default:
-                    logger.warn("Uknown channelId {}", channelId);
+                    logger.warn("Unknown channelId {}", channelId);
                     return;
             }
             HydrawiseAccountHandler handler = getAccountHandler();

From 52ea57aad905ef183b55f37e57764977f85c6167 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:24:31 +0100
Subject: [PATCH 16/52] Simplify DateTimeType handling for IHC

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../converters/DateTimeTypeWSDateValueConverter.java   |  7 +++----
 .../converters/DateTimeTypeWSTimeValueConverter.java   |  7 +++----
 .../binding/ihc/internal/handler/IhcHandler.java       |  6 +++---
 .../binding/ihc/internal/ws/datatypes/WSDate.java      | 10 +++++-----
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSDateValueConverter.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSDateValueConverter.java
index 6b5866aff6e92..9cd686d0dd654 100644
--- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSDateValueConverter.java
+++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSDateValueConverter.java
@@ -12,10 +12,9 @@
  */
 package org.openhab.binding.ihc.internal.converters;
 
-import java.time.ZonedDateTime;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.openhab.binding.ihc.internal.ws.exeptions.ConversionException;
@@ -34,13 +33,13 @@ public class DateTimeTypeWSDateValueConverter implements Converter<WSDateValue,
     public DateTimeType convertFromResourceValue(@NonNull WSDateValue from,
             @NonNull ConverterAdditionalInfo convertData) throws ConversionException {
         Calendar cal = dateTimeToCalendar(from, null);
-        return new DateTimeType(ZonedDateTime.ofInstant(cal.toInstant(), TimeZone.getDefault().toZoneId()));
+        return new DateTimeType(cal.toInstant());
     }
 
     @Override
     public WSDateValue convertFromOHType(@NonNull DateTimeType from, @NonNull WSDateValue value,
             @NonNull ConverterAdditionalInfo convertData) throws ConversionException {
-        Calendar cal = GregorianCalendar.from(from.getZonedDateTime());
+        Calendar cal = GregorianCalendar.from(from.getInstant().atZone(ZoneId.systemDefault()));
         short year = (short) cal.get(Calendar.YEAR);
         byte month = (byte) (cal.get(Calendar.MONTH) + 1);
         byte day = (byte) cal.get(Calendar.DAY_OF_MONTH);
diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSTimeValueConverter.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSTimeValueConverter.java
index 92e156dde653e..fd078edbba07c 100644
--- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSTimeValueConverter.java
+++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/converters/DateTimeTypeWSTimeValueConverter.java
@@ -12,10 +12,9 @@
  */
 package org.openhab.binding.ihc.internal.converters;
 
-import java.time.ZonedDateTime;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.openhab.binding.ihc.internal.ws.exeptions.ConversionException;
@@ -34,13 +33,13 @@ public class DateTimeTypeWSTimeValueConverter implements Converter<WSTimeValue,
     public DateTimeType convertFromResourceValue(@NonNull WSTimeValue from,
             @NonNull ConverterAdditionalInfo convertData) throws ConversionException {
         Calendar cal = dateTimeToCalendar(null, from);
-        return new DateTimeType(ZonedDateTime.ofInstant(cal.toInstant(), TimeZone.getDefault().toZoneId()));
+        return new DateTimeType(cal.toInstant());
     }
 
     @Override
     public WSTimeValue convertFromOHType(@NonNull DateTimeType from, @NonNull WSTimeValue value,
             @NonNull ConverterAdditionalInfo convertData) throws ConversionException {
-        Calendar cal = GregorianCalendar.from(from.getZonedDateTime());
+        Calendar cal = GregorianCalendar.from(from.getInstant().atZone(ZoneId.systemDefault()));
         return new WSTimeValue(value.resourceID, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE),
                 cal.get(Calendar.SECOND));
     }
diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java
index dc79ecd209082..1eeadf9c2faa0 100644
--- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java
+++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java
@@ -17,9 +17,9 @@
 import java.io.File;
 import java.math.BigDecimal;
 import java.time.Duration;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -343,8 +343,8 @@ private void updateControllerTimeChannels() {
             WSTimeManagerSettings timeSettings = ihc.getTimeSettings();
             logger.debug("Controller time settings: {}", timeSettings);
 
-            ZonedDateTime time = timeSettings.getTimeAndDateInUTC().getAsZonedDateTime(ZoneId.of("Z"))
-                    .withZoneSameInstant(ZoneId.systemDefault());
+            Instant time = timeSettings.getTimeAndDateInUTC().getAsInstant(ZoneId.of("Z"));
+
             updateState(new ChannelUID(getThing().getUID(), CHANNEL_CONTROLLER_TIME), new DateTimeType(time));
         } catch (IhcExecption e) {
             logger.warn("Controller uptime information fetch failed, reason: {}.", e.getMessage(), e);
diff --git a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSDate.java b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSDate.java
index a8ea117dcf835..3c7cd832b3b4d 100644
--- a/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSDate.java
+++ b/bundles/org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/datatypes/WSDate.java
@@ -12,9 +12,9 @@
  */
 package org.openhab.binding.ihc.internal.ws.datatypes;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZonedDateTime;
 
 /**
  * Class for WSDate complex type.
@@ -159,11 +159,11 @@ public LocalDateTime getAsLocalDateTime() {
     }
 
     /**
-     * Gets WSDate as ZonedDateTime.
+     * Gets WSDate as {@link Instant}.
      *
-     * @return LocalDateTime
+     * @return Instant
      */
-    public ZonedDateTime getAsZonedDateTime(ZoneId zoneId) {
-        return ZonedDateTime.of(getAsLocalDateTime(), zoneId);
+    public Instant getAsInstant(ZoneId zoneId) {
+        return getAsLocalDateTime().atZone(zoneId).toInstant();
     }
 }

From 995f91f2eda972c1635c68c65eb36034a53b094b Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 16 Nov 2024 00:08:26 +0100
Subject: [PATCH 17/52] Simplify DateTimeType handling for Insteon

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/device/feature/MessageHandler.java       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/feature/MessageHandler.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/feature/MessageHandler.java
index c83fdb44a766f..70860f79983e1 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/feature/MessageHandler.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/feature/MessageHandler.java
@@ -18,8 +18,6 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Map;
 import java.util.Set;
 
@@ -601,18 +599,17 @@ public static class LastTimeMsgHandler extends MessageHandler {
 
         @Override
         public void handleMessage(byte cmd1, Msg msg) {
-            Instant instant = Instant.ofEpochMilli(msg.getTimestamp());
-            ZonedDateTime timestamp = ZonedDateTime.ofInstant(instant, ZoneId.systemDefault());
-            ZonedDateTime lastTimestamp = getLastTimestamp();
+            Instant timestamp = Instant.ofEpochMilli(msg.getTimestamp());
+            Instant lastTimestamp = getLastTimestamp();
             // set last time if not defined yet or message timestamp is greater than last value
             if (lastTimestamp == null || timestamp.compareTo(lastTimestamp) > 0) {
                 feature.updateState(new DateTimeType(timestamp));
             }
         }
 
-        private @Nullable ZonedDateTime getLastTimestamp() {
+        private @Nullable Instant getLastTimestamp() {
             State state = feature.getState();
-            return state instanceof DateTimeType datetime ? datetime.getZonedDateTime() : null;
+            return state instanceof DateTimeType datetime ? datetime.getInstant() : null;
         }
     }
 

From 657848385a094690508d6d1237291a8927e09ef5 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 23:17:08 +0100
Subject: [PATCH 18/52] Simplify DateTimeType handling for JuiceNet

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/JuiceNetHandlerFactory.java      |  8 ++------
 .../handler/JuiceNetDeviceHandler.java        | 20 ++++++-------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/JuiceNetHandlerFactory.java b/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/JuiceNetHandlerFactory.java
index f02729b0b838c..d90b28dbf1abe 100644
--- a/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/JuiceNetHandlerFactory.java
+++ b/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/JuiceNetHandlerFactory.java
@@ -20,7 +20,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.juicenet.internal.handler.JuiceNetBridgeHandler;
 import org.openhab.binding.juicenet.internal.handler.JuiceNetDeviceHandler;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
@@ -44,13 +43,10 @@ public class JuiceNetHandlerFactory extends BaseThingHandlerFactory {
 
     private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(BRIDGE_THING_TYPE, DEVICE_THING_TYPE);
     private final HttpClientFactory httpClientFactory;
-    private final TimeZoneProvider timeZoneProvider;
 
     @Activate
-    public JuiceNetHandlerFactory(@Reference HttpClientFactory httpClientFactory,
-            @Reference TimeZoneProvider timeZoneProvider) {
+    public JuiceNetHandlerFactory(@Reference HttpClientFactory httpClientFactory) {
         this.httpClientFactory = httpClientFactory;
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -65,7 +61,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         if (thingTypeUID.equals(BRIDGE_THING_TYPE)) {
             return new JuiceNetBridgeHandler((Bridge) thing, httpClientFactory.getCommonHttpClient());
         } else if (thingTypeUID.equals(DEVICE_THING_TYPE)) {
-            return new JuiceNetDeviceHandler(thing, timeZoneProvider);
+            return new JuiceNetDeviceHandler(thing);
         }
 
         return null;
diff --git a/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/handler/JuiceNetDeviceHandler.java b/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/handler/JuiceNetDeviceHandler.java
index bc8c67a6e2e91..28668cd0ee3d7 100644
--- a/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/handler/JuiceNetDeviceHandler.java
+++ b/bundles/org.openhab.binding.juicenet/src/main/java/org/openhab/binding/juicenet/internal/handler/JuiceNetDeviceHandler.java
@@ -15,6 +15,7 @@
 import static org.openhab.binding.juicenet.internal.JuiceNetBindingConstants.*;
 
 import java.time.Instant;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoField;
 import java.util.Objects;
@@ -29,7 +30,6 @@
 import org.openhab.binding.juicenet.internal.api.dto.JuiceNetApiInfo;
 import org.openhab.binding.juicenet.internal.api.dto.JuiceNetApiTouSchedule;
 import org.openhab.core.config.core.Configuration;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
@@ -61,8 +61,6 @@ public class JuiceNetDeviceHandler extends BaseThingHandler {
 
     private final Logger logger = LoggerFactory.getLogger(JuiceNetDeviceHandler.class);
 
-    private final TimeZoneProvider timeZoneProvider;
-
     // properties
     private String name = "";
 
@@ -75,10 +73,8 @@ public class JuiceNetDeviceHandler extends BaseThingHandler {
     JuiceNetApiTouSchedule deviceTouSchedule = new JuiceNetApiTouSchedule();
     JuiceNetApiCar deviceCar = new JuiceNetApiCar();
 
-    public JuiceNetDeviceHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
+    public JuiceNetDeviceHandler(Thing thing) {
         super(thing);
-
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     public void setNameAndToken(String name, String token) {
@@ -219,7 +215,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                         return;
                     }
 
-                    ZonedDateTime datetime = ((DateTimeType) command).getZonedDateTime();
+                    ZonedDateTime datetime = ((DateTimeType) command).getInstant().atZone(ZoneId.systemDefault());
                     Long targetTime = datetime.toEpochSecond() + datetime.get(ChronoField.OFFSET_SECONDS);
                     logger.debug("DateTime: {} - {}", datetime.toString(), targetTime);
 
@@ -314,10 +310,6 @@ public void queryDeviceStatusAndInfo() {
         }
     }
 
-    private ZonedDateTime toZonedDateTime(long localEpochSeconds) {
-        return Instant.ofEpochSecond(localEpochSeconds).atZone(timeZoneProvider.getTimeZone());
-    }
-
     private void refreshStatusChannels() {
         updateState(CHANNEL_STATE, new StringType(deviceStatus.state));
 
@@ -332,9 +324,9 @@ private void refreshStatusChannels() {
         updateState(CHANNEL_MESSAGE, new StringType(deviceStatus.message));
         updateState(CHANNEL_OVERRIDE, OnOffType.from(deviceStatus.showOverride));
         updateState(CHANNEL_CHARGING_TIME_LEFT, new QuantityType<>(deviceStatus.chargingTimeLeft, Units.SECOND));
-        updateState(CHANNEL_PLUG_UNPLUG_TIME, new DateTimeType(toZonedDateTime(deviceStatus.plugUnplugTime)));
-        updateState(CHANNEL_TARGET_TIME, new DateTimeType(toZonedDateTime(deviceStatus.targetTime)));
-        updateState(CHANNEL_UNIT_TIME, new DateTimeType(toZonedDateTime(deviceStatus.utcTime)));
+        updateState(CHANNEL_PLUG_UNPLUG_TIME, new DateTimeType(Instant.ofEpochSecond(deviceStatus.plugUnplugTime)));
+        updateState(CHANNEL_TARGET_TIME, new DateTimeType(Instant.ofEpochSecond(deviceStatus.targetTime)));
+        updateState(CHANNEL_UNIT_TIME, new DateTimeType(Instant.ofEpochSecond(deviceStatus.utcTime)));
         updateState(CHANNEL_TEMPERATURE, new QuantityType<>(deviceStatus.temperature, SIUnits.CELSIUS));
         updateState(CHANNEL_CURRENT_LIMIT, new QuantityType<>(deviceStatus.charging.ampsLimit, Units.AMPERE));
         updateState(CHANNEL_CURRENT, new QuantityType<>(deviceStatus.charging.ampsCurrent, Units.AMPERE));

From 736c8686736097c3f19247a4a8350b5119026f5c Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 18:27:32 +0100
Subject: [PATCH 19/52] Simplify DateTimeType handling for KM200

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/km200/internal/handler/KM200DataHandler.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/handler/KM200DataHandler.java b/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/handler/KM200DataHandler.java
index e733bf4bf3406..3aaea9d3382d5 100644
--- a/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/handler/KM200DataHandler.java
+++ b/bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/handler/KM200DataHandler.java
@@ -16,6 +16,7 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -675,7 +676,7 @@ public KM200DataHandler(KM200Device remoteDevice) {
                             break;
                     }
                 } else if (CoreItemFactory.DATETIME.equals(itemType)) {
-                    ZonedDateTime swTime = ((DateTimeType) command).getZonedDateTime();
+                    ZonedDateTime swTime = ((DateTimeType) command).getInstant().atZone(ZoneId.systemDefault());
                     KM200SwitchProgramServiceHandler sPService = ((KM200SwitchProgramServiceHandler) objParent
                             .getValueParameter());
                     if (null != sPService) {

From 7f6db7f639304c1cb7ce5bd3168c258f4ff16796 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 21:04:06 +0100
Subject: [PATCH 20/52] Simplify DateTimeType handling for LaMetric

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/lametrictime/internal/handler/ClockAppHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/handler/ClockAppHandler.java b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/handler/ClockAppHandler.java
index c307074c3de17..3c197750168d7 100644
--- a/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/handler/ClockAppHandler.java
+++ b/bundles/org.openhab.binding.lametrictime/src/main/java/org/openhab/binding/lametrictime/internal/handler/ClockAppHandler.java
@@ -15,6 +15,7 @@
 import static org.openhab.binding.lametrictime.internal.LaMetricTimeBindingConstants.*;
 
 import java.time.LocalTime;
+import java.time.ZoneId;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -53,7 +54,7 @@ public void handleAppCommand(ChannelUID channelUID, Command command) {
         try {
             switch (channelUID.getId()) {
                 case CHANNEL_APP_SET_ALARM: {
-                    LocalTime time = ((DateTimeType) command).getZonedDateTime().toLocalTime();
+                    LocalTime time = ((DateTimeType) command).getInstant().atZone(ZoneId.systemDefault()).toLocalTime();
                     getDevice().doAction(getWidget(), CoreApps.clock().setAlarm(true, time, null));
                     updateActiveAppOnDevice();
                     break;

From 98b9d650afe89796220e129f75b6ba97ea64cd96 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 21:11:16 +0100
Subject: [PATCH 21/52] Simplify DateTimeType handling for Lutron

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/lutron/internal/grxprg/PrgBridgeHandler.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgBridgeHandler.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgBridgeHandler.java
index 72983b4e20ebe..7e6bb6a47cd61 100644
--- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgBridgeHandler.java
+++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/grxprg/PrgBridgeHandler.java
@@ -13,6 +13,7 @@
 package org.openhab.binding.lutron.internal.grxprg;
 
 import java.io.IOException;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.GregorianCalendar;
 import java.util.concurrent.ScheduledFuture;
@@ -165,8 +166,8 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         } else if (id.equals(PrgConstants.CHANNEL_ZONERAISESTOP)) {
             protocolHandler.setZoneRaiseStop();
         } else if (id.equals(PrgConstants.CHANNEL_TIMECLOCK)) {
-            if (command instanceof DateTimeType dateTime) {
-                final ZonedDateTime zdt = dateTime.getZonedDateTime();
+            if (command instanceof DateTimeType dateTimeCommand) {
+                final ZonedDateTime zdt = dateTimeCommand.getInstant().atZone(ZoneId.systemDefault());
                 protocolHandler.setTime(GregorianCalendar.from(zdt));
             } else {
                 logger.error("Received a TIMECLOCK channel command with a non DateTimeType: {}", command);

From 5d5065904a8d44b0cc8db6e04ca62064c835c9dd Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 25 Nov 2024 22:38:33 +0100
Subject: [PATCH 22/52] Simplify DateTimeType handling for Meater

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../meater/internal/handler/MeaterHandler.java        | 11 +++--------
 .../meater/internal/handler/MeaterHandlerFactory.java |  7 ++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java b/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java
index 251de619e8bad..6d22995bbadae 100644
--- a/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java
+++ b/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandler.java
@@ -15,14 +15,12 @@
 import static org.openhab.binding.meater.internal.MeaterBindingConstants.*;
 
 import java.time.Instant;
-import java.time.ZonedDateTime;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.meater.internal.MeaterConfiguration;
 import org.openhab.binding.meater.internal.dto.MeaterProbeDTO.Cook;
 import org.openhab.binding.meater.internal.dto.MeaterProbeDTO.Device;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
@@ -49,11 +47,9 @@
 public class MeaterHandler extends BaseThingHandler {
 
     private String deviceId = "";
-    private TimeZoneProvider timeZoneProvider;
 
-    public MeaterHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
+    public MeaterHandler(Thing thing) {
         super(thing);
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -147,14 +143,13 @@ private State getValue(String channelId, Device meaterProbe) {
             case CHANNEL_LAST_CONNECTION:
                 Instant instant = meaterProbe.getLastConnection();
                 if (instant != null) {
-                    return new DateTimeType(ZonedDateTime.ofInstant(instant, timeZoneProvider.getTimeZone()));
+                    return new DateTimeType(instant);
                 }
                 break;
             case CHANNEL_COOK_ESTIMATED_END_TIME:
                 if (cook != null) {
                     if (cook.time.remaining > -1) {
-                        return new DateTimeType(
-                                ZonedDateTime.now(timeZoneProvider.getTimeZone()).plusSeconds(cook.time.remaining));
+                        return new DateTimeType(Instant.now().plusSeconds(cook.time.remaining));
                     }
                 }
         }
diff --git a/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandlerFactory.java b/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandlerFactory.java
index c81282b7fbd64..e450d6b1ccf97 100644
--- a/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandlerFactory.java
+++ b/bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterHandlerFactory.java
@@ -20,7 +20,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
 import org.openhab.core.i18n.LocaleProvider;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
@@ -49,13 +48,11 @@ public class MeaterHandlerFactory extends BaseThingHandlerFactory {
 
     private final Gson gson;
     private final HttpClient httpClient;
-    private final TimeZoneProvider timeZoneProvider;
     private final LocaleProvider localeProvider;
 
     @Activate
-    public MeaterHandlerFactory(@Reference TimeZoneProvider timeZoneProvider, @Reference LocaleProvider localeProvider,
+    public MeaterHandlerFactory(@Reference LocaleProvider localeProvider,
             @Reference HttpClientFactory httpClientFactory) {
-        this.timeZoneProvider = timeZoneProvider;
         this.localeProvider = localeProvider;
         this.httpClient = httpClientFactory.getCommonHttpClient();
         this.gson = new Gson();
@@ -71,7 +68,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
         if (THING_TYPE_MEATER_PROBE.equals(thingTypeUID)) {
-            return new MeaterHandler(thing, timeZoneProvider);
+            return new MeaterHandler(thing);
         } else if (THING_TYPE_BRIDGE.equals(thingTypeUID)) {
             return new MeaterBridgeHandler((Bridge) thing, httpClient, gson, localeProvider);
         }

From 2e9d9748a690bf3ba880ec858f869cd8ea4f71cf Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Tue, 19 Nov 2024 21:01:03 +0100
Subject: [PATCH 23/52] Simplify DateTimeType handling for Mercedes Me

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/mercedesme/internal/handler/VehicleHandler.java    | 3 ++-
 .../org/openhab/binding/mercedesme/internal/utils/Utils.java   | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
index 40afa829c54e6..cffc68af438bb 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/handler/VehicleHandler.java
@@ -14,6 +14,7 @@
 
 import static org.openhab.binding.mercedesme.internal.Constants.*;
 
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -915,7 +916,7 @@ public void distributeContent(VEPUpdate data) {
                 if (vas != null && !Utils.isNil(vas)) {
                     // proto weekday starts with MONDAY=0, java ZonedDateTime starts with MONDAY=1
                     long estimatedWeekday = Utils.getInt(vas) + 1;
-                    ZonedDateTime storedZdt = endDateTimeType.getZonedDateTime();
+                    ZonedDateTime storedZdt = endDateTimeType.getInstant().atZone(ZoneId.systemDefault());
                     long storedWeekday = storedZdt.getDayOfWeek().getValue();
                     // check if estimated weekday is smaller than stored
                     // estimation Monday=1 vs. stored Saturday=6 => (7+1)-6=2 days ahead
diff --git a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Utils.java b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Utils.java
index 3be8fecdd3a06..8d238afa7f51a 100644
--- a/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Utils.java
+++ b/bundles/org.openhab.binding.mercedesme/src/main/java/org/openhab/binding/mercedesme/internal/utils/Utils.java
@@ -107,8 +107,7 @@ public static void initialize(TimeZoneProvider tzp, LocaleProvider lp) {
      * @return openHAB DateTimeType according to configured TimeZone
      */
     public static DateTimeType getDateTimeType(long ms) {
-        Instant timestamp = Instant.ofEpochMilli(ms);
-        return new DateTimeType(timestamp.atZone(timeZoneProvider.getTimeZone()));
+        return new DateTimeType(Instant.ofEpochMilli(ms));
     }
 
     /**

From 83c08c1c78aec36d59afae0f44874a7b997c83e6 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 25 Nov 2024 22:30:14 +0100
Subject: [PATCH 24/52] Simplify DateTimeType handling for Met Office DataHub

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../metofficedatahub/internal/MetOfficeDataHubSiteHandler.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.metofficedatahub/src/main/java/org/openhab/binding/metofficedatahub/internal/MetOfficeDataHubSiteHandler.java b/bundles/org.openhab.binding.metofficedatahub/src/main/java/org/openhab/binding/metofficedatahub/internal/MetOfficeDataHubSiteHandler.java
index 0ed30b8fae373..f2a8c41508a2e 100644
--- a/bundles/org.openhab.binding.metofficedatahub/src/main/java/org/openhab/binding/metofficedatahub/internal/MetOfficeDataHubSiteHandler.java
+++ b/bundles/org.openhab.binding.metofficedatahub/src/main/java/org/openhab/binding/metofficedatahub/internal/MetOfficeDataHubSiteHandler.java
@@ -564,7 +564,7 @@ private static String calculatePrefix(final String prefix, final int plusOffset)
     }
 
     protected State getDateTimeTypeState(@Nullable String value) {
-        return (value == null) ? UnDefType.UNDEF : new DateTimeType(value).toLocaleZone();
+        return (value == null) ? UnDefType.UNDEF : new DateTimeType(value);
     }
 
     protected State getQuantityTypeState(@Nullable Number value, Unit<?> unit) {

From 7d99eae052ca5e7d93d6744d0b5c58619d79d439 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:29:18 +0100
Subject: [PATCH 25/52] Simplify DateTimeType handling for Mi IO

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/miio/internal/handler/MiIoVacuumHandler.java     | 4 ++--
 .../binding/miio/internal/handler/MiIoVacuumHandlerTest.java | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
index 2b0efc2e322ad..01a791fb68af1 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
@@ -552,12 +552,12 @@ private void updateHistoryRecord(HistoryRecordDTO historyRecordDTO) {
         JsonObject historyRecord = GSON.toJsonTree(historyRecordDTO).getAsJsonObject();
         if (historyRecordDTO.getStart() != null) {
             DateTimeType start = new DateTimeType(historyRecordDTO.getStart());
-            historyRecord.addProperty("start", start.toLocaleZone().format(null));
+            historyRecord.addProperty("start", start.format(null));
             updateState(CHANNEL_HISTORY_START_TIME, start);
         }
         if (historyRecordDTO.getEnd() != null) {
             DateTimeType end = new DateTimeType(historyRecordDTO.getEnd());
-            historyRecord.addProperty("end", end.toLocaleZone().format(null));
+            historyRecord.addProperty("end", end.format(null));
             updateState(CHANNEL_HISTORY_END_TIME, end);
         }
         if (historyRecordDTO.getDuration() != null) {
diff --git a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandlerTest.java b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandlerTest.java
index 57f4144d461d0..b170802753854 100644
--- a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandlerTest.java
+++ b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandlerTest.java
@@ -17,7 +17,6 @@
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.concurrent.TimeUnit;
 
@@ -132,11 +131,11 @@ public void TestCleanRecord() {
 
         verify(callback, description("Test the start time parsing")).stateUpdated(
                 eq(new ChannelUID(thingUID, MiIoBindingConstants.CHANNEL_HISTORY_START_TIME)),
-                eq(new DateTimeType(ZonedDateTime.parse("2024-08-20T19:20:13+02:00")).toZone(ZoneId.systemDefault())));
+                eq(new DateTimeType(ZonedDateTime.parse("2024-08-20T19:20:13+02:00"))));
 
         verify(callback, description("Test the end time parsing")).stateUpdated(
                 eq(new ChannelUID(thingUID, MiIoBindingConstants.CHANNEL_HISTORY_END_TIME)),
-                eq(new DateTimeType(ZonedDateTime.parse("2024-08-20T19:20:59+02:00")).toZone(ZoneId.systemDefault())));
+                eq(new DateTimeType(ZonedDateTime.parse("2024-08-20T19:20:59+02:00"))));
 
         verify(callback, description("Test the duration parsing")).stateUpdated(
                 eq(new ChannelUID(thingUID, MiIoBindingConstants.CHANNEL_HISTORY_DURATION)),

From 8460955f7b1fc9341f68c9de0a055e4f6be79a67 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 16 Nov 2024 00:04:16 +0100
Subject: [PATCH 26/52] Simplify DateTimeType handling for Millheat

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../millheat/internal/handler/MillheatAccountHandler.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatAccountHandler.java b/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatAccountHandler.java
index ef8620d62199f..4fe58535fc4f2 100644
--- a/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatAccountHandler.java
+++ b/bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatAccountHandler.java
@@ -420,7 +420,7 @@ public void updateVacationProperty(Home home, String property, Command command)
         try {
             switch (property) {
                 case SetHolidayParameterRequest.PROP_START: {
-                    long epoch = ((DateTimeType) command).getZonedDateTime().toEpochSecond();
+                    long epoch = ((DateTimeType) command).getInstant().getEpochSecond();
                     SetHolidayParameterRequest req = new SetHolidayParameterRequest(home.getId(), home.getTimezone(),
                             SetHolidayParameterRequest.PROP_START, epoch);
                     if (sendLoggedInRequest(req, SetHolidayParameterResponse.class).isSuccess()) {
@@ -429,7 +429,7 @@ public void updateVacationProperty(Home home, String property, Command command)
                     break;
                 }
                 case SetHolidayParameterRequest.PROP_END: {
-                    long epoch = ((DateTimeType) command).getZonedDateTime().toEpochSecond();
+                    long epoch = ((DateTimeType) command).getInstant().getEpochSecond();
                     SetHolidayParameterRequest req = new SetHolidayParameterRequest(home.getId(), home.getTimezone(),
                             SetHolidayParameterRequest.PROP_END, epoch);
                     if (sendLoggedInRequest(req, SetHolidayParameterResponse.class).isSuccess()) {

From 72386852ed55878e74849b6804ddfe5b50811cf8 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Tue, 19 Nov 2024 21:17:30 +0100
Subject: [PATCH 27/52] Simplify DateTimeType handling for MQTT

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../openhab/binding/mqtt/generic/values/DateTimeValue.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/DateTimeValue.java b/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/DateTimeValue.java
index 27056e8328b56..13f264d059da2 100644
--- a/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/DateTimeValue.java
+++ b/bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/values/DateTimeValue.java
@@ -12,6 +12,8 @@
  */
 package org.openhab.binding.mqtt.generic.values;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
@@ -45,11 +47,12 @@ public DateTimeType parseCommand(Command command) throws IllegalArgumentExceptio
 
     @Override
     public String getMQTTpublishValue(Command command, @Nullable String pattern) {
+        ZonedDateTime zonedDateTime = ((DateTimeType) command).getInstant().atZone(ZoneId.systemDefault());
         String formatPattern = pattern;
         if (formatPattern == null || "%s".contentEquals(formatPattern)) {
-            return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(((DateTimeType) command).getZonedDateTime());
+            return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(zonedDateTime);
         }
-        return String.format(formatPattern, ((DateTimeType) command).getZonedDateTime());
+        return String.format(formatPattern, zonedDateTime);
     }
 
     @Override

From 3f7deba13ef160c1c72576559c22365b152d1cae Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 24 Nov 2024 23:28:31 +0100
Subject: [PATCH 28/52] Simplify DateTimeType handling for Ruuvi Gateway MQTT

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../mqtt/ruuvigateway/internal/RuuviCachedDateTimeState.java | 5 +----
 .../openhab/binding/mqtt/ruuvigateway/RuuviGatewayTest.java  | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/java/org/openhab/binding/mqtt/ruuvigateway/internal/RuuviCachedDateTimeState.java b/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/java/org/openhab/binding/mqtt/ruuvigateway/internal/RuuviCachedDateTimeState.java
index 67f59d7e4dd73..e8830efab85d7 100644
--- a/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/java/org/openhab/binding/mqtt/ruuvigateway/internal/RuuviCachedDateTimeState.java
+++ b/bundles/org.openhab.binding.mqtt.ruuvigateway/src/main/java/org/openhab/binding/mqtt/ruuvigateway/internal/RuuviCachedDateTimeState.java
@@ -13,7 +13,6 @@
 package org.openhab.binding.mqtt.ruuvigateway.internal;
 
 import java.time.Instant;
-import java.time.ZoneId;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.mqtt.generic.ChannelConfig;
@@ -33,8 +32,6 @@
 @NonNullByDefault
 public class RuuviCachedDateTimeState extends ChannelState {
 
-    private static final ZoneId UTC = ZoneId.of("UTC");
-
     /**
      * Construct cache for DateTime values
      *
@@ -51,6 +48,6 @@ public RuuviCachedDateTimeState(ChannelUID channelUID) {
      * @param value instant representing value
      */
     public void update(Instant value) {
-        cachedValue.update(new DateTimeType(value.atZone(UTC)));
+        cachedValue.update(new DateTimeType(value));
     }
 }
diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/src/main/java/org/openhab/binding/mqtt/ruuvigateway/RuuviGatewayTest.java b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/src/main/java/org/openhab/binding/mqtt/ruuvigateway/RuuviGatewayTest.java
index ab2fad13c5a7b..33082434c5b17 100644
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/src/main/java/org/openhab/binding/mqtt/ruuvigateway/RuuviGatewayTest.java
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/src/main/java/org/openhab/binding/mqtt/ruuvigateway/RuuviGatewayTest.java
@@ -24,7 +24,6 @@
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -353,8 +352,8 @@ private void assertItems(Function<String, State> channelStateGetter, String temp
 
         assertEquals(new QuantityType<>(new BigDecimal(rssiDecibelMilliwatts), Units.DECIBEL_MILLIWATTS),
                 channelStateGetter.apply(CHANNEL_ID_RSSI));
-        assertEquals(new DateTimeType(ts.atZone(ZoneId.of("UTC"))), channelStateGetter.apply(CHANNEL_ID_TS));
-        assertEquals(new DateTimeType(gwts.atZone(ZoneId.of("UTC"))), channelStateGetter.apply(CHANNEL_ID_GWTS));
+        assertEquals(new DateTimeType(ts), channelStateGetter.apply(CHANNEL_ID_TS));
+        assertEquals(new DateTimeType(gwts), channelStateGetter.apply(CHANNEL_ID_GWTS));
         assertEquals(new StringType(gwMac), channelStateGetter.apply(CHANNEL_ID_GWMAC));
     }
 

From 229a86b46e9b08b412908d81e38d60b0e4e8702d Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:33:00 +0100
Subject: [PATCH 29/52] Simplify DateTimeType handling for Network

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/network/internal/handler/NetworkHandler.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java
index b6995792f8862..3f460daa3f8f7 100644
--- a/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java
+++ b/bundles/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/handler/NetworkHandler.java
@@ -17,12 +17,10 @@
 
 import java.time.Duration;
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.network.internal.NetworkBindingConfiguration;
@@ -104,8 +102,7 @@ private void refreshValue(ChannelUID channelUID) {
             case CHANNEL_LASTSEEN:
                 Instant lastSeen = presenceDetection.getLastSeen();
                 if (lastSeen != null) {
-                    updateState(CHANNEL_LASTSEEN, new DateTimeType(
-                            ZonedDateTime.ofInstant(lastSeen, TimeZone.getDefault().toZoneId()).withFixedOffsetZone()));
+                    updateState(CHANNEL_LASTSEEN, new DateTimeType(lastSeen));
                 } else {
                     updateState(CHANNEL_LASTSEEN, UnDefType.UNDEF);
                 }
@@ -146,8 +143,7 @@ public void finalDetectionResult(PresenceDetectionValue value) {
 
         Instant lastSeen = presenceDetection.getLastSeen();
         if (value.isReachable() && lastSeen != null) {
-            updateState(CHANNEL_LASTSEEN, new DateTimeType(
-                    ZonedDateTime.ofInstant(lastSeen, TimeZone.getDefault().toZoneId()).withFixedOffsetZone()));
+            updateState(CHANNEL_LASTSEEN, new DateTimeType(lastSeen));
         } else if (!value.isReachable() && lastSeen == null) {
             updateState(CHANNEL_LASTSEEN, UnDefType.UNDEF);
         }

From ce6240d037cab2712a391d818e25b6cac66e7565 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 16 Nov 2024 12:48:43 +0100
Subject: [PATCH 30/52] Simplify DateTimeType handling for Nest

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../nest/internal/sdm/SDMThingHandlerFactory.java   | 13 +++++--------
 .../nest/internal/sdm/handler/SDMBaseHandler.java   |  5 +----
 .../nest/internal/sdm/handler/SDMCameraHandler.java | 11 ++++-------
 .../internal/sdm/handler/SDMThermostatHandler.java  | 13 ++++++-------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/SDMThingHandlerFactory.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/SDMThingHandlerFactory.java
index 70c30e31963eb..991c25040bf66 100644
--- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/SDMThingHandlerFactory.java
+++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/SDMThingHandlerFactory.java
@@ -20,7 +20,6 @@
 import org.openhab.binding.nest.internal.sdm.handler.SDMCameraHandler;
 import org.openhab.binding.nest.internal.sdm.handler.SDMThermostatHandler;
 import org.openhab.core.auth.client.oauth2.OAuthFactory;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.Thing;
@@ -44,14 +43,12 @@ public class SDMThingHandlerFactory extends BaseThingHandlerFactory {
 
     private HttpClientFactory httpClientFactory;
     private OAuthFactory oAuthFactory;
-    private final TimeZoneProvider timeZoneProvider;
 
     @Activate
     public SDMThingHandlerFactory(final @Reference HttpClientFactory httpClientFactory,
-            final @Reference OAuthFactory oAuthFactory, final @Reference TimeZoneProvider timeZoneProvider) {
+            final @Reference OAuthFactory oAuthFactory) {
         this.httpClientFactory = httpClientFactory;
         this.oAuthFactory = oAuthFactory;
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -66,13 +63,13 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         if (thingTypeUID.equals(THING_TYPE_ACCOUNT)) {
             return new SDMAccountHandler((Bridge) thing, httpClientFactory, oAuthFactory);
         } else if (thingTypeUID.equals(THING_TYPE_CAMERA)) {
-            return new SDMCameraHandler(thing, timeZoneProvider);
+            return new SDMCameraHandler(thing);
         } else if (thingTypeUID.equals(THING_TYPE_DISPLAY)) {
-            return new SDMCameraHandler(thing, timeZoneProvider);
+            return new SDMCameraHandler(thing);
         } else if (thingTypeUID.equals(THING_TYPE_DOORBELL)) {
-            return new SDMCameraHandler(thing, timeZoneProvider);
+            return new SDMCameraHandler(thing);
         } else if (thingTypeUID.equals(THING_TYPE_THERMOSTAT)) {
-            return new SDMThermostatHandler(thing, timeZoneProvider);
+            return new SDMThermostatHandler(thing);
         }
 
         return null;
diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMBaseHandler.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMBaseHandler.java
index 4ff9d7c228470..4cdb6d988e87b 100644
--- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMBaseHandler.java
+++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMBaseHandler.java
@@ -46,7 +46,6 @@
 import org.openhab.binding.nest.internal.sdm.exception.FailedSendingSDMDataException;
 import org.openhab.binding.nest.internal.sdm.exception.InvalidSDMAccessTokenException;
 import org.openhab.binding.nest.internal.sdm.listener.SDMEventListener;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.Thing;
@@ -75,11 +74,9 @@ public abstract class SDMBaseHandler extends BaseThingHandler implements SDMIden
     protected String deviceId = "";
     protected @Nullable ZonedDateTime lastRefreshDateTime;
     protected @Nullable ScheduledFuture<?> refreshJob;
-    protected final TimeZoneProvider timeZoneProvider;
 
-    public SDMBaseHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
+    public SDMBaseHandler(Thing thing) {
         super(thing);
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMCameraHandler.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMCameraHandler.java
index 5be35ac112cb6..cbca490fcaf37 100644
--- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMCameraHandler.java
+++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMCameraHandler.java
@@ -37,7 +37,6 @@
 import org.openhab.binding.nest.internal.sdm.exception.FailedSendingSDMDataException;
 import org.openhab.binding.nest.internal.sdm.exception.InvalidSDMAccessTokenException;
 import org.openhab.core.config.core.Configuration;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.RawType;
 import org.openhab.core.library.types.StringType;
@@ -64,8 +63,8 @@ public class SDMCameraHandler extends SDMBaseHandler {
     private @Nullable ZonedDateTime lastPersonEventTimestamp;
     private @Nullable ZonedDateTime lastSoundEventTimestamp;
 
-    public SDMCameraHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
-        super(thing, timeZoneProvider);
+    public SDMCameraHandler(Thing thing) {
+        super(thing);
     }
 
     private void updateLiveStreamChannels() throws FailedSendingSDMDataException, InvalidSDMAccessTokenException {
@@ -87,8 +86,7 @@ private void updateLiveStreamChannels() throws FailedSendingSDMDataException, In
         SDMGenerateCameraRtspStreamResults results = response.results;
         if (results != null) {
             updateState(CHANNEL_LIVE_STREAM_CURRENT_TOKEN, new StringType(results.streamToken));
-            updateState(CHANNEL_LIVE_STREAM_EXPIRATION_TIMESTAMP,
-                    new DateTimeType(results.expiresAt.withZoneSameInstant(timeZoneProvider.getTimeZone())));
+            updateState(CHANNEL_LIVE_STREAM_EXPIRATION_TIMESTAMP, new DateTimeType(results.expiresAt));
             updateState(CHANNEL_LIVE_STREAM_EXTENSION_TOKEN, new StringType(results.streamExtensionToken));
             updateState(CHANNEL_LIVE_STREAM_URL, new StringType(results.streamUrls.rtspUrl));
         }
@@ -167,8 +165,7 @@ public void onEvent(SDMEvent event) {
             updateState(imageChannelName, getCameraImage(event.eventId, imageWidth, imageHeight));
         }
 
-        updateState(timeChannelName,
-                new DateTimeType(eventTimestamp.withZoneSameInstant(timeZoneProvider.getTimeZone())));
+        updateState(timeChannelName, new DateTimeType(eventTimestamp));
 
         logger.debug("Updated {} channel and {} with image of event at {}", imageChannelName, timeChannelName,
                 eventTimestamp);
diff --git a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java
index 52eef53fe9746..70f5452a2a70d 100644
--- a/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java
+++ b/bundles/org.openhab.binding.nest/src/main/java/org/openhab/binding/nest/internal/sdm/handler/SDMThermostatHandler.java
@@ -19,7 +19,7 @@
 
 import java.math.BigDecimal;
 import java.time.Duration;
-import java.time.ZonedDateTime;
+import java.time.Instant;
 
 import javax.measure.Unit;
 import javax.measure.quantity.Temperature;
@@ -49,7 +49,6 @@
 import org.openhab.binding.nest.internal.sdm.exception.FailedSendingSDMDataException;
 import org.openhab.binding.nest.internal.sdm.exception.InvalidSDMAccessTokenException;
 import org.openhab.core.config.core.Configuration;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.QuantityType;
@@ -75,8 +74,8 @@ public class SDMThermostatHandler extends SDMBaseHandler {
 
     private final Logger logger = LoggerFactory.getLogger(SDMThermostatHandler.class);
 
-    public SDMThermostatHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
-        super(thing, timeZoneProvider);
+    public SDMThermostatHandler(Thing thing) {
+        super(thing);
     }
 
     @SuppressWarnings("unchecked")
@@ -108,7 +107,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                 }
             } else if (CHANNEL_FAN_TIMER_TIMEOUT.equals(channelUID.getId())) {
                 if (command instanceof DateTimeType dateTimeCommand) {
-                    Duration duration = Duration.between(ZonedDateTime.now(), dateTimeCommand.getZonedDateTime());
+                    Duration duration = Duration.between(Instant.now(), dateTimeCommand.getInstant());
                     executeDeviceCommand(new SDMSetFanTimerRequest(SDMFanTimerMode.ON, duration));
                     delayedRefresh();
                 }
@@ -169,8 +168,8 @@ protected void updateStateWithTraits(SDMTraits traits) {
         SDMFanTrait fan = traits.fan;
         if (fan != null) {
             updateState(CHANNEL_FAN_TIMER_MODE, OnOffType.from(fan.timerMode == SDMFanTimerMode.ON));
-            updateState(CHANNEL_FAN_TIMER_TIMEOUT, fan.timerTimeout == null ? UnDefType.NULL
-                    : new DateTimeType(fan.timerTimeout.withZoneSameInstant(timeZoneProvider.getTimeZone())));
+            updateState(CHANNEL_FAN_TIMER_TIMEOUT,
+                    fan.timerTimeout == null ? UnDefType.NULL : new DateTimeType(fan.timerTimeout));
         }
 
         SDMThermostatHvacTrait thermostatHvac = traits.thermostatHvac;

From 9927cd9bce7042aa198c3fd6d08246c5272913aa Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 17 Nov 2024 21:46:54 +0100
Subject: [PATCH 31/52] Simplify DateTimeType handling for OJElectronics

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../ojelectronics/internal/ThermostatHandler.java        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
index 10098113e4451..80a889584e437 100644
--- a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
@@ -212,7 +212,7 @@ private void updateBoostEndTime(ThermostatModel thermostat) {
 
     private void updateBoostEndTime(Command command) {
         if (command instanceof DateTimeType dateTimeCommand) {
-            getCurrentThermostat().boostEndTime = Date.from(dateTimeCommand.getZonedDateTime().toInstant());
+            getCurrentThermostat().boostEndTime = Date.from(dateTimeCommand.getInstant());
         } else {
             logger.warn("Unable to set value {}", command);
         }
@@ -225,8 +225,7 @@ private void updateComfortEndTime(ThermostatModel thermostat) {
 
     private void updateComfortEndTime(Command command) {
         if (command instanceof DateTimeType dateTimeCommand) {
-            getCurrentThermostat().comfortEndTime = Objects
-                    .requireNonNull(Date.from(dateTimeCommand.getZonedDateTime().toInstant()));
+            getCurrentThermostat().comfortEndTime = Objects.requireNonNull(Date.from(dateTimeCommand.getInstant()));
         } else {
             logger.warn("Unable to set value {}", command);
         }
@@ -329,7 +328,7 @@ private void updateVacationBeginDay(ThermostatModel thermostat) {
     private void updateVacationBeginDay(Command command) {
         if (command instanceof DateTimeType dateTimeCommand) {
             getCurrentThermostat().vacationBeginDay = Date
-                    .from(dateTimeCommand.getZonedDateTime().toInstant().truncatedTo(ChronoUnit.DAYS));
+                    .from(dateTimeCommand.getInstant().truncatedTo(ChronoUnit.DAYS));
         } else {
             logger.warn("Unable to set value {}", command);
         }
@@ -345,7 +344,7 @@ private void updateVacationEndDay(ThermostatModel thermostat) {
     private void updateVacationEndDay(Command command) {
         if (command instanceof DateTimeType dateTimeCommand) {
             getCurrentThermostat().vacationEndDay = Date
-                    .from(dateTimeCommand.getZonedDateTime().toInstant().truncatedTo(ChronoUnit.DAYS));
+                    .from(dateTimeCommand.getInstant().truncatedTo(ChronoUnit.DAYS));
         } else {
             logger.warn("Unable to set value {}", command);
         }

From 4b18179e3e18a72d7288d48a7a543d4ca233a898 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 20:28:19 +0100
Subject: [PATCH 32/52] Simplify DateTimeType handling for OpenUV

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../openuv/internal/handler/OpenUVReportHandler.java        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.openuv/src/main/java/org/openhab/binding/openuv/internal/handler/OpenUVReportHandler.java b/bundles/org.openhab.binding.openuv/src/main/java/org/openhab/binding/openuv/internal/handler/OpenUVReportHandler.java
index cc61c50106e21..ee28d856dd104 100644
--- a/bundles/org.openhab.binding.openuv/src/main/java/org/openhab/binding/openuv/internal/handler/OpenUVReportHandler.java
+++ b/bundles/org.openhab.binding.openuv/src/main/java/org/openhab/binding/openuv/internal/handler/OpenUVReportHandler.java
@@ -14,8 +14,7 @@
 
 import static org.openhab.binding.openuv.internal.OpenUVBindingConstants.*;
 
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -100,8 +99,7 @@ private void scheduleUVMaxEvent(OpenUVResult openUVData) {
         if ((job == null || job.isCancelled())) {
             State uvMaxTime = openUVData.getUVMaxTime();
             if (uvMaxTime instanceof DateTimeType uvMaxDateTime) {
-                long timeDiff = ChronoUnit.MINUTES.between(ZonedDateTime.now(ZoneId.systemDefault()),
-                        uvMaxDateTime.getZonedDateTime());
+                long timeDiff = ChronoUnit.MINUTES.between(Instant.now(), uvMaxDateTime.getInstant());
                 if (timeDiff > 0) {
                     logger.debug("Scheduling {} in {} minutes", UV_MAX_EVENT, timeDiff);
                     uvMaxJob = scheduler.schedule(() -> {

From db8457a85589061c52d0b56533721d5a87e70a94 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 20:32:11 +0100
Subject: [PATCH 33/52] Simplify DateTimeType handling for PLCLogo

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/plclogo/internal/handler/PLCDateTimeHandler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDateTimeHandler.java b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDateTimeHandler.java
index fddbf4d640bb0..4a5959423df25 100644
--- a/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDateTimeHandler.java
+++ b/bundles/org.openhab.binding.plclogo/src/main/java/org/openhab/binding/plclogo/internal/handler/PLCDateTimeHandler.java
@@ -14,6 +14,7 @@
 
 import static org.openhab.binding.plclogo.internal.PLCLogoBindingConstants.*;
 
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
@@ -93,7 +94,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                 byte[] buffer = new byte[2];
                 String type = channel.getAcceptedItemType();
                 if (DATE_TIME_ITEM.equalsIgnoreCase(type)) {
-                    ZonedDateTime datetime = dateTimeCommand.getZonedDateTime();
+                    ZonedDateTime datetime = dateTimeCommand.getInstant().atZone(ZoneId.systemDefault());
                     if ("Time".equalsIgnoreCase(channelUID.getId())) {
                         buffer[0] = S7.ByteToBCD(datetime.getHour());
                         buffer[1] = S7.ByteToBCD(datetime.getMinute());

From d09dc06fe012ddf1b281d50a98865ff6baca17ac Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 22:11:23 +0100
Subject: [PATCH 34/52] Simplify DateTimeType handling for Robonect

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../robonect/internal/handler/RobonectHandler.java   |  5 +----
 .../internal/handler/RobonectHandlerTest.java        | 12 +++++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.binding.robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java b/bundles/org.openhab.binding.robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java
index ad6090c9e99a2..67734ab94dd57 100644
--- a/bundles/org.openhab.binding.robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java
+++ b/bundles/org.openhab.binding.robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java
@@ -18,7 +18,6 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
@@ -304,9 +303,7 @@ private State convertUnixToDateTimeType(String unixTimeSec) {
         long adjustedTime = rawInstant.getEpochSecond() - offsetToConfiguredZone.getTotalSeconds();
         Instant adjustedInstant = Instant.ofEpochMilli(adjustedTime * 1000);
 
-        // we provide the time in the format as configured in the openHAB settings
-        ZonedDateTime zdt = adjustedInstant.atZone(timeZoneProvider.getTimeZone());
-        return new DateTimeType(zdt);
+        return new DateTimeType(adjustedInstant);
     }
 
     private void refreshVersionInfo() {
diff --git a/bundles/org.openhab.binding.robonect/src/test/java/org/openhab/binding/robonect/internal/handler/RobonectHandlerTest.java b/bundles/org.openhab.binding.robonect/src/test/java/org/openhab/binding/robonect/internal/handler/RobonectHandlerTest.java
index 359d67f5a6901..dc426719e5e55 100644
--- a/bundles/org.openhab.binding.robonect/src/test/java/org/openhab/binding/robonect/internal/handler/RobonectHandlerTest.java
+++ b/bundles/org.openhab.binding.robonect/src/test/java/org/openhab/binding/robonect/internal/handler/RobonectHandlerTest.java
@@ -64,20 +64,22 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class RobonectHandlerTest {
 
+    private static final ZoneId TIME_ZONE = ZoneId.of("Europe/Berlin");
+
     private RobonectHandler subject;
 
     private @Mock Thing robonectThingMock;
     private @Mock RobonectClient robonectClientMock;
     private @Mock ThingHandlerCallback callbackMock;
     private @Mock HttpClientFactory httpClientFactoryMock;
-    private @Mock TimeZoneProvider timezoneProvider;
+    private @Mock TimeZoneProvider timeZoneProvider;
 
     @BeforeEach
     public void setUp() {
         Mockito.when(robonectThingMock.getUID()).thenReturn(new ThingUID("1:2:3"));
-        Mockito.when(timezoneProvider.getTimeZone()).thenReturn(ZoneId.of("Europe/Berlin"));
+        Mockito.when(timeZoneProvider.getTimeZone()).thenReturn(TIME_ZONE);
 
-        subject = new RobonectHandler(robonectThingMock, httpClientFactoryMock, timezoneProvider);
+        subject = new RobonectHandler(robonectThingMock, httpClientFactoryMock, timeZoneProvider);
         subject.setCallback(callbackMock);
         subject.setRobonectClient(robonectClientMock);
     }
@@ -110,7 +112,7 @@ public void shouldUpdateNextTimerChannelWithDateTimeState() throws InterruptedEx
         State value = stateCaptor.getValue();
         assertTrue(value instanceof DateTimeType);
 
-        ZonedDateTime zdt = ((DateTimeType) value).getZonedDateTime();
+        ZonedDateTime zdt = ((DateTimeType) value).getInstant().atZone(TIME_ZONE);
         assertEquals(1, zdt.getDayOfMonth());
         assertEquals(2017, zdt.getYear());
         assertEquals(Month.MAY, zdt.getMonth());
@@ -159,7 +161,7 @@ public void shouldUpdateErrorChannelsIfErrorStatusReturned() throws InterruptedE
         State errorDate = errorDateCaptor.getValue();
         assertTrue(errorDate instanceof DateTimeType);
 
-        ZonedDateTime zdt = ((DateTimeType) errorDate).getZonedDateTime();
+        ZonedDateTime zdt = ((DateTimeType) errorDate).getInstant().atZone(TIME_ZONE);
         assertEquals(1, zdt.getDayOfMonth());
         assertEquals(2017, zdt.getYear());
         assertEquals(Month.MAY, zdt.getMonth());

From 733ff9e4947046c48ffbf5603032b52ab9b439fa Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 10 Nov 2024 00:49:34 +0100
Subject: [PATCH 35/52] Simplify DateTimeType handling for SAICiSMART

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/ChargeStateUpdater.java          |  4 +-
 .../internal/SAICiSMARTHandler.java           | 40 +++++++------------
 .../internal/SAICiSMARTHandlerFactory.java    |  8 +---
 .../internal/VehicleStateUpdater.java         | 12 ++----
 4 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/ChargeStateUpdater.java b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/ChargeStateUpdater.java
index ebc3d9a556a32..464b4da71888c 100644
--- a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/ChargeStateUpdater.java
+++ b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/ChargeStateUpdater.java
@@ -17,7 +17,6 @@
 import static org.openhab.binding.saicismart.internal.SAICiSMARTBindingConstants.CHANNEL_SOC;
 
 import java.net.URISyntaxException;
-import java.time.ZonedDateTime;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -104,8 +103,7 @@ public OTA_ChrgMangDataResp call() throws URISyntaxException, ExecutionException
 
         saiCiSMARTHandler.updateState(CHANNEL_POWER, new QuantityType<>(power.intValue(), Units.WATT));
 
-        saiCiSMARTHandler.updateState(SAICiSMARTBindingConstants.CHANNEL_LAST_CHARGE_STATE_UPDATE,
-                new DateTimeType(ZonedDateTime.now(saiCiSMARTHandler.getTimeZone())));
+        saiCiSMARTHandler.updateState(SAICiSMARTBindingConstants.CHANNEL_LAST_CHARGE_STATE_UPDATE, new DateTimeType());
 
         saiCiSMARTHandler.updateStatus(ThingStatus.ONLINE);
         return chargingStatusResponseMessage.getApplicationData();
diff --git a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandler.java b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandler.java
index 6d9f08c6069f8..1af347ff9e07e 100644
--- a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandler.java
+++ b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandler.java
@@ -21,8 +21,6 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +31,6 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.StringType;
@@ -70,26 +67,22 @@ public class SAICiSMARTHandler extends BaseThingHandler {
 
     private final Logger logger = LoggerFactory.getLogger(SAICiSMARTHandler.class);
 
-    private final TimeZoneProvider timeZoneProvider;
-
     @Nullable
     SAICiSMARTVehicleConfiguration config;
     private @Nullable Future<?> pollingJob;
-    private ZonedDateTime lastAlarmMessage;
-    private ZonedDateTime lastCarActivity;
+    private Instant lastAlarmMessage;
+    private Instant lastCarActivity;
 
     /**
      * If the binding is initialized, treat the car as active (lastCarActivity = now) to get some first data.
      * 
      * @param httpClientFactory
-     * @param timeZoneProvider
      * @param thing
      */
-    public SAICiSMARTHandler(TimeZoneProvider timeZoneProvider, Thing thing) {
+    public SAICiSMARTHandler(Thing thing) {
         super(thing);
-        this.timeZoneProvider = timeZoneProvider;
-        lastAlarmMessage = ZonedDateTime.now(getTimeZone());
-        lastCarActivity = ZonedDateTime.now(getTimeZone());
+        lastAlarmMessage = Instant.now();
+        lastCarActivity = Instant.now();
     }
 
     @Override
@@ -98,8 +91,8 @@ public void handleCommand(ChannelUID channelUID, Command command) {
             // reset channel to off
             updateState(CHANNEL_FORCE_REFRESH, OnOffType.from(false));
             // update internal activity date, to query the car for about a minute
-            notifyCarActivity(ZonedDateTime.now(getTimeZone()).minus(SAICiSMARTBindingConstants.POLLING_ACTIVE_MINS - 1,
-                    ChronoUnit.MINUTES), true);
+            notifyCarActivity(
+                    Instant.now().minus(SAICiSMARTBindingConstants.POLLING_ACTIVE_MINS - 1, ChronoUnit.MINUTES), true);
         } else if (channelUID.getId().equals(CHANNEL_SWITCH_AC) && command == OnOffType.ON) {
             // reset channel to off
             updateState(CHANNEL_SWITCH_AC, OnOffType.ON);
@@ -121,7 +114,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         } else if (channelUID.getId().equals(CHANNEL_LAST_ACTIVITY)
                 && command instanceof DateTimeType commnadAsDateTimeType) {
             // update internal activity date from external date
-            notifyCarActivity(commnadAsDateTimeType.getZonedDateTime(), true);
+            notifyCarActivity(commnadAsDateTimeType.getInstant(), true);
         }
     }
 
@@ -146,14 +139,14 @@ public void initialize() {
         }
 
         // just started, make sure we start querying
-        notifyCarActivity(ZonedDateTime.now(getTimeZone()), true);
+        notifyCarActivity(Instant.now(), true);
         pollingJob = scheduler.scheduleWithFixedDelay(this::updateStatus, 2,
                 SAICiSMARTBindingConstants.REFRESH_INTERVAL, TimeUnit.SECONDS);
     }
 
     private void updateStatus() {
-        if (lastCarActivity.isAfter(
-                ZonedDateTime.now().minus(SAICiSMARTBindingConstants.POLLING_ACTIVE_MINS, ChronoUnit.MINUTES))) {
+        if (lastCarActivity
+                .isAfter(Instant.now().minus(SAICiSMARTBindingConstants.POLLING_ACTIVE_MINS, ChronoUnit.MINUTES))) {
             if (this.getBridgeHandler().getUid() != null && this.getBridgeHandler().getToken() != null) {
                 try {
                     OTA_RVMVehicleStatusResp25857 otaRvmVehicleStatusResp25857 = new VehicleStateUpdater(this).call();
@@ -179,7 +172,7 @@ private void sendACCommand(byte command, byte temperature)
         MessageCoder<OTA_RVCReq> otaRvcReqMessageCoder = new MessageCoder<>(OTA_RVCReq.class);
 
         // we send a command end expect the car to wake up
-        notifyCarActivity(ZonedDateTime.now(getTimeZone()), false);
+        notifyCarActivity(Instant.now(), false);
 
         OTA_RVCReq req = new OTA_RVCReq();
         req.setRvcReqType(new byte[] { 6 });
@@ -236,7 +229,7 @@ private void sendACCommand(byte command, byte temperature)
         logger.trace("Got A/C message: {}", new GsonBuilder().setPrettyPrinting().create().toJson(enableACResponse));
     }
 
-    public void notifyCarActivity(ZonedDateTime now, boolean force) {
+    public void notifyCarActivity(Instant now, boolean force) {
         // if the car activity changed, notify the channel
         if (force || lastCarActivity.isBefore(now)) {
             lastCarActivity = now;
@@ -264,8 +257,7 @@ public void updateStatus(ThingStatus status) {
     }
 
     public void handleMessage(Message message) {
-        ZonedDateTime time = ZonedDateTime.ofInstant(Instant.ofEpochSecond(message.getMessageTime().getSeconds()),
-                getTimeZone());
+        Instant time = Instant.ofEpochSecond(message.getMessageTime().getSeconds());
 
         if (time.isAfter(lastAlarmMessage)) {
             lastAlarmMessage = time;
@@ -276,8 +268,4 @@ public void handleMessage(Message message) {
 
         notifyCarActivity(time, false);
     }
-
-    public ZoneId getTimeZone() {
-        return timeZoneProvider.getTimeZone();
-    }
 }
diff --git a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandlerFactory.java b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandlerFactory.java
index abaf4d9c526a6..277123381752f 100644
--- a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandlerFactory.java
+++ b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/SAICiSMARTHandlerFactory.java
@@ -20,7 +20,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
 import org.openhab.core.i18n.LocaleProvider;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.io.net.http.HttpClientFactory;
 import org.openhab.core.thing.Bridge;
@@ -44,15 +43,12 @@
 public class SAICiSMARTHandlerFactory extends BaseThingHandlerFactory {
 
     private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_ACCOUNT, THING_TYPE_VEHICLE);
-    private final TimeZoneProvider timeZoneProvider;
     private HttpClient httpClient;
 
     @Activate
     public SAICiSMARTHandlerFactory(final @Reference TranslationProvider translationProvider,
-            final @Reference LocaleProvider localeProvider, final @Reference HttpClientFactory httpClientFactory,
-            final @Reference TimeZoneProvider timeZoneProvider) {
+            final @Reference LocaleProvider localeProvider, final @Reference HttpClientFactory httpClientFactory) {
         this.httpClient = httpClientFactory.getCommonHttpClient();
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     @Override
@@ -67,7 +63,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         if (THING_TYPE_ACCOUNT.equals(thingTypeUID)) {
             return new SAICiSMARTBridgeHandler((Bridge) thing, httpClient);
         } else if (THING_TYPE_VEHICLE.equals(thingTypeUID)) {
-            return new SAICiSMARTHandler(timeZoneProvider, thing);
+            return new SAICiSMARTHandler(thing);
         }
 
         return null;
diff --git a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/VehicleStateUpdater.java b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/VehicleStateUpdater.java
index 2a66e3ec9f182..98e66333067f9 100644
--- a/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/VehicleStateUpdater.java
+++ b/bundles/org.openhab.binding.saicismart/src/main/java/org/openhab/binding/saicismart/internal/VehicleStateUpdater.java
@@ -24,7 +24,6 @@
 
 import java.net.URISyntaxException;
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -224,16 +223,13 @@ public OTA_RVMVehicleStatusResp25857 call() throws URISyntaxException, Execution
         saiCiSMARTHandler.updateState(SAICiSMARTBindingConstants.CHANNEL_REMOTE_AC_STATUS, new DecimalType(
                 chargingStatusResponseMessage.getApplicationData().getBasicVehicleStatus().getRemoteClimateStatus()));
 
-        saiCiSMARTHandler
-                .updateState(SAICiSMARTBindingConstants.CHANNEL_LAST_POSITION_UPDATE,
-                        new DateTimeType(ZonedDateTime.ofInstant(
-                                Instant.ofEpochSecond(chargingStatusResponseMessage.getApplicationData()
-                                        .getGpsPosition().getTimestamp4Short().getSeconds()),
-                                saiCiSMARTHandler.getTimeZone())));
+        saiCiSMARTHandler.updateState(SAICiSMARTBindingConstants.CHANNEL_LAST_POSITION_UPDATE,
+                new DateTimeType(Instant.ofEpochSecond(chargingStatusResponseMessage.getApplicationData()
+                        .getGpsPosition().getTimestamp4Short().getSeconds())));
 
         if (isCharging || acActive || engineRunning) {
             // update activity date
-            saiCiSMARTHandler.notifyCarActivity(ZonedDateTime.now(saiCiSMARTHandler.getTimeZone()), true);
+            saiCiSMARTHandler.notifyCarActivity(Instant.now(), true);
         }
 
         saiCiSMARTHandler.updateStatus(ThingStatus.ONLINE);

From 016818b0cb9e806a44b6ad7b032fbac21caebfb6 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 22:22:11 +0100
Subject: [PATCH 36/52] Simplify DateTimeType handling for Satel Integra Alarm
 System

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/satel/internal/handler/SatelSystemHandler.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelSystemHandler.java b/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelSystemHandler.java
index a27f01eb6d86c..ddce97daf7a3c 100644
--- a/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelSystemHandler.java
+++ b/bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/handler/SatelSystemHandler.java
@@ -117,8 +117,8 @@ protected Optional<SatelCommand> convertCommand(ChannelUID channel, Command comm
                     dateTime = dateTimeCommand;
                 }
                 if (dateTime != null) {
-                    return Optional.of(new SetClockCommand(dateTime.getZonedDateTime()
-                            .withZoneSameInstant(bridgeHandler.getZoneId()).toLocalDateTime(),
+                    return Optional.of(new SetClockCommand(
+                            dateTime.getInstant().atZone(bridgeHandler.getZoneId()).toLocalDateTime(),
                             bridgeHandler.getUserCode()));
                 }
                 break;

From fa744ee42c25288289d9b8cca44c1b18d83aeadf Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 16 Nov 2024 00:46:58 +0100
Subject: [PATCH 37/52] Simplify DateTimeType handling for Shelly

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/shelly/internal/manager/ShellyManagerPage.java  | 1 -
 .../openhab/binding/shelly/internal/util/ShellyUtils.java   | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java
index fc35d708b1a9a..c24129a8d277a 100644
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerPage.java
@@ -345,7 +345,6 @@ private void addAttribute(Map<String, String> properties, ShellyManagerInterface
                         value = dateTimeState.format(null).replace('T', ' ').replace('-', '/');
                         break;
                     default:
-                        value = getTimestamp(dateTimeState);
                         value = dateTimeState.format(null).replace('T', ' ').replace('-', '/');
                 }
             } else {
diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java
index 735921565b438..91abc42b5386e 100644
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java
@@ -304,17 +304,13 @@ public static DateTimeType getTimestamp(String zone, long timestamp) {
             ZoneId zoneId = !zone.isEmpty() ? ZoneId.of(zone) : ZoneId.systemDefault();
             ZonedDateTime zdt = LocalDateTime.now().atZone(zoneId);
             int delta = zdt.getOffset().getTotalSeconds();
-            return new DateTimeType(ZonedDateTime.ofInstant(Instant.ofEpochSecond(timestamp - delta), zoneId));
+            return new DateTimeType(Instant.ofEpochSecond(timestamp - delta));
         } catch (DateTimeException e) {
             // Unable to convert device's timezone, use system one
             return getTimestamp();
         }
     }
 
-    public static String getTimestamp(DateTimeType dt) {
-        return dt.getZonedDateTime().toString().replace('T', ' ').replace('-', '/');
-    }
-
     public static String convertTimestamp(long ts) {
         if (ts == 0) {
             return "";

From 3eac74c88c19261434fffb76c9440a89d7716e99 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 10 Nov 2024 21:18:09 +0100
Subject: [PATCH 38/52] Simplify DateTimeType handling for Siemens HVAC

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/converter/ConverterFactory.java           |  2 +-
 .../internal/converter/type/DateTimeTypeConverter.java |  2 +-
 .../converter/type/TimeOfDayTypeConverter.java         | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/ConverterFactory.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/ConverterFactory.java
index 757c8eed4cd89..6500f39bf8d75 100644
--- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/ConverterFactory.java
+++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/ConverterFactory.java
@@ -44,7 +44,7 @@ public static void registerConverter(TimeZoneProvider timeZoneProvider) {
         registerConverter(SiemensHvacBindingConstants.DPT_TYPE_NUMERIC, new NumericTypeConverter());
         registerConverter(SiemensHvacBindingConstants.DPT_TYPE_RADIO, new RadioTypeConverter());
         registerConverter(SiemensHvacBindingConstants.DPT_TYPE_STRING, new StringTypeConverter());
-        registerConverter(SiemensHvacBindingConstants.DPT_TYPE_TIMEOFDAY, new TimeOfDayTypeConverter(timeZoneProvider));
+        registerConverter(SiemensHvacBindingConstants.DPT_TYPE_TIMEOFDAY, new TimeOfDayTypeConverter());
 
         registerConverter(SiemensHvacBindingConstants.DPT_TYPE_CHECKBOX, new CheckboxTypeConverter());
         registerConverter(SiemensHvacBindingConstants.DPT_TYPE_SCHEDULER, new SchedulerTypeConverter());
diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/DateTimeTypeConverter.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/DateTimeTypeConverter.java
index 9d6ae69e3655b..30cf9e1a52717 100644
--- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/DateTimeTypeConverter.java
+++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/DateTimeTypeConverter.java
@@ -70,7 +70,7 @@ protected boolean fromBindingValidation(JsonElement value, String unit, String t
     protected DateTimeType fromBinding(JsonElement value, String unit, String type, ChannelType tp, Locale locale)
             throws ConverterException {
         if ("----".equals(value.getAsString())) {
-            return new DateTimeType(ZonedDateTime.now(this.timeZoneProvider.getTimeZone()));
+            return new DateTimeType();
         } else {
             String[] formats = { "EEEE, d. LLLL yyyy HH:mm[:ss]", "d. LLLL yyyy HH:mm[:ss]", "d. LLLL yyyy",
                     "d. LLLL" };
diff --git a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/TimeOfDayTypeConverter.java b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/TimeOfDayTypeConverter.java
index a821816daae84..c287df27ea834 100644
--- a/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/TimeOfDayTypeConverter.java
+++ b/bundles/org.openhab.binding.siemenshvac/src/main/java/org/openhab/binding/siemenshvac/internal/converter/type/TimeOfDayTypeConverter.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.siemenshvac.internal.converter.type;
 
-import java.time.ZonedDateTime;
 import java.util.Locale;
 
 import javax.measure.Unit;
@@ -22,7 +21,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.siemenshvac.internal.converter.ConverterException;
 import org.openhab.binding.siemenshvac.internal.metadata.SiemensHvacMetadataDataPoint;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.CoreItemFactory;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.QuantityType;
@@ -40,12 +38,6 @@
  */
 @NonNullByDefault
 public class TimeOfDayTypeConverter extends AbstractTypeConverter {
-    private final TimeZoneProvider timeZoneProvider;
-
-    public TimeOfDayTypeConverter(final TimeZoneProvider timeZoneProvider) {
-        this.timeZoneProvider = timeZoneProvider;
-    }
-
     @Override
     protected boolean toBindingValidation(Type type) {
         return true;
@@ -71,7 +63,7 @@ protected boolean fromBindingValidation(JsonElement value, String unit, String t
     protected State fromBinding(JsonElement value, String unit, String type, ChannelType tp, Locale locale)
             throws ConverterException {
         if ("----".equals(value.getAsString())) {
-            return new DateTimeType(ZonedDateTime.now(this.timeZoneProvider.getTimeZone()));
+            return new DateTimeType();
         } else {
             if ("h:m".equals(unit)) {
                 String st = value.getAsString();

From 40b240d9988d6784eeb38b1c722bf483c09bc8a4 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 24 Nov 2024 23:25:27 +0100
Subject: [PATCH 39/52] Simplify DateTimeType handling for Solax

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/handlers/SolaxLocalAccessChargerHandler.java      | 3 +--
 .../internal/handlers/SolaxLocalAccessInverterHandler.java     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessChargerHandler.java b/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessChargerHandler.java
index 5609c4318a68d..16d04e1771a95 100644
--- a/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessChargerHandler.java
+++ b/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessChargerHandler.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.solax.internal.handlers;
 
-import java.time.ZonedDateTime;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -124,6 +123,6 @@ private void updateChannels(RawDataParser parser, EvChargerData data) {
                 SIUnits.CELSIUS, supportedChannels);
 
         // Binding provided data
-        updateState(SolaxBindingConstants.CHANNEL_TIMESTAMP, new DateTimeType(ZonedDateTime.now()));
+        updateState(SolaxBindingConstants.CHANNEL_TIMESTAMP, new DateTimeType());
     }
 }
diff --git a/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessInverterHandler.java b/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessInverterHandler.java
index b496cc09a6734..284d868e8a193 100644
--- a/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessInverterHandler.java
+++ b/bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/handlers/SolaxLocalAccessInverterHandler.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.solax.internal.handlers;
 
-import java.time.ZonedDateTime;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -194,6 +193,6 @@ private void updateChannels(RawDataParser parser, LocalData inverterData) {
                 Units.HERTZ, supportedChannels);
 
         // Binding provided data
-        updateState(SolaxBindingConstants.CHANNEL_TIMESTAMP, new DateTimeType(ZonedDateTime.now()));
+        updateState(SolaxBindingConstants.CHANNEL_TIMESTAMP, new DateTimeType());
     }
 }

From 2864e744b3be26a15c69c4514d28d1755a94083f Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Tue, 19 Nov 2024 20:54:46 +0100
Subject: [PATCH 40/52] Simplify DateTimeType handling for Philips Somneo

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../org/openhab/binding/somneo/internal/SomneoHandler.java  | 6 ++++--
 .../binding/somneo/internal/SomneoHttpConnector.java        | 4 ++--
 .../binding/somneo/internal/model/AlarmSettingsData.java    | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHandler.java b/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHandler.java
index 5de50b2729ff9..12e30681b4a5b 100644
--- a/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHandler.java
+++ b/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHandler.java
@@ -15,6 +15,7 @@
 import static org.openhab.binding.somneo.internal.SomneoBindingConstants.*;
 
 import java.io.EOFException;
+import java.time.ZoneId;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
@@ -356,8 +357,9 @@ public void handleCommand(ChannelUID channelUID, Command command) {
                     }
                     break;
                 case CHANNEL_ALARM_TIME:
-                    if (command instanceof DateTimeType decimal) {
-                        connector.setAlarmTime(alarmPosition, decimal);
+                    if (command instanceof DateTimeType dateTimeCommand) {
+                        connector.setAlarmTime(alarmPosition,
+                                dateTimeCommand.getInstant().atZone(ZoneId.systemDefault()));
                     }
                     break;
                 case CHANNEL_ALARM_REPEAT_DAY:
diff --git a/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHttpConnector.java b/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHttpConnector.java
index 2d7aed9da4901..6166fe70751e0 100644
--- a/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHttpConnector.java
+++ b/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/SomneoHttpConnector.java
@@ -17,6 +17,7 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalTime;
+import java.time.ZonedDateTime;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -46,7 +47,6 @@
 import org.openhab.binding.somneo.internal.model.TimerData;
 import org.openhab.binding.somneo.internal.model.WifiData;
 import org.openhab.core.io.net.http.HttpUtil;
-import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.PercentType;
@@ -373,7 +373,7 @@ public void toggleAlarm(int position, OnOffType enabled)
         executeUrl("PUT", ALARM_EDIT_ENDPOINT, data);
     }
 
-    public void setAlarmTime(int position, DateTimeType time)
+    public void setAlarmTime(int position, ZonedDateTime time)
             throws TimeoutException, InterruptedException, ExecutionException {
         final AlarmSettingsData data = fetchAlarmSettingsData(position);
         data.setConfigured(true);
diff --git a/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/model/AlarmSettingsData.java b/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/model/AlarmSettingsData.java
index 2b1c29cbb623e..0ec313dbe00dd 100644
--- a/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/model/AlarmSettingsData.java
+++ b/bundles/org.openhab.binding.somneo/src/main/java/org/openhab/binding/somneo/internal/model/AlarmSettingsData.java
@@ -148,8 +148,7 @@ public void setAlarmTime(LocalTime time) {
         }
     }
 
-    public void setAlarmTime(DateTimeType timeState) {
-        final ZonedDateTime zonedTime = timeState.getZonedDateTime();
+    public void setAlarmTime(ZonedDateTime zonedTime) {
         final LocalTime time = LocalTime.of(zonedTime.getHour(), zonedTime.getMinute());
         if (time == null) {
             return;

From 47899357852b2624ac029358402564ad133126f6 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 22:28:15 +0100
Subject: [PATCH 41/52] Simplify DateTimeType handling for TA C.M.I.

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/tacmi/internal/schema/TACmiSchemaHandler.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java
index d0eff69cd5ec2..baf4ce81027f5 100644
--- a/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java
+++ b/bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java
@@ -14,6 +14,7 @@
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.time.ZoneId;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
@@ -298,7 +299,7 @@ public void handleCommand(final ChannelUID channelUID, final Command command) {
                         val = String.format(Locale.US, "%.2f", qt.floatValue());
                     } else if (command instanceof DateTimeType dtt) {
                         // time is transferred as minutes since midnight...
-                        var zdt = dtt.getZonedDateTime();
+                        var zdt = dtt.getInstant().atZone(ZoneId.systemDefault());
                         val = Integer.toString(zdt.getHour() * 60 + zdt.getMinute());
                     } else {
                         val = command.format("%.2f");

From 633284ea6724be7106aca2aac8171db57ea6c897 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:41:20 +0100
Subject: [PATCH 42/52] Simplify DateTimeType handling for Tado

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/tado/internal/adapter/TadoZoneStateAdapter.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java
index b70d229ff6897..7f455f1a39f4a 100644
--- a/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java
+++ b/bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/adapter/TadoZoneStateAdapter.java
@@ -233,7 +233,7 @@ private static DecimalType toDecimalType(double value) {
     }
 
     private static DateTimeType toDateTimeType(OffsetDateTime offsetDateTime) {
-        return new DateTimeType(offsetDateTime.toZonedDateTime());
+        return new DateTimeType(offsetDateTime.toInstant());
     }
 
     private static State toTemperatureState(@Nullable TemperatureObject temperature, TemperatureUnit temperatureUnit) {

From 5f6dc54e39cc73e749d297dc824fe53dbdfab8a8 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 22:34:43 +0100
Subject: [PATCH 43/52] Simplify DateTimeType handling for Teleinfo

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../reader/io/TeleinfoInputStreamTest.java       | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/bundles/org.openhab.binding.teleinfo/src/test/java/org/openhab/binding/teleinfo/internal/reader/io/TeleinfoInputStreamTest.java b/bundles/org.openhab.binding.teleinfo/src/test/java/org/openhab/binding/teleinfo/internal/reader/io/TeleinfoInputStreamTest.java
index 4ff47e7ce3f93..3896888b467a6 100644
--- a/bundles/org.openhab.binding.teleinfo/src/test/java/org/openhab/binding/teleinfo/internal/reader/io/TeleinfoInputStreamTest.java
+++ b/bundles/org.openhab.binding.teleinfo/src/test/java/org/openhab/binding/teleinfo/internal/reader/io/TeleinfoInputStreamTest.java
@@ -15,7 +15,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.FileInputStream;
-import java.time.Month;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.api.Test;
@@ -25,7 +24,6 @@
 import org.openhab.binding.teleinfo.internal.reader.io.serialport.Label;
 import org.openhab.binding.teleinfo.internal.serial.TeleinfoTicMode;
 import org.openhab.binding.teleinfo.util.TestUtils;
-import org.openhab.core.library.types.DateTimeType;
 
 /**
  *
@@ -187,23 +185,9 @@ public void testReadNextFrameLinkyTICModeStandardThreePhaseProd() throws Excepti
             assertEquals(2741488, frame.getAsInt(Label.EASF01));
             assertEquals(18, frame.getAsInt(Label.PCOUP));
             assertEquals("2021-04-14T08:26:25", frame.getAsDateTime(Label.DATE));
-            DateTimeType dateTime = DateTimeType.valueOf(frame.getAsDateTime(Label.DATE));
-            assertEquals(2021, dateTime.getZonedDateTime().getYear());
-            assertEquals(Month.APRIL, dateTime.getZonedDateTime().getMonth());
-            assertEquals(14, dateTime.getZonedDateTime().getDayOfMonth());
-            assertEquals(8, dateTime.getZonedDateTime().getHour());
-            assertEquals(26, dateTime.getZonedDateTime().getMinute());
-            assertEquals(25, dateTime.getZonedDateTime().getSecond());
 
             assertNotEquals(TeleinfoBindingConstants.NOT_A_CHANNEL, Label.CCASN.getTimestampChannelName());
             assertEquals("2021-04-14T08:00:00", frame.getAsDateTime(Label.CCASN));
-            dateTime = DateTimeType.valueOf(frame.getAsDateTime(Label.CCASN));
-            assertEquals(2021, dateTime.getZonedDateTime().getYear());
-            assertEquals(Month.APRIL, dateTime.getZonedDateTime().getMonth());
-            assertEquals(14, dateTime.getZonedDateTime().getDayOfMonth());
-            assertEquals(8, dateTime.getZonedDateTime().getHour());
-            assertEquals(0, dateTime.getZonedDateTime().getMinute());
-            assertEquals(0, dateTime.getZonedDateTime().getSecond());
         }
     }
 

From 18df34a553d1a8a1cda0a86761bcb65d6dc81944 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:44:21 +0100
Subject: [PATCH 44/52] Simplify DateTimeType handling for Vallox MV

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/valloxmv/internal/ValloxMVWebSocket.java        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVWebSocket.java b/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVWebSocket.java
index 8fcc932be948b..01d7781c1506f 100644
--- a/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVWebSocket.java
+++ b/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVWebSocket.java
@@ -19,11 +19,9 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
-import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TimeZone;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -512,8 +510,8 @@ public void onBinary(InputStream in) {
                 updateChannel(ValloxMVBindingConstants.CHANNEL_UPTIME_HOURS, new DecimalType(iUptimeHours));
                 updateChannel(ValloxMVBindingConstants.CHANNEL_UPTIME_HOURS_CURRENT,
                         new DecimalType(iUptimeHoursCurrent));
-                updateChannel(ValloxMVBindingConstants.CHANNEL_FILTER_CHANGED_DATE, new DateTimeType(
-                        ZonedDateTime.ofInstant(cFilterChangedDate.toInstant(), TimeZone.getDefault().toZoneId())));
+                updateChannel(ValloxMVBindingConstants.CHANNEL_FILTER_CHANGED_DATE,
+                        new DateTimeType(cFilterChangedDate.toInstant()));
                 updateChannel(ValloxMVBindingConstants.CHANNEL_REMAINING_FILTER_DAYS,
                         new QuantityType<>(iRemainingTimeForFilter, Units.DAY));
                 updateChannel(ValloxMVBindingConstants.CHANNEL_EXTR_FAN_BALANCE_BASE,

From 23bd2924eb1d9537665f90f8d49db528d4dc5fc2 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 25 Nov 2024 22:34:22 +0100
Subject: [PATCH 45/52] Simplify DateTimeType handling for VeSync

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../internal/handlers/VeSyncDeviceAirPurifierHandler.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.binding.vesync/src/main/java/org/openhab/binding/vesync/internal/handlers/VeSyncDeviceAirPurifierHandler.java b/bundles/org.openhab.binding.vesync/src/main/java/org/openhab/binding/vesync/internal/handlers/VeSyncDeviceAirPurifierHandler.java
index 5c9ce2028e912..875365742267d 100644
--- a/bundles/org.openhab.binding.vesync/src/main/java/org/openhab/binding/vesync/internal/handlers/VeSyncDeviceAirPurifierHandler.java
+++ b/bundles/org.openhab.binding.vesync/src/main/java/org/openhab/binding/vesync/internal/handlers/VeSyncDeviceAirPurifierHandler.java
@@ -15,8 +15,7 @@
 import static org.openhab.binding.vesync.internal.VeSyncConstants.*;
 import static org.openhab.binding.vesync.internal.dto.requests.VeSyncProtocolConstants.*;
 
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -422,8 +421,8 @@ private void processV2BypassPoll(final ExpiringCache<String> cachedResponse) {
         // Only 400S appears to have this JSON extension object
         if (purifierStatus.result.result.extension != null) {
             if (purifierStatus.result.result.extension.timerRemain > 0) {
-                updateState(DEVICE_CHANNEL_AF_AUTO_OFF_CALC_TIME, new DateTimeType(LocalDateTime.now()
-                        .plus(purifierStatus.result.result.extension.timerRemain, ChronoUnit.SECONDS).toString()));
+                updateState(DEVICE_CHANNEL_AF_AUTO_OFF_CALC_TIME, new DateTimeType(
+                        Instant.now().plusSeconds(purifierStatus.result.result.extension.timerRemain)));
             } else {
                 updateState(DEVICE_CHANNEL_AF_AUTO_OFF_CALC_TIME, new DateTimeItem("nullEnforcements").getState());
             }

From a8316e7b76893ca1992f77701cd2c60a15be22b0 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sun, 10 Nov 2024 21:33:52 +0100
Subject: [PATCH 46/52] Simplify DateTimeType handling for Video Disk Recorder

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../binding/vdr/internal/VDRHandler.java      | 20 +++++--------------
 .../vdr/internal/VDRHandlerFactory.java       | 12 +----------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java
index 767842b58e37e..aabc5cf268505 100644
--- a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java
+++ b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java
@@ -12,8 +12,6 @@
  */
 package org.openhab.binding.vdr.internal;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -29,7 +27,6 @@
 import org.openhab.binding.vdr.internal.svdrp.SVDRPException;
 import org.openhab.binding.vdr.internal.svdrp.SVDRPParseResponseException;
 import org.openhab.binding.vdr.internal.svdrp.SVDRPVolume;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
@@ -60,15 +57,12 @@ public class VDRHandler extends BaseThingHandler {
 
     private final Logger logger = LoggerFactory.getLogger(VDRHandler.class);
 
-    private final TimeZoneProvider timeZoneProvider;
-
     private VDRConfiguration config = new VDRConfiguration();
 
     private @Nullable ScheduledFuture<?> refreshThreadFuture = null;
 
-    public VDRHandler(Thing thing, TimeZoneProvider timeZoneProvider) {
+    public VDRHandler(Thing thing) {
         super(thing);
-        this.timeZoneProvider = timeZoneProvider;
     }
 
     /**
@@ -229,13 +223,11 @@ private void onVDRRefresh() {
                             break;
                         case VDRBindingConstants.CHANNEL_UID_CURRENT_EVENT_BEGIN:
                             entry = con.getEpgEvent(SVDRPEpgEvent.TYPE.NOW);
-                            result = new DateTimeType(LocalDateTime.ofInstant(entry.getBegin(), ZoneId.systemDefault())
-                                    .atZone(timeZoneProvider.getTimeZone()));
+                            result = new DateTimeType(entry.getBegin());
                             break;
                         case VDRBindingConstants.CHANNEL_UID_CURRENT_EVENT_END:
                             entry = con.getEpgEvent(SVDRPEpgEvent.TYPE.NOW);
-                            result = new DateTimeType(LocalDateTime.ofInstant(entry.getEnd(), ZoneId.systemDefault())
-                                    .atZone(timeZoneProvider.getTimeZone()));
+                            result = new DateTimeType(entry.getEnd());
                             break;
                         case VDRBindingConstants.CHANNEL_UID_NEXT_EVENT_TITLE:
                             entry = con.getEpgEvent(SVDRPEpgEvent.TYPE.NEXT);
@@ -251,13 +243,11 @@ private void onVDRRefresh() {
                             break;
                         case VDRBindingConstants.CHANNEL_UID_NEXT_EVENT_BEGIN:
                             entry = con.getEpgEvent(SVDRPEpgEvent.TYPE.NEXT);
-                            result = new DateTimeType(LocalDateTime.ofInstant(entry.getBegin(), ZoneId.systemDefault())
-                                    .atZone(timeZoneProvider.getTimeZone()));
+                            result = new DateTimeType(entry.getBegin());
                             break;
                         case VDRBindingConstants.CHANNEL_UID_NEXT_EVENT_END:
                             entry = con.getEpgEvent(SVDRPEpgEvent.TYPE.NEXT);
-                            result = new DateTimeType(LocalDateTime.ofInstant(entry.getEnd(), ZoneId.systemDefault())
-                                    .atZone(timeZoneProvider.getTimeZone()));
+                            result = new DateTimeType(entry.getEnd());
                             break;
 
                     }
diff --git a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandlerFactory.java b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandlerFactory.java
index e2f8730efbee2..a52143efdb7ba 100644
--- a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandlerFactory.java
+++ b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandlerFactory.java
@@ -18,15 +18,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.binding.BaseThingHandlerFactory;
 import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.ThingHandlerFactory;
-import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
 
 /**
  * The {@link VDRHandlerFactory} is responsible for creating things and thing
@@ -40,13 +37,6 @@ public class VDRHandlerFactory extends BaseThingHandlerFactory {
 
     private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_VDR);
 
-    private final TimeZoneProvider timeZoneProvider;
-
-    @Activate
-    public VDRHandlerFactory(final @Reference TimeZoneProvider timeZoneProvider) {
-        this.timeZoneProvider = timeZoneProvider;
-    }
-
     @Override
     public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         return SUPPORTED_THING_TYPES_UIDS.contains(thingTypeUID);
@@ -57,7 +47,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
         ThingTypeUID thingTypeUID = thing.getThingTypeUID();
 
         if (THING_TYPE_VDR.equals(thingTypeUID)) {
-            return new VDRHandler(thing, timeZoneProvider);
+            return new VDRHandler(thing);
         }
 
         return null;

From 16cbadcbc262abeff651681103ffcef3f480d328 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 22:49:56 +0100
Subject: [PATCH 47/52] Simplify DateTimeType handling for WeMo

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../org/openhab/binding/wemo/internal/InsightParser.java   | 6 +-----
 .../binding/wemo/internal/handler/WemoCoffeeHandler.java   | 5 +----
 .../binding/wemo/internal/handler/WemoDimmerHandler.java   | 5 +----
 .../java/org/openhab/binding/wemo/InsightParserTest.java   | 7 +++----
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/InsightParser.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/InsightParser.java
index 48cb39fd00b28..0b61303a79cd7 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/InsightParser.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/InsightParser.java
@@ -15,8 +15,6 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -116,12 +114,10 @@ private State getDateTime(String value) {
             return UnDefType.UNDEF;
         }
 
-        State lastChangedAtState = new DateTimeType(
-                ZonedDateTime.ofInstant(Instant.ofEpochSecond(lastChangedAt), ZoneId.systemDefault()));
         if (lastChangedAt == 0) {
             return UnDefType.UNDEF;
         }
-        return lastChangedAtState;
+        return new DateTimeType(Instant.ofEpochSecond(lastChangedAt));
     }
 
     private State getNumber(String value) {
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoCoffeeHandler.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoCoffeeHandler.java
index d6e5a6c5a464b..49ba44fe2a340 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoCoffeeHandler.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoCoffeeHandler.java
@@ -17,9 +17,7 @@
 
 import java.io.StringReader;
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -345,8 +343,7 @@ protected void updateWemoState() {
                     getThing().getUID());
             return null;
         }
-        ZonedDateTime zoned = ZonedDateTime.ofInstant(Instant.ofEpochSecond(value), TimeZone.getDefault().toZoneId());
-        State dateTimeState = new DateTimeType(zoned);
+        State dateTimeState = new DateTimeType(Instant.ofEpochSecond(value));
         logger.trace("New attribute brewed '{}' received", dateTimeState);
         return dateTimeState;
     }
diff --git a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoDimmerHandler.java b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoDimmerHandler.java
index 14fab3c8d025d..70a9dbfb0dbab 100644
--- a/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoDimmerHandler.java
+++ b/bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoDimmerHandler.java
@@ -16,12 +16,10 @@
 import static org.openhab.binding.wemo.internal.WemoUtil.*;
 
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -502,8 +500,7 @@ protected void updateWemoState() {
                     getThing().getUID());
             return null;
         }
-        ZonedDateTime zoned = ZonedDateTime.ofInstant(Instant.ofEpochSecond(value), TimeZone.getDefault().toZoneId());
-        return new DateTimeType(zoned);
+        return new DateTimeType(Instant.ofEpochSecond(value));
     }
 
     public void setBinaryState(String action, String argument, String value) {
diff --git a/bundles/org.openhab.binding.wemo/src/test/java/org/openhab/binding/wemo/InsightParserTest.java b/bundles/org.openhab.binding.wemo/src/test/java/org/openhab/binding/wemo/InsightParserTest.java
index 322129c18fead..0016a2bb8761f 100644
--- a/bundles/org.openhab.binding.wemo/src/test/java/org/openhab/binding/wemo/InsightParserTest.java
+++ b/bundles/org.openhab.binding.wemo/src/test/java/org/openhab/binding/wemo/InsightParserTest.java
@@ -15,7 +15,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import java.time.ZoneId;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -47,7 +46,7 @@ public void parseUpnpInsightParams() {
                 "1|1645800647|109676|80323|1196960|1209600|44|41400|30288361|483361410|8000");
         Map<String, State> result = parser.parse();
         assertEquals(OnOffType.ON, result.get(WemoBindingConstants.CHANNEL_STATE));
-        assertEquals(DateTimeType.valueOf("2022-02-25T15:50:47.000+0100").toZone(ZoneId.systemDefault()),
+        assertEquals(DateTimeType.valueOf("2022-02-25T15:50:47.000+0100"),
                 result.get(WemoBindingConstants.CHANNEL_LAST_CHANGED_AT));
         assertEquals(new DecimalType(109_676), result.get(WemoBindingConstants.CHANNEL_LAST_ON_FOR));
         assertEquals(new DecimalType(80_323), result.get(WemoBindingConstants.CHANNEL_ON_TODAY));
@@ -69,7 +68,7 @@ public void parseHttpInsightParams() {
         InsightParser parser = new InsightParser("8|1645967627|0|0|0|1209600|13|0|0|0.000000|8000");
         Map<String, State> result = parser.parse();
         assertEquals(OnOffType.ON, result.get(WemoBindingConstants.CHANNEL_STATE));
-        assertEquals(DateTimeType.valueOf("2022-02-27T14:13:47.000+0100").toZone(ZoneId.systemDefault()),
+        assertEquals(DateTimeType.valueOf("2022-02-27T14:13:47.000+0100"),
                 result.get(WemoBindingConstants.CHANNEL_LAST_CHANGED_AT));
         assertEquals(new DecimalType(0), result.get(WemoBindingConstants.CHANNEL_LAST_ON_FOR));
         assertEquals(new DecimalType(0), result.get(WemoBindingConstants.CHANNEL_ON_TODAY));
@@ -92,7 +91,7 @@ public void parseUpnpBinaryState() {
                 "1|1645800647|109676|80323|1196960|1209600|44|41400|30288361|483361410");
         Map<String, State> result = parser.parse();
         assertEquals(OnOffType.ON, result.get(WemoBindingConstants.CHANNEL_STATE));
-        assertEquals(DateTimeType.valueOf("2022-02-25T15:50:47.000+0100").toZone(ZoneId.systemDefault()),
+        assertEquals(DateTimeType.valueOf("2022-02-25T15:50:47.000+0100"),
                 result.get(WemoBindingConstants.CHANNEL_LAST_CHANGED_AT));
         assertEquals(new DecimalType(109_676), result.get(WemoBindingConstants.CHANNEL_LAST_ON_FOR));
         assertEquals(new DecimalType(80_323), result.get(WemoBindingConstants.CHANNEL_ON_TODAY));

From 8caaa1bff7da5f371927934703177d551943722c Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 23:02:59 +0100
Subject: [PATCH 48/52] Simplify DateTimeType handling for Amazon DynamoDB

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../dynamodb/internal/AbstractDynamoDBItem.java  | 12 +++++-------
 .../AbstractDynamoDBItemSerializationTest.java   | 16 +++++++---------
 .../internal/AbstractTwoItemIntegrationTest.java | 16 ++++++++--------
 .../internal/DateTimeItemIntegrationTest.java    |  7 ++-----
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
index 10701a226df7b..8a13f88b3d95c 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItem.java
@@ -292,9 +292,8 @@ public static DynamoDBItem<?> fromStateNew(Item item, ZonedDateTime time, @Nulla
         } else if (item instanceof ContactItem) {
             return new DynamoDBBigDecimalItem(name, convert(state, DecimalType.class).toBigDecimal(), time, expireDays);
         } else if (item instanceof DateTimeItem) {
-            return new DynamoDBStringItem(name,
-                    ZONED_DATE_TIME_CONVERTER_STRING.toString(((DateTimeType) state).getZonedDateTime()), time,
-                    expireDays);
+            return new DynamoDBStringItem(name, ZONED_DATE_TIME_CONVERTER_STRING
+                    .toString(((DateTimeType) state).getInstant().atZone(ZoneId.systemDefault())), time, expireDays);
         } else if (item instanceof ImageItem) {
             throw new IllegalArgumentException("Unsupported item " + item.getClass().getSimpleName());
         } else if (item instanceof LocationItem) {
@@ -333,7 +332,8 @@ public static DynamoDBItem<?> fromStateNew(Item item, ZonedDateTime time, @Nulla
                 return new DynamoDBStringItem(name, stringType.toString(), time, expireDays);
             } else if (state instanceof DateTimeType dateType) {
                 return new DynamoDBStringItem(name,
-                        ZONED_DATE_TIME_CONVERTER_STRING.toString(dateType.getZonedDateTime()), time, expireDays);
+                        ZONED_DATE_TIME_CONVERTER_STRING.toString(dateType.getInstant().atZone(ZoneId.systemDefault())),
+                        time, expireDays);
             } else {
                 throw new IllegalStateException(
                         String.format("Unexpected state type %s with StringItem", state.getClass().getSimpleName()));
@@ -386,9 +386,7 @@ public static DynamoDBItem<?> fromStateNew(Item item, ZonedDateTime time, @Nulla
                         try {
                             // Parse ZoneDateTime from string. DATEFORMATTER assumes UTC in case it is not clear
                             // from the string (should be).
-                            // We convert to default/local timezone for user convenience (e.g. display)
-                            return new DateTimeType(ZONED_DATE_TIME_CONVERTER_STRING.transformTo(stringState)
-                                    .withZoneSameInstant(ZoneId.systemDefault()));
+                            return new DateTimeType(ZONED_DATE_TIME_CONVERTER_STRING.transformTo(stringState));
                         } catch (DateTimeParseException e) {
                             logger.warn("Failed to parse {} as date. Outputting UNDEF instead", stringState);
                             return UnDefType.UNDEF;
diff --git a/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItemSerializationTest.java b/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItemSerializationTest.java
index 7475d703a32c4..766017f404035 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItemSerializationTest.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractDynamoDBItemSerializationTest.java
@@ -20,7 +20,6 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Objects;
-import java.util.TimeZone;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -148,10 +147,10 @@ public void testOpenClosedTypeWithContactItem(boolean legacy) throws IOException
     @CsvSource({ "true", "false" })
     public void testDateTimeTypeWithDateTimeItem(boolean legacy) throws IOException {
         GenericItem item = new DateTimeItem("foo");
-        ZonedDateTime zdt = ZonedDateTime.parse("2016-05-01T13:46:00.050Z");
-        DynamoDBItem<?> dbitem = testSerializationToDTO(legacy, item, new DateTimeType(zdt.toString()),
+        Instant instant = Instant.parse("2016-05-01T13:46:00.050Z");
+        DynamoDBItem<?> dbitem = testSerializationToDTO(legacy, item, new DateTimeType(instant),
                 "2016-05-01T13:46:00.050Z");
-        testAsHistoricGeneric(dbitem, item, new DateTimeType(zdt.withZoneSameInstant(ZoneId.systemDefault())));
+        testAsHistoricGeneric(dbitem, item, new DateTimeType(instant));
     }
 
     @ParameterizedTest
@@ -159,7 +158,7 @@ public void testDateTimeTypeWithDateTimeItem(boolean legacy) throws IOException
     public void testDateTimeTypeWithStringItem(boolean legacy) throws IOException {
         GenericItem item = new StringItem("foo");
         DynamoDBItem<?> dbitem = testSerializationToDTO(legacy, item,
-                new DateTimeType(ZonedDateTime.parse("2016-05-01T13:46:00.050Z")), "2016-05-01T13:46:00.050Z");
+                new DateTimeType(Instant.parse("2016-05-01T13:46:00.050Z")), "2016-05-01T13:46:00.050Z");
         testAsHistoricGeneric(dbitem, item, new StringType("2016-05-01T13:46:00.050Z"));
     }
 
@@ -167,10 +166,10 @@ public void testDateTimeTypeWithStringItem(boolean legacy) throws IOException {
     @CsvSource({ "true", "false" })
     public void testDateTimeTypeLocalWithDateTimeItem(boolean legacy) throws IOException {
         GenericItem item = new DateTimeItem("foo");
-        ZonedDateTime expectedZdt = Instant.ofEpochMilli(1468773487050L).atZone(ZoneId.systemDefault());
+        Instant expectedInstant = Instant.ofEpochMilli(1468773487050L);
         DynamoDBItem<?> dbitem = testSerializationToDTO(legacy, item, new DateTimeType("2016-07-17T19:38:07.050+0300"),
                 "2016-07-17T16:38:07.050Z");
-        testAsHistoricGeneric(dbitem, item, new DateTimeType(expectedZdt));
+        testAsHistoricGeneric(dbitem, item, new DateTimeType(expectedInstant));
     }
 
     @ParameterizedTest
@@ -178,8 +177,7 @@ public void testDateTimeTypeLocalWithDateTimeItem(boolean legacy) throws IOExcep
     public void testDateTimeTypeLocalWithStringItem(boolean legacy) throws IOException {
         GenericItem item = new StringItem("foo");
         Instant instant = Instant.ofEpochMilli(1468773487050L); // GMT: Sun, 17 Jul 2016 16:38:07.050 GMT
-        ZonedDateTime zdt = instant.atZone(TimeZone.getTimeZone("GMT+03:00").toZoneId());
-        DynamoDBItem<?> dbitem = testSerializationToDTO(legacy, item, new DateTimeType(zdt),
+        DynamoDBItem<?> dbitem = testSerializationToDTO(legacy, item, new DateTimeType(instant),
                 "2016-07-17T16:38:07.050Z");
         testAsHistoricGeneric(dbitem, item, new StringType("2016-07-17T16:38:07.050Z"));
     }
diff --git a/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractTwoItemIntegrationTest.java b/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractTwoItemIntegrationTest.java
index fb5a0b4c3600d..30ee4e27d0a8f 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractTwoItemIntegrationTest.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/AbstractTwoItemIntegrationTest.java
@@ -225,8 +225,8 @@ public void testQueryUsingNameAndStartAndEndWithNEQOperator() {
             HistoricItem actual1 = iterator.next();
             assertFalse(iterator.hasNext());
             assertStateEquals(getFirstItemState(), actual1.getState());
-            assertTrue(actual1.getTimestamp().toInstant().isBefore(afterStore1.toInstant()));
-            assertTrue(actual1.getTimestamp().toInstant().isAfter(beforeStore.toInstant()));
+            assertTrue(actual1.getInstant().isBefore(afterStore1.toInstant()));
+            assertTrue(actual1.getInstant().isAfter(beforeStore.toInstant()));
         });
     }
 
@@ -246,8 +246,8 @@ public void testQueryUsingNameAndStartAndEndWithEQOperator() {
             HistoricItem actual1 = iterator.next();
             assertFalse(iterator.hasNext());
             assertStateEquals(getFirstItemState(), actual1.getState());
-            assertTrue(actual1.getTimestamp().toInstant().isBefore(afterStore1.toInstant()));
-            assertTrue(actual1.getTimestamp().toInstant().isAfter(beforeStore.toInstant()));
+            assertTrue(actual1.getInstant().isBefore(afterStore1.toInstant()));
+            assertTrue(actual1.getInstant().isAfter(beforeStore.toInstant()));
         });
     }
 
@@ -267,8 +267,8 @@ public void testQueryUsingNameAndStartAndEndWithLTOperator() {
             HistoricItem actual1 = iterator.next();
             assertFalse(iterator.hasNext());
             assertStateEquals(getFirstItemState(), actual1.getState());
-            assertTrue(actual1.getTimestamp().toInstant().isBefore(afterStore1.toInstant()));
-            assertTrue(actual1.getTimestamp().toInstant().isAfter(beforeStore.toInstant()));
+            assertTrue(actual1.getInstant().isBefore(afterStore1.toInstant()));
+            assertTrue(actual1.getInstant().isAfter(beforeStore.toInstant()));
         });
     }
 
@@ -304,8 +304,8 @@ public void testQueryUsingNameAndStartAndEndWithLTEOperator() {
             HistoricItem actual1 = iterator.next();
             assertFalse(iterator.hasNext());
             assertStateEquals(getFirstItemState(), actual1.getState());
-            assertTrue(actual1.getTimestamp().toInstant().isBefore(afterStore1.toInstant()));
-            assertTrue(actual1.getTimestamp().toInstant().isAfter(beforeStore.toInstant()));
+            assertTrue(actual1.getInstant().isBefore(afterStore1.toInstant()));
+            assertTrue(actual1.getInstant().isAfter(beforeStore.toInstant()));
         });
     }
 
diff --git a/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/DateTimeItemIntegrationTest.java b/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/DateTimeItemIntegrationTest.java
index 525ac84156ffa..75ad3a6127c10 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/DateTimeItemIntegrationTest.java
+++ b/bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/DateTimeItemIntegrationTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.persistence.dynamodb.internal;
 
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
@@ -71,23 +70,21 @@ protected String getItemName() {
     @Override
     protected State getFirstItemState() {
         // The persistence converts to system default timezone
-        // Thus we need to convert here as well for comparison
         // In the logs:
         // [main] TRACE org.openhab.persistence.dynamodb.internal.DynamoDBPersistenceService - Dynamo item datetime
         // (Type=DateTimeItem, State=2016-06-15T16:00:00.123+0000, Label=null, Category=null) converted to historic
         // item: datetime: 2020-11-28T11:29:54.326Z: 2016-06-15T19:00:00.123+0300
-        return STATE1.toZone(ZoneId.systemDefault());
+        return STATE1;
     }
 
     @Override
     protected State getSecondItemState() {
         // The persistence converts to system default timezone
-        // Thus we need to convert here as well for comparison
         // In the logs:
         // [main] TRACE org.openhab.persistence.dynamodb.internal.DynamoDBPersistenceService - Dynamo item datetime
         // (Type=DateTimeItem, State=2016-06-15T16:00:00.123+0000, Label=null, Category=null) converted to historic
         // item: datetime: 2020-11-28T11:29:54.326Z: 2016-06-15T19:00:00.123+0300
-        return STATE2.toZone(ZoneId.systemDefault());
+        return STATE2;
     }
 
     @Override

From b66c4420dd9e03e014fce4350182f89fc42a8c14 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Sat, 9 Nov 2024 23:06:35 +0100
Subject: [PATCH 49/52] Simplify DateTimeType handling for InfluxDB

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../influxdb/internal/InfluxDBStateConvertUtils.java      | 8 ++------
 .../influxdb/internal/InfluxDBStateConvertUtilsTest.java  | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java b/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
index 5fa30bbc892ab..1163847aaa30e 100644
--- a/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
+++ b/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);
diff --git a/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java b/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
index 2232915321946..2ec1bcc54e271 100644
--- a/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
+++ b/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));
     }
 

From a98e40126e7a7836135bda35248ebbbb839cfc53 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Mon, 18 Nov 2024 23:26:48 +0100
Subject: [PATCH 50/52] Simplify DateTimeType handling for Java Persistence API

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../java/org/openhab/persistence/jpa/internal/StateHelper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.persistence.jpa/src/main/java/org/openhab/persistence/jpa/internal/StateHelper.java b/bundles/org.openhab.persistence.jpa/src/main/java/org/openhab/persistence/jpa/internal/StateHelper.java
index 96108f717fa10..ca24a0427a450 100644
--- a/bundles/org.openhab.persistence.jpa/src/main/java/org/openhab/persistence/jpa/internal/StateHelper.java
+++ b/bundles/org.openhab.persistence.jpa/src/main/java/org/openhab/persistence/jpa/internal/StateHelper.java
@@ -37,7 +37,7 @@ public class StateHelper {
      */
     public static String toString(State state) {
         if (state instanceof DateTimeType type) {
-            return String.valueOf(type.getZonedDateTime().toInstant().toEpochMilli());
+            return String.valueOf(type.getInstant().toEpochMilli());
         }
         if (state instanceof DecimalType type) {
             return String.valueOf(type.doubleValue());

From b9fbcd98b4ae655c9042ad400db1a370bee07cd7 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Thu, 14 Nov 2024 22:23:26 +0100
Subject: [PATCH 51/52] Simplify DateTimeType handling for JDBC

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java   | 5 ++---
 .../persistence/jdbc/internal/db/JdbcBaseDAOTest.java       | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java
index 177fbc291d7f0..20f945e32c28f 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAO.java
@@ -639,8 +639,7 @@ protected ItemVO storeItemValueProvider(Item item, State itemState, ItemVO vo) {
                 break;
             case "DATETIMEITEM":
                 vo.setValueTypes(getSqlTypes().get(itemType), java.sql.Timestamp.class);
-                java.sql.Timestamp d = new java.sql.Timestamp(
-                        ((DateTimeType) itemState).getZonedDateTime().toInstant().toEpochMilli());
+                java.sql.Timestamp d = new java.sql.Timestamp(((DateTimeType) itemState).getInstant().toEpochMilli());
                 logger.debug("JDBC::storeItemValueProvider: DateTimeItem: '{}'", d);
                 vo.setValue(d);
                 break;
@@ -684,7 +683,7 @@ protected State objectAsState(Item item, @Nullable Unit<? extends Quantity<?>> u
             }
             return unit == null ? DecimalType.valueOf(objectAsString(v)) : QuantityType.valueOf(objectAsString(v));
         } else if (item instanceof DateTimeItem) {
-            return new DateTimeType(objectAsInstant(v).atZone(ZoneId.systemDefault()));
+            return new DateTimeType(objectAsInstant(v));
         } else if (item instanceof ColorItem) {
             return HSBType.valueOf(objectAsString(v));
         } else if (item instanceof DimmerItem || item instanceof RollershutterItem) {
diff --git a/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAOTest.java b/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAOTest.java
index c72d932736698..69e8c9bc413ac 100644
--- a/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAOTest.java
+++ b/bundles/org.openhab.persistence.jdbc/src/test/java/org/openhab/persistence/jdbc/internal/db/JdbcBaseDAOTest.java
@@ -127,13 +127,11 @@ private static Stream<Arguments> provideTestCasesForObjectAsStateValid() {
                         LocalDateTime.parse("2021-02-01T23:30:02.049"), null,
                         DateTimeType.valueOf("2021-02-01T23:30:02.049")),
                 Arguments.of(new DateTimeItem("Long_DateTimeItem"), Long.valueOf("1612222202049"), null,
-                        new DateTimeType(ZonedDateTime.ofInstant(Instant.parse("2021-02-01T23:30:02.049Z"),
-                                ZoneId.systemDefault()))),
+                        new DateTimeType(Instant.parse("2021-02-01T23:30:02.049Z"))),
                 Arguments.of(new DateTimeItem("Date_DateTimeItem"), java.sql.Date.valueOf("2021-02-01"), null,
                         DateTimeType.valueOf("2021-02-01T00:00:00.000")),
                 Arguments.of(new DateTimeItem("Instant_DateTimeItem"), Instant.parse("2021-02-01T23:30:02.049Z"), null,
-                        new DateTimeType(ZonedDateTime.ofInstant(Instant.parse("2021-02-01T23:30:02.049Z"),
-                                ZoneId.systemDefault()))),
+                        new DateTimeType(Instant.parse("2021-02-01T23:30:02.049Z"))),
                 Arguments.of(new DateTimeItem("String_DateTimeItem"), "2021-02-01 23:30:02.049", null,
                         DateTimeType.valueOf("2021-02-01T23:30:02.049")));
     }

From fdf7df06de692555086d7bc3fd132850168e377c Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Tue, 19 Nov 2024 20:27:10 +0100
Subject: [PATCH 52/52] Simplify DateTimeType handling for MongoDB

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../persistence/mongodb/internal/MongoDBTypeConversions.java | 4 ++--
 .../persistence/mongodb/internal/DataCreationHelper.java     | 5 +++--
 .../mongodb/internal/MongoDBPersistenceServiceTest.java      | 5 +++--
 .../persistence/mongodb/internal/VerificationHelper.java     | 4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.persistence.mongodb/src/main/java/org/openhab/persistence/mongodb/internal/MongoDBTypeConversions.java b/bundles/org.openhab.persistence.mongodb/src/main/java/org/openhab/persistence/mongodb/internal/MongoDBTypeConversions.java
index cc3bc3771e9bd..6dabc9af2097e 100644
--- a/bundles/org.openhab.persistence.mongodb/src/main/java/org/openhab/persistence/mongodb/internal/MongoDBTypeConversions.java
+++ b/bundles/org.openhab.persistence.mongodb/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/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java b/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java
index ac4deaf77322c..0fee51e23f095 100644
--- a/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/DataCreationHelper.java
+++ b/bundles/org.openhab.persistence.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/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/MongoDBPersistenceServiceTest.java b/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/MongoDBPersistenceServiceTest.java
index 1c80bc9544ef4..7da6bf3fdc001 100644
--- a/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/MongoDBPersistenceServiceTest.java
+++ b/bundles/org.openhab.persistence.mongodb/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/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/VerificationHelper.java b/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/VerificationHelper.java
index 1e6093f4fe661..57411063b0905 100644
--- a/bundles/org.openhab.persistence.mongodb/src/test/java/org/openhab/persistence/mongodb/internal/VerificationHelper.java
+++ b/bundles/org.openhab.persistence.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) {