Backport openapigen-swiftui to develop to narrow gap

Signed-off-by: Tim Müller-Seydlitz <timbms@gmail.com>

Author: timbms

OpenHABCore/Sources/OpenHABCore/Model/OpenHABPage.swift

@@ -27,15 +27,21 @@ public class OpenHABPage: NSObject, @unchecked Sendable {
         self.title = title
         self.link = link
         self.leaf = leaf
-        var tempWidgets = [OpenHABWidget]()
-        tempWidgets.flatten(widgets)
-        self.widgets = tempWidgets
-        for widget in self.widgets {
+        self.icon = icon
+        var flattened = [OpenHABWidget]()
+        flattened.flatten(widgets)
+        self.widgets = flattened
+        
+        decorateWithSendCommand(self.widgets)
+    }
+    
+    private func decorateWithSendCommand(_ widgets: [OpenHABWidget]) {
+        for widget in widgets {
             widget.sendCommand = { [weak self] item, command in
                 self?.sendCommand(item, commandToSend: command)
             }
+            decorateWithSendCommand(widget.widgets)
         }
-        self.icon = icon
     }
 
     private func sendCommand(_ item: OpenHABItem?, commandToSend command: String?) {

OpenHABCore/Sources/OpenHABCore/Util/BonjourService.swift

@@ -356,7 +356,7 @@ public final class BonjourService: NSObject, BonjourServiceProtocol, NetServiceB
         logger.info("Found service: \(service.name, privacy: .public) type: \(service.type, privacy: .public)")
 
         let alreadyExists = state.withLockUnchecked { state in
-            state.discoveredServices.contains(where: { $0 === service })
+            state.discoveredServices.contains { $0 === service }
         }
 
         if alreadyExists {

OpenHABCore/Tests/OpenHABCoreTests/CertificateStoreTests.swift

@@ -14,6 +14,12 @@ import Foundation
 import os.log
 import Testing
 
+// MARK: - Test Errors
+
+enum CertificateStoreTestError: Error {
+    case resourceNotFound(String)
+}
+
 @Suite("CertificateStore Tests", .serialized)
 struct CertificateStoreTests {
     // Helper to load the bundled test certificate data
@@ -148,9 +154,3 @@ struct CertificateStoreTests {
         try? FileManager.default.removeItem(at: tempPath)
     }
 }
-
-// MARK: - Test Errors
-
-enum CertificateStoreTestError: Error {
-    case resourceNotFound(String)
-}