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

12
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
View File

@@ -92,13 +92,21 @@ public class HomekitChangeListener implements ItemRegistryChangeListener {
private void initialiseRevision() {
int revision;
try {
revision = Integer.parseInt(storage.get(REVISION_CONFIG));
String revisionString = storage.get(REVISION_CONFIG);
if (revisionString == null) {
throw new NumberFormatException();
}
revision = Integer.parseInt(revisionString);
} catch (NumberFormatException e) {
revision = 1;
storage.put(REVISION_CONFIG, "" + revision);
}
try {
lastAccessoryCount = Integer.parseInt(storage.get(ACCESSORY_COUNT));
String accessoryCountString = storage.get(ACCESSORY_COUNT);
if (accessoryCountString == null) {
throw new NumberFormatException();
}
lastAccessoryCount = Integer.parseInt(accessoryCountString);
} catch (NumberFormatException e) {
lastAccessoryCount = 0;
storage.put(ACCESSORY_COUNT, "" + accessoryRegistry.getAllAccessories().size());

4
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
View File

@@ -454,8 +454,6 @@ public class HomekitAccessoryFactory {
* @return new characteristic type
*/
private static HomekitCharacteristicType legacyCheck(HomekitCharacteristicType characteristicType) {
if (LEGACY_CHARACTERISTICS_MAPPING.containsKey(characteristicType))
return LEGACY_CHARACTERISTICS_MAPPING.get(characteristicType);
return characteristicType;
return LEGACY_CHARACTERISTICS_MAPPING.getOrDefault(characteristicType, characteristicType);
}
}