public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[infrastructure] add external null-annotations (#8848)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K
2020-10-31 00:29:03 +01:00
committed by GitHub
parent 47d05055db
commit bd664ff0c8
162 changed files with 933 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/dto/TripDetail.java
View File

@@ -17,6 +17,7 @@ import static org.openhab.binding.volvooncall.internal.VolvoOnCallBindingConstan
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.temporal.Temporal;
import java.util.Optional;
import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -73,8 +74,14 @@ public class TripDetail {
return getPositionAsState(endPosition);
}
public long getDurationInMinutes() {
return Duration.between(startTime, endTime).toMinutes();
public Optional<Long> getDurationInMinutes() {
Temporal start = startTime;
Temporal end = endTime;
if (start == null || end == null) {
return Optional.empty();
} else {
return Optional.of(Duration.between(start, end).toMinutes());
}
}
public Optional<Integer> getFuelConsumption() {

8
bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/handler/VehicleHandler.java
View File

@@ -131,8 +131,9 @@ public class VehicleHandler extends BaseThingHandler {
thing.getProperties().entrySet().stream().filter(p -> "true".equals(p.getValue()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
if (thing.getProperties().containsKey(LAST_TRIP_ID)) {
lastTripId = Long.parseLong(thing.getProperties().get(LAST_TRIP_ID));
String lastTripIdString = thing.getProperties().get(LAST_TRIP_ID);
if (lastTripIdString != null) {
lastTripId = Long.parseLong(lastTripIdString);
}
updateStatus(ThingStatus.ONLINE);
@@ -294,7 +295,8 @@ public class VehicleHandler extends BaseThingHandler {
case TRIP_END_TIME:
return tripDetails.getEndTime();
case TRIP_DURATION:
return new QuantityType<>(tripDetails.getDurationInMinutes(), MINUTE);
return tripDetails.getDurationInMinutes().map(value -> (State) new QuantityType<>(value, MINUTE))
.orElse(UnDefType.UNDEF);
case TRIP_START_ODOMETER:
return new QuantityType<>((double) tripDetails.startOdometer / 1000, KILO(METRE));
case TRIP_STOP_ODOMETER: