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

[hue] Catch exception of 'AllGroup' does not exist (#9502)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2020-12-25 15:44:03 +01:00 committed by GitHub
parent ca64d1124a
commit 750ea5fd2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/HueBridge.java
View File

@ -12,6 +12,7 @@
*/ */
package org.openhab.binding.hue.internal; package org.openhab.binding.hue.internal;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@ -425,8 +426,6 @@ public class HueBridge {
* @return all lights pseudo group * @return all lights pseudo group
*/ */
public Group getAllGroup() { public Group getAllGroup() {
requireAuthentication();
return new Group(); return new Group();
} }
@ -448,14 +447,21 @@ public class HueBridge {
if (groupMap.get("0") == null) { if (groupMap.get("0") == null) {
// Group 0 is not returned, we create it as in fact it exists // Group 0 is not returned, we create it as in fact it exists
groupList.add(getGroup(new Group())); try {
groupList.add(getGroup(getAllGroup()));
} catch (FileNotFoundException e) {
// We need a special exception handling here to further support deCONZ REST API. On deCONZ group "0" may
// not exist and the APIs will return a different HTTP status code if requesting a non existing group
// (Hue: 200, deCONZ: 404).
// see https://github.com/openhab/openhab-addons/issues/9175
logger.debug("Cannot find AllGroup with id \"0\" on Hue Bridge. Skipping it.");
}
} }
for (String id : groupMap.keySet()) { groupMap.forEach((id, group) -> {
FullGroup group = groupMap.get(id);
group.setId(id); group.setId(id);
groupList.add(group); groupList.add(group);
} });
return groupList; return groupList;
} }

2
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java
View File

@ -140,7 +140,7 @@ public class HueBridgeHandler extends ConfigStatusBridgeHandler implements HueCl
} }
} catch (ApiException | IOException e) { } catch (ApiException | IOException e) {
if (hueBridge != null && lastBridgeConnectionState) { if (hueBridge != null && lastBridgeConnectionState) {
logger.debug("Connection to Hue Bridge {} lost.", hueBridge.getIPAddress()); logger.debug("Connection to Hue Bridge {} lost: {}", hueBridge.getIPAddress(), e.getMessage(), e);
lastBridgeConnectionState = false; lastBridgeConnectionState = false;
onConnectionLost(); onConnectionLost();
} }