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

2
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/VeluxRSBindingConfig.java
View File

@@ -204,6 +204,6 @@ public class VeluxRSBindingConfig extends VeluxBindingConfig {
public String getSceneName(Integer level) {
logger.trace("getSceneName({}) called.", level);
logger.trace("getSceneName() returning {}.", mapDescending.get(level));
return mapDescending.get(level);
return mapDescending.getOrDefault(level, "null");
}
}

13
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxExistingProducts.java
View File

@@ -86,10 +86,8 @@ public class VeluxExistingProducts {
public boolean isRegistered(ProductBridgeIndex bridgeProductIndex) {
logger.trace("isRegisteredProductBridgeIndex {}) called.", bridgeProductIndex.toString());
if (!bridgeIndexToSerialNumber.containsKey(bridgeProductIndex.toInt())) {
return false;
}
return isRegistered(bridgeIndexToSerialNumber.get(bridgeProductIndex.toInt()));
String serialNumber = bridgeIndexToSerialNumber.get(bridgeProductIndex.toInt());
return serialNumber != null && isRegistered(serialNumber);
}
public boolean register(VeluxProduct newProduct) {
@@ -148,15 +146,16 @@ public class VeluxExistingProducts {
if (!isRegistered(productUniqueIndexOrSerialNumber)) {
return VeluxProduct.UNKNOWN;
}
return existingProductsByUniqueIndex.get(productUniqueIndexOrSerialNumber);
return existingProductsByUniqueIndex.getOrDefault(productUniqueIndexOrSerialNumber, VeluxProduct.UNKNOWN);
}
public VeluxProduct get(ProductBridgeIndex bridgeProductIndex) {
logger.trace("get({}) called.", bridgeProductIndex);
if (!isRegistered(bridgeProductIndex)) {
String serialNumber = bridgeIndexToSerialNumber.get(bridgeProductIndex.toInt());
if (!isRegistered(bridgeProductIndex) || serialNumber == null) {
return VeluxProduct.UNKNOWN;
}
return existingProductsByUniqueIndex.get(bridgeIndexToSerialNumber.get(bridgeProductIndex.toInt()));
return existingProductsByUniqueIndex.getOrDefault(serialNumber, VeluxProduct.UNKNOWN);
}
public VeluxProduct[] values() {

2
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxExistingScenes.java
View File

@@ -84,7 +84,7 @@ public class VeluxExistingScenes {
if (!isRegistered(sceneName)) {
return VeluxScene.UNKNOWN;
}
return existingScenesBySceneName.get(sceneName.toString());
return existingScenesBySceneName.getOrDefault(sceneName.toString(), VeluxScene.UNKNOWN);
}
public VeluxScene[] values() {

6
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxGwState.java
View File

@@ -135,11 +135,7 @@ public class VeluxGwState {
}
public static VeluxGatewaySubState get(int stateValue) {
if (LOOKUPTYPEID2ENUM.containsKey(stateValue)) {
return LOOKUPTYPEID2ENUM.get(stateValue);
} else {
return VeluxGatewaySubState.UNDEFTYPE;
}
return LOOKUPTYPEID2ENUM.getOrDefault(stateValue, VeluxGatewaySubState.UNDEFTYPE);
}
}

6
bundles/org.openhab.binding.velux/src/main/java/org/openhab/binding/velux/internal/things/VeluxKLFAPI.java
View File

@@ -343,11 +343,7 @@ public class VeluxKLFAPI {
}
public static Command get(short thisTypeId) {
if (LOOKUPTYPEID2ENUM.containsKey(thisTypeId)) {
return LOOKUPTYPEID2ENUM.get(thisTypeId);
} else {
return Command.UNDEFTYPE;
}
return LOOKUPTYPEID2ENUM.getOrDefault(thisTypeId, Command.UNDEFTYPE);
}
}
}