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

Remove Map null annotation workarounds (#8916)

Browse Source 
These workarounds to prevent false positives can be removed now the EEAs allow for proper null analysis.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-11-04 13:57:24 +01:00
committed by GitHub
parent 1dccf67909
commit b423f93b1f
124 changed files with 315 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/coe/TACmiHandler.java
View File

@@ -57,8 +57,8 @@ public class TACmiHandler extends BaseThingHandler {
private final Logger logger = LoggerFactory.getLogger(TACmiHandler.class);
private final Map<@Nullable PodIdentifier, @Nullable PodData> podDatas = new HashMap<>();
private final Map<@Nullable ChannelUID, @Nullable TACmiChannelConfiguration> channelConfigByUID = new HashMap<>();
private final Map<PodIdentifier, PodData> podDatas = new HashMap<>();
private final Map<ChannelUID, TACmiChannelConfiguration> channelConfigByUID = new HashMap<>();
private @Nullable TACmiCoEBridgeHandler bridge;
private long lastMessageRecvTS; // last received message timestamp
@@ -368,7 +368,7 @@ public class TACmiHandler extends BaseThingHandler {
"No update from C.M.I. for 15 min");
}
for (final PodData pd : this.podDatas.values()) {
if (pd == null || !(pd instanceof PodDataOutgoing)) {
if (!(pd instanceof PodDataOutgoing)) {
continue;
}
PodDataOutgoing podDataOutgoing = (PodDataOutgoing) pd;

4
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/ApiPageParser.java
View File

@@ -88,11 +88,11 @@ public class ApiPageParser extends AbstractSimpleMarkupHandler {
private @Nullable String address;
private @Nullable StringBuilder value;
private ButtonValue buttonValue = ButtonValue.UNKNOWN;
private Map<String, @Nullable ApiPageEntry> entries;
private Map<String, ApiPageEntry> entries;
private Set<String> seenNames = new HashSet<>();
private List<Channel> channels = new ArrayList<>();
public ApiPageParser(TACmiSchemaHandler taCmiSchemaHandler, Map<String, @Nullable ApiPageEntry> entries,
public ApiPageParser(TACmiSchemaHandler taCmiSchemaHandler, Map<String, ApiPageEntry> entries,
TACmiChannelTypeProvider channelTypeProvider) {
super();
this.taCmiSchemaHandler = taCmiSchemaHandler;

2
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/schema/TACmiSchemaHandler.java
View File

@@ -66,7 +66,7 @@ public class TACmiSchemaHandler extends BaseThingHandler {
private final HttpClient httpClient;
private final TACmiChannelTypeProvider channelTypeProvider;
private final Map<String, @Nullable ApiPageEntry> entries = new HashMap<>();
private final Map<String, ApiPageEntry> entries = new HashMap<>();
private boolean online;
private @Nullable String serverBase;
private @Nullable URI schemaApiPage;