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

8
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/discovery/LeapDeviceDiscoveryService.java
View File

@@ -150,9 +150,11 @@ public class LeapDeviceDiscoveryService extends AbstractDiscoveryService
} else {
areaName = "Occupancy Group";
}
logger.debug("Discovered occupancy group: {} areas: {} area name: {}", groupNum,
oGroup.associatedAreas.length, areaName);
notifyDiscovery(THING_TYPE_OGROUP, groupNum, areaName);
if (areaName != null) {
logger.debug("Discovered occupancy group: {} areas: {} area name: {}", groupNum,
oGroup.associatedAreas.length, areaName);
notifyDiscovery(THING_TYPE_OGROUP, groupNum, areaName);
}
}
}
this.areaMap = null;

4
bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/protocol/leap/LeapMessageParser.java
View File

@@ -14,6 +14,7 @@ package org.openhab.binding.lutron.internal.protocol.leap;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -212,6 +213,7 @@ public class LeapMessageParser {
try {
if (messageBody.has(memberName)) {
JsonObject jsonObject = messageBody.get(memberName).getAsJsonObject();
@Nullable
T obj = gson.fromJson(jsonObject, type);
return obj;
} else {
@@ -233,7 +235,7 @@ public class LeapMessageParser {
for (JsonElement element : jsonArray) {
JsonObject jsonObject = element.getAsJsonObject();
T obj = gson.fromJson(jsonObject, type);
T obj = Objects.requireNonNull(gson.fromJson(jsonObject, type));
objList.add(obj);
}
return objList;