Prevent NSEE when there is no AddonService (#2493)

The code was already prepared for a nullable default service and then returns a 404 not found. Fixes #2491 Signed-off-by: Wouter Born <[email protected]>
openhab · Sep 25, 2021 · 641b923 · 641b923
1 parent cfabfbc
commit 641b923
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/....rest.core/src/main/java/org/openhab/core/io/rest/core/internal/addons/AddonResource.java b/....rest.core/src/main/java/org/openhab/core/io/rest/core/internal/addons/AddonResource.java
@@ -275,13 +275,9 @@ private void postFailureEvent(String addonId, @Nullable String msg) {
         eventPublisher.post(event);
     }
 
-    private AddonService getDefaultService() {
-        for (AddonService addonService : addonServices) {
-            if (addonService.getId().equals(DEFAULT_ADDON_SERVICE)) {
-                return addonService;
-            }
-        }
-        return addonServices.iterator().next();
+    private @Nullable AddonService getDefaultService() {
+        return addonServices.stream().filter(addonService -> DEFAULT_ADDON_SERVICE.equals(addonService.getId()))
+                .findFirst().orElse(addonServices.stream().findFirst().orElse(null));
     }
 
     private Stream<Addon> getAllAddons(Locale locale) {