[OmniLink] Use for each loop in getChildThing() (#9963)

* Use for each loop in getChildThing() Signed-off-by: Ethan Dye <[email protected]> * Further refine getChildThing() using stream map Signed-off-by: Ethan Dye <[email protected]> * Fix spotless errors Signed-off-by: Ethan Dye <[email protected]>
openhab · Jan 26, 2021 · e8ba8ec · e8ba8ec
1 parent a49b348
commit e8ba8ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/...mnilink/src/main/java/org/openhab/binding/omnilink/internal/OmnilinkBindingConstants.java b/...mnilink/src/main/java/org/openhab/binding/omnilink/internal/OmnilinkBindingConstants.java
@@ -185,4 +185,6 @@ public class OmnilinkBindingConstants {
             THING_TYPE_BUTTON, THING_TYPE_UNIT_UPB, THING_TYPE_THERMOSTAT, THING_TYPE_CONSOLE, THING_TYPE_AUDIO_ZONE,
             THING_TYPE_AUDIO_SOURCE, THING_TYPE_TEMP_SENSOR, THING_TYPE_HUMIDITY_SENSOR, THING_TYPE_LOCK,
             THING_TYPE_OUTPUT, THING_TYPE_UNIT, THING_TYPE_DIMMABLE);
+    public static final Set<ThingTypeUID> SUPPORTED_UNIT_TYPES_UIDS = Set.of(THING_TYPE_UNIT_UPB, THING_TYPE_ROOM,
+            THING_TYPE_FLAG, THING_TYPE_OUTPUT, THING_TYPE_DIMMABLE, THING_TYPE_UNIT);
 }
diff --git a/...nk/src/main/java/org/openhab/binding/omnilink/internal/handler/OmnilinkBridgeHandler.java b/...nk/src/main/java/org/openhab/binding/omnilink/internal/handler/OmnilinkBridgeHandler.java
@@ -568,24 +568,8 @@ private Optional<Thing> getChildThing(ThingTypeUID type, int number) {
     }
 
     private Optional<Thing> getUnitThing(int unitId) {
-        Optional<Thing> theThing = getChildThing(THING_TYPE_UNIT_UPB, unitId);
-        if (!(theThing.isPresent())) {
-            theThing = getChildThing(THING_TYPE_ROOM, unitId);
-        }
-        if (!(theThing.isPresent())) {
-            theThing = getChildThing(THING_TYPE_FLAG, unitId);
-        }
-        if (!(theThing.isPresent())) {
-            theThing = getChildThing(THING_TYPE_OUTPUT, unitId);
-        }
-        if (!(theThing.isPresent())) {
-            theThing = getChildThing(THING_TYPE_DIMMABLE, unitId);
-        }
-        if (!(theThing.isPresent())) {
-            theThing = getChildThing(THING_TYPE_UNIT, unitId);
-        }
-
-        return theThing;
+        return SUPPORTED_UNIT_TYPES_UIDS.stream().map(uid -> getChildThing(uid, unitId)).flatMap(Optional::stream)
+                .findFirst();
     }
 
     public Optional<AudioPlayer> getAudioPlayer() {