demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Optional fields to nullable (#19462)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen
2025-10-11 13:13:37 +02:00
committed by GitHub
parent cc8a8b4f6f
commit 231f216f57
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.boschindego/src/main/java/org/openhab/binding/boschindego/internal/handler/BoschIndegoHandler.java
+6 -6
View File
@@ -20,7 +20,6 @@ import java.time.Instant;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -98,7 +97,7 @@ public class BoschIndegoHandler extends BaseThingHandler implements Authorizatio
private @Nullable ScheduledFuture<?> statePollFuture;
private @Nullable ScheduledFuture<?> cuttingTimePollFuture;
private @Nullable ScheduledFuture<?> cuttingTimeFuture;
private Optional<Integer> previousStateCode = Optional.empty();
private @Nullable Integer previousStateCode;
private @Nullable RawType cachedMap;
private Instant cachedMapTimestamp = Instant.MIN;
private Instant operatingDataTimestamp = Instant.MIN;
@@ -144,7 +143,7 @@ public class BoschIndegoHandler extends BaseThingHandler implements Authorizatio
controller = new IndegoDeviceController(httpClient, authorizationProvider, config.serialNumber);
updateStatus(ThingStatus.UNKNOWN);
previousStateCode = Optional.empty();
previousStateCode = null;
rescheduleStatePoll(0, stateInactiveRefreshIntervalSeconds, false);
this.cuttingTimePollFuture = scheduler.scheduleWithFixedDelay(this::refreshCuttingTimesWithExceptionHandling, 0,
config.cuttingTimeRefresh, TimeUnit.MINUTES);
@@ -346,8 +345,9 @@ public class BoschIndegoHandler extends BaseThingHandler implements Authorizatio
int previousState;
DeviceStatus previousDeviceStatus;
if (previousStateCode.isPresent()) {
previousState = previousStateCode.get();
Integer previousStateCode = this.previousStateCode;
if (previousStateCode != null) {
previousState = previousStateCode;
previousDeviceStatus = DeviceStatus.fromCode(previousState);
if (state.state != previousState
&& ((!previousDeviceStatus.isDocked() && deviceStatus.isDocked()) || deviceStatus.isCompleted())) {
@@ -360,7 +360,7 @@ public class BoschIndegoHandler extends BaseThingHandler implements Authorizatio
previousState = state.state;
previousDeviceStatus = DeviceStatus.fromCode(previousState);
}
previousStateCode = Optional.of(state.state);
this.previousStateCode = state.state;
refreshOperatingDataConditionally(
previousDeviceStatus.isCharging() || deviceStatus.isCharging() || deviceStatus.isActive());