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

Fix SAT warnings (#14214)

Browse Source 
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2023-01-13 19:10:59 +01:00
committed by GitHub
parent 4dd60bb442
commit ee54882841
10 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,8 +413,9 @@ public class HomekitAccessoryFactory {
.collect(Collectors.toList())) {
var characteristic = HomekitMetadataCharacteristicFactory.createCharacteristic(entry.getKey(),
entry.getValue());
if (characteristic.isPresent())
if (characteristic.isPresent()) {
accessory.addCharacteristic(characteristic.get());
}
}
}

5
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitMetadataCharacteristicFactory.java
View File

@@ -72,7 +72,7 @@ public class HomekitMetadataCharacteristicFactory {
private static final Logger logger = LoggerFactory.getLogger(HomekitMetadataCharacteristicFactory.class);
// List of optional characteristics that can be set via metadata, and the corresponding method to create them.
private final static Map<HomekitCharacteristicType, Function<Object, Characteristic>> optional = new HashMap<>() {
private static final Map<HomekitCharacteristicType, Function<Object, Characteristic>> optional = new HashMap<>() {
{
put(ACTIVE_IDENTIFIER, HomekitMetadataCharacteristicFactory::createActiveIdentifierCharacteristic);
put(ACTIVE_STATUS, HomekitMetadataCharacteristicFactory::createActiveStatusCharacteristic);
@@ -101,8 +101,9 @@ public class HomekitMetadataCharacteristicFactory {
public static Optional<Characteristic> createCharacteristic(String characteristic, Object value) {
var type = HomekitCharacteristicType.valueOfTag(characteristic);
if (type.isEmpty() || !optional.containsKey(type.get()))
if (type.isEmpty() || !optional.containsKey(type.get())) {
return Optional.empty();
}
return Optional.of(optional.get(type.get()).apply(value));
}