Added support for TimeSeries on Offset-Profile (#5119)

Signed-off-by: Christoph Weitkamp <[email protected]>

Author: cweitkamp

bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java

@@ -23,10 +23,11 @@
 import org.openhab.core.thing.profiles.ProfileCallback;
 import org.openhab.core.thing.profiles.ProfileContext;
 import org.openhab.core.thing.profiles.ProfileTypeUID;
-import org.openhab.core.thing.profiles.StateProfile;
 import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.thing.profiles.TimeSeriesProfile;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
+import org.openhab.core.types.TimeSeries;
 import org.openhab.core.types.Type;
 import org.openhab.core.types.UnDefType;
 import org.slf4j.Logger;
@@ -38,7 +39,7 @@
  * @author Stefan Triller - Initial contribution
  */
 @NonNullByDefault
-public class SystemOffsetProfile implements StateProfile {
+public class SystemOffsetProfile implements TimeSeriesProfile {
 
     static final String OFFSET_PARAM = "offset";
 
@@ -94,6 +95,14 @@ public void onStateUpdateFromHandler(State state) {
         callback.sendUpdate((State) applyOffset(state, true));
     }
 
+    @Override
+    public void onTimeSeriesFromHandler(TimeSeries timeSeries) {
+        TimeSeries transformedTimeSeries = new TimeSeries(timeSeries.getPolicy());
+        timeSeries.getStates().forEach(
+                entry -> transformedTimeSeries.add(entry.timestamp(), (State) applyOffset(entry.state(), true)));
+        callback.sendTimeSeries(transformedTimeSeries);
+    }
+
     @SuppressWarnings({ "rawtypes", "unchecked" })
     private Type applyOffset(Type state, boolean towardsItem) {
         if (state instanceof UnDefType) {

bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java

@@ -15,9 +15,11 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.number.IsCloseTo.closeTo;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import java.time.Instant;
+
 import javax.measure.Unit;
 import javax.measure.quantity.Temperature;
 
@@ -35,6 +37,9 @@
 import org.openhab.core.thing.profiles.ProfileContext;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
+import org.openhab.core.types.TimeSeries;
+import org.openhab.core.types.TimeSeries.Entry;
+import org.openhab.core.types.TimeSeries.Policy;
 
 /**
  * Tests for the system:offset profile
@@ -201,6 +206,29 @@ public void testQuantityTypeWithUnitOneOnStateUpdateFromHandlerDecimalOffset() {
         assertEquals(Units.ONE, decResult.getUnit());
     }
 
+    @Test
+    public void testTimeSeriesFromHandler() {
+        ProfileCallback callback = mock(ProfileCallback.class);
+        SystemOffsetProfile offsetProfile = createProfile(callback, "3");
+
+        TimeSeries ts = new TimeSeries(Policy.ADD);
+        Instant now = Instant.now();
+        ts.add(now, new DecimalType(23));
+
+        offsetProfile.onTimeSeriesFromHandler(ts);
+
+        ArgumentCaptor<TimeSeries> capture = ArgumentCaptor.forClass(TimeSeries.class);
+        verify(callback, times(1)).sendTimeSeries(capture.capture());
+
+        TimeSeries result = capture.getValue();
+        assertEquals(ts.getStates().count(), result.getStates().count());
+        Entry entry = result.getStates().findFirst().get();
+        assertNotNull(entry);
+        assertEquals(now, entry.timestamp());
+        DecimalType decResult = (DecimalType) entry.state();
+        assertEquals(26, decResult.intValue());
+    }
+
     private SystemOffsetProfile createProfile(ProfileCallback callback, String offset) {
         ProfileContext context = mock(ProfileContext.class);
         Configuration config = new Configuration();