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

[infrastructure] move infered nullness warnings to error and update EEA (#8949)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K
2020-11-12 21:07:11 +01:00
committed by GitHub
parent 0856a0b3f2
commit ba4c96d99d
155 changed files with 644 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/builder/ZoneSettingsBuilder.java
View File

@@ -14,6 +14,7 @@ package org.openhab.binding.tado.internal.builder;
import java.io.IOException;
import org.openhab.binding.tado.internal.TadoBindingConstants;
import org.openhab.binding.tado.internal.TadoBindingConstants.FanSpeed;
import org.openhab.binding.tado.internal.TadoBindingConstants.HvacMode;
import org.openhab.binding.tado.internal.TadoBindingConstants.TemperatureUnit;
@@ -30,7 +31,11 @@ import org.openhab.binding.tado.internal.handler.TadoZoneHandler;
*/
public abstract class ZoneSettingsBuilder {
public static ZoneSettingsBuilder of(TadoZoneHandler zoneHandler) {
switch (zoneHandler.getZoneType()) {
TadoBindingConstants.ZoneType zoneType = zoneHandler.getZoneType();
if (zoneType == null) {
throw new IllegalArgumentException("Zone type is null");
}
switch (zoneType) {
case HEATING:
return new HeatingZoneSettingsBuilder();
case AIR_CONDITIONING:

3
bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoHomeHandler.java
View File

@@ -62,7 +62,8 @@ public class TadoHomeHandler extends BaseBridgeHandler {
}
public TemperatureUnit getTemperatureUnit() {
String temperatureUnitStr = this.thing.getProperties().get(TadoBindingConstants.PROPERTY_HOME_TEMPERATURE_UNIT);
String temperatureUnitStr = this.thing.getProperties()
.getOrDefault(TadoBindingConstants.PROPERTY_HOME_TEMPERATURE_UNIT, "CELSIUS");
return TemperatureUnit.valueOf(temperatureUnitStr);
}

5
bundles/org.openhab.binding.tado/src/main/java/org/openhab/binding/tado/internal/handler/TadoZoneHandler.java
View File

@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import javax.measure.quantity.Temperature;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.tado.internal.TadoBindingConstants;
import org.openhab.binding.tado.internal.TadoBindingConstants.OperationMode;
import org.openhab.binding.tado.internal.TadoBindingConstants.TemperatureUnit;
@@ -81,9 +82,9 @@ public class TadoZoneHandler extends BaseHomeThingHandler {
return this.configuration.fallbackTimerDuration;
}
public ZoneType getZoneType() {
public @Nullable ZoneType getZoneType() {
String zoneTypeStr = this.thing.getProperties().get(TadoBindingConstants.PROPERTY_ZONE_TYPE);
return ZoneType.valueOf(zoneTypeStr);
return zoneTypeStr != null ? ZoneType.valueOf(zoneTypeStr) : null;
}
public OverlayTerminationCondition getDefaultTerminationCondition() throws IOException, ApiException {