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

Fixed SAT findings for new SAT 0.11.1 release (#10518)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp
2021-04-14 15:11:31 +02:00
committed by GitHub
parent 9e4b67ee09
commit a04cfd3389
28 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,16 @@ import static org.openhab.io.homekit.internal.HomekitAccessoryType.*;
import static org.openhab.io.homekit.internal.HomekitCharacteristicType.*;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -124,7 +131,7 @@ public class HomekitAccessoryFactory {
/**
* creates HomeKit accessory for a openhab item.
*
*
* @param taggedItem openhab item tagged as HomeKit item
* @param metadataRegistry openhab metadata registry required to get item meta information
* @param updater OH HomeKit update class that ensure the status sync between OH item and corresponding HomeKit
@@ -171,7 +178,7 @@ public class HomekitAccessoryFactory {
/**
* return HomeKit accessory types for a OH item based on meta data
*
*
* @param item OH item
* @param metadataRegistry meta data registry
* @return list of HomeKit accessory types and characteristics.
@@ -210,7 +217,7 @@ public class HomekitAccessoryFactory {
/**
* return list of HomeKit relevant groups linked to an accessory
*
*
* @param item OH item
* @param itemRegistry item registry
* @param metadataRegistry metadata registry
@@ -231,7 +238,7 @@ public class HomekitAccessoryFactory {
/**
* collect all mandatory characteristics for a given tagged item, e.g. collect all mandatory HomeKit items from a
* GroupItem
*
*
* @param taggedItem HomeKit tagged item
* @param metadataRegistry meta data registry
* @return list of mandatory
@@ -341,7 +348,7 @@ public class HomekitAccessoryFactory {
/**
* collect optional HomeKit characteristics for a OH item.
*
*
* @param taggedItem main OH item
* @param metadataRegistry OH metadata registry
* @return a map with characteristics and corresponding OH items
@@ -368,7 +375,7 @@ public class HomekitAccessoryFactory {
/**
* return true is characteristic is a mandatory characteristic for the accessory.
*
*
* @param accessory accessory
* @param characteristic characteristic
* @return true if characteristic is mandatory, false if not mandatory
@@ -381,7 +388,7 @@ public class HomekitAccessoryFactory {
/**
* check whether accessory is root accessory, i.e. without characteristic tag.
*
*
* @param accessory accessory
* @return true if accessory has not characteristic.
*/

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

@@ -69,7 +69,17 @@ import io.github.hapjava.characteristics.impl.common.StatusFaultCharacteristic;
import io.github.hapjava.characteristics.impl.common.StatusFaultEnum;
import io.github.hapjava.characteristics.impl.common.StatusTamperedCharacteristic;
import io.github.hapjava.characteristics.impl.common.StatusTamperedEnum;
import io.github.hapjava.characteristics.impl.fan.*;
import io.github.hapjava.characteristics.impl.fan.CurrentFanStateCharacteristic;
import io.github.hapjava.characteristics.impl.fan.CurrentFanStateEnum;
import io.github.hapjava.characteristics.impl.fan.LockPhysicalControlsCharacteristic;
import io.github.hapjava.characteristics.impl.fan.LockPhysicalControlsEnum;
import io.github.hapjava.characteristics.impl.fan.RotationDirectionCharacteristic;
import io.github.hapjava.characteristics.impl.fan.RotationDirectionEnum;
import io.github.hapjava.characteristics.impl.fan.RotationSpeedCharacteristic;
import io.github.hapjava.characteristics.impl.fan.SwingModeCharacteristic;
import io.github.hapjava.characteristics.impl.fan.SwingModeEnum;
import io.github.hapjava.characteristics.impl.fan.TargetFanStateCharacteristic;
import io.github.hapjava.characteristics.impl.fan.TargetFanStateEnum;
import io.github.hapjava.characteristics.impl.lightbulb.BrightnessCharacteristic;
import io.github.hapjava.characteristics.impl.lightbulb.ColorTemperatureCharacteristic;
import io.github.hapjava.characteristics.impl.lightbulb.HueCharacteristic;