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

31
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/impl/DeviceStatusManagerImpl.java
View File

@@ -1280,22 +1280,27 @@ public class DeviceStatusManagerImpl implements DeviceStatusManager {
@Override
public void handleEvent(EventItem eventItem) {
if (EventNames.DEVICE_SENSOR_VALUE.equals(eventItem.getName())
|| EventNames.DEVICE_BINARY_INPUT_EVENT.equals(eventItem.getName())) {
logger.debug("Detect {} eventItem = {}", eventItem.getName(), eventItem.toString());
Device dev = getDeviceOfEvent(eventItem);
if (dev != null) {
if (EventNames.DEVICE_SENSOR_VALUE.equals(eventItem.getName())) {
dev.setDeviceSensorByEvent(eventItem);
} else {
DeviceBinarayInputEnum binaryInputType = DeviceBinarayInputEnum.getdeviceBinarayInput(
Short.parseShort(eventItem.getProperties().get(EventResponseEnum.INPUT_TYPE)));
Short newState = Short.parseShort(eventItem.getProperties().get(EventResponseEnum.INPUT_STATE));
if (binaryInputType != null) {
dev.setBinaryInputState(binaryInputType, newState);
try {
if (EventNames.DEVICE_SENSOR_VALUE.equals(eventItem.getName())
|| EventNames.DEVICE_BINARY_INPUT_EVENT.equals(eventItem.getName())) {
logger.debug("Detect {} eventItem = {}", eventItem.getName(), eventItem.toString());
Device dev = getDeviceOfEvent(eventItem);
if (dev != null) {
if (EventNames.DEVICE_SENSOR_VALUE.equals(eventItem.getName())) {
dev.setDeviceSensorByEvent(eventItem);
} else {
DeviceBinarayInputEnum binaryInputType = DeviceBinarayInputEnum.getdeviceBinarayInput(Short
.parseShort(eventItem.getProperties().getOrDefault(EventResponseEnum.INPUT_TYPE, "")));
Short newState = Short
.parseShort(eventItem.getProperties().getOrDefault(EventResponseEnum.INPUT_STATE, ""));
if (binaryInputType != null) {
dev.setBinaryInputState(binaryInputType, newState);
}
}
}
}
} catch (NumberFormatException e) {
logger.debug("Unexpected missing or invalid number while handling event", e);
}
}

82
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/manager/impl/TemperatureControlManager.java
View File

@@ -284,54 +284,64 @@ public class TemperatureControlManager implements EventHandler, TemperatureContr
@Override
public void handleEvent(EventItem eventItem) {
logger.debug("detect event: {}", eventItem.toString());
if (eventItem.getName().equals(EventNames.ZONE_SENSOR_VALUE)) {
if (zoneTemperationControlListenerMap != null) {
if (SensorEnum.ROOM_TEMPERATURE_SET_POINT.getSensorType().toString()
.equals(eventItem.getProperties().get(EventResponseEnum.SENSOR_TYPE))) {
Integer zoneID = Integer.parseInt(eventItem.getSource().get(EventResponseEnum.ZONEID));
if (zoneTemperationControlListenerMap.get(zoneID) != null) {
Float newValue = Float
.parseFloat(eventItem.getProperties().get(EventResponseEnum.SENSOR_VALUE_FLOAT));
if (!isEcho(zoneID, SensorEnum.ROOM_TEMPERATURE_CONTROL_VARIABLE, newValue)) {
zoneTemperationControlListenerMap.get(zoneID).onTargetTemperatureChanged(newValue);
try {
logger.debug("detect event: {}", eventItem.toString());
if (eventItem.getName().equals(EventNames.ZONE_SENSOR_VALUE)) {
if (zoneTemperationControlListenerMap != null) {
if (SensorEnum.ROOM_TEMPERATURE_SET_POINT.getSensorType().toString()
.equals(eventItem.getProperties().get(EventResponseEnum.SENSOR_TYPE))) {
Integer zoneID = Integer
.parseInt(eventItem.getSource().getOrDefault(EventResponseEnum.ZONEID, ""));
if (zoneTemperationControlListenerMap.get(zoneID) != null) {
Float newValue = Float.parseFloat(
eventItem.getProperties().getOrDefault(EventResponseEnum.SENSOR_VALUE_FLOAT, ""));
if (!isEcho(zoneID, SensorEnum.ROOM_TEMPERATURE_CONTROL_VARIABLE, newValue)) {
zoneTemperationControlListenerMap.get(zoneID).onTargetTemperatureChanged(newValue);
}
}
}
}
if (SensorEnum.ROOM_TEMPERATURE_CONTROL_VARIABLE.getSensorType().toString()
.equals(eventItem.getProperties().get(EventResponseEnum.SENSOR_TYPE))) {
Integer zoneID = Integer.parseInt(eventItem.getSource().get(EventResponseEnum.ZONEID));
if (zoneTemperationControlListenerMap.get(zoneID) != null) {
Float newValue = Float
.parseFloat(eventItem.getProperties().get(EventResponseEnum.SENSOR_VALUE_FLOAT));
if (!isEcho(zoneID, SensorEnum.ROOM_TEMPERATURE_CONTROL_VARIABLE, newValue)) {
zoneTemperationControlListenerMap.get(zoneID).onControlValueChanged(newValue.intValue());
if (SensorEnum.ROOM_TEMPERATURE_CONTROL_VARIABLE.getSensorType().toString()
.equals(eventItem.getProperties().get(EventResponseEnum.SENSOR_TYPE))) {
Integer zoneID = Integer
.parseInt(eventItem.getSource().getOrDefault(EventResponseEnum.ZONEID, ""));
if (zoneTemperationControlListenerMap.get(zoneID) != null) {
Float newValue = Float.parseFloat(
eventItem.getProperties().getOrDefault(EventResponseEnum.SENSOR_VALUE_FLOAT, ""));
if (!isEcho(zoneID, SensorEnum.ROOM_TEMPERATURE_CONTROL_VARIABLE, newValue)) {
zoneTemperationControlListenerMap.get(zoneID)
.onControlValueChanged(newValue.intValue());
}
}
}
}
}
}
if (eventItem.getName().equals(EventNames.HEATING_CONTROL_OPERATION_MODE)) {
if (EVALUATE_REAL_ACTIVE_MODE.equals(eventItem.getProperties().get(EventResponseEnum.ACTIONS))) {
Integer zoneID = Integer.parseInt(eventItem.getProperties().get(EventResponseEnum.ZONEID));
TemperatureControlStatus temperationControlStatus = dSapi
.getZoneTemperatureControlStatus(connectionMananager.getSessionToken(), zoneID, null);
if (temperationControlStatus != null) {
addTemperatureControlStatus(temperationControlStatus);
if (eventItem.getName().equals(EventNames.HEATING_CONTROL_OPERATION_MODE)) {
if (EVALUATE_REAL_ACTIVE_MODE.equals(eventItem.getProperties().get(EventResponseEnum.ACTIONS))) {
Integer zoneID = Integer
.parseInt(eventItem.getProperties().getOrDefault(EventResponseEnum.ZONEID, ""));
TemperatureControlStatus temperationControlStatus = dSapi
.getZoneTemperatureControlStatus(connectionMananager.getSessionToken(), zoneID, null);
if (temperationControlStatus != null) {
addTemperatureControlStatus(temperationControlStatus);
}
}
}
}
if (eventItem.getName().equals(EventNames.STATE_CHANGED)) {
if (STATE_NAME_HEATING_WATER_SYSTEM.equals(eventItem.getProperties().get(EventResponseEnum.STATE_NAME))) {
currentHeatingWaterSystemStage = eventItem.getProperties().get(EventResponseEnum.STATE);
logger.debug("heating water system state changed to {}", currentHeatingWaterSystemStage);
if (systemStateChangeListener != null) {
systemStateChangeListener.onSystemStateChanged(STATE_NAME_HEATING_WATER_SYSTEM,
currentHeatingWaterSystemStage);
if (eventItem.getName().equals(EventNames.STATE_CHANGED)) {
if (STATE_NAME_HEATING_WATER_SYSTEM
.equals(eventItem.getProperties().get(EventResponseEnum.STATE_NAME))) {
currentHeatingWaterSystemStage = eventItem.getProperties().get(EventResponseEnum.STATE);
logger.debug("heating water system state changed to {}", currentHeatingWaterSystemStage);
if (systemStateChangeListener != null) {
systemStateChangeListener.onSystemStateChanged(STATE_NAME_HEATING_WATER_SYSTEM,
currentHeatingWaterSystemStage);
}
}
}
} catch (NumberFormatException e) {
logger.debug("Unexpected missing or invalid number while handling event", e);
}
}

24
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceSensorValue.java
View File

@@ -87,20 +87,24 @@ public class DeviceSensorValue {
* Creates a new {@link DeviceSensorValue} through the properties of a digitalSTROM
* {@link EventNames#DEVICE_SENSOR_VALUE} event.
*
* @param eventPropertie must not be null
* @param eventProperties must not be null
*/
public DeviceSensorValue(Map<EventResponseEnum, String> eventPropertie) {
if (eventPropertie.get(EventResponseEnum.SENSOR_VALUE_FLOAT) != null) {
floatValue = Float.parseFloat(eventPropertie.get(EventResponseEnum.SENSOR_VALUE_FLOAT));
public DeviceSensorValue(Map<EventResponseEnum, String> eventProperties) {
String strVal = eventProperties.get(EventResponseEnum.SENSOR_VALUE_FLOAT);
if (strVal != null) {
floatValue = Float.parseFloat(strVal);
}
if (eventPropertie.get(EventResponseEnum.SENSOR_TYPE) != null) {
sensorType = SensorEnum.getSensor(Short.parseShort(eventPropertie.get(EventResponseEnum.SENSOR_TYPE)));
strVal = eventProperties.get(EventResponseEnum.SENSOR_TYPE);
if (strVal != null) {
sensorType = SensorEnum.getSensor(Short.parseShort(strVal));
}
if (eventPropertie.get(EventResponseEnum.SENSOR_VALUE) != null) {
dsValue = Integer.parseInt(eventPropertie.get(EventResponseEnum.SENSOR_VALUE));
strVal = eventProperties.get(EventResponseEnum.SENSOR_VALUE);
if (strVal != null) {
dsValue = Integer.parseInt(strVal);
}
if (eventPropertie.get(EventResponseEnum.SENSOR_INDEX) != null) {
sensorIndex = Short.parseShort(eventPropertie.get(EventResponseEnum.SENSOR_INDEX));
strVal = eventProperties.get(EventResponseEnum.SENSOR_INDEX);
if (strVal != null) {
sensorIndex = Short.parseShort(strVal);
}
timestamp = Date.from(Instant.ofEpochMilli(System.currentTimeMillis()));
valid = true;