Merge branch 'main' into sitemap_dynamic_icon

bom/compile/pom.xml

@@ -234,7 +234,7 @@
     <dependency>
       <groupId>com.hivemq</groupId>
       <artifactId>hivemq-mqtt-client</artifactId>
-      <version>1.2.2</version>
+      <version>1.3.3</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>

bom/runtime/pom.xml

@@ -17,7 +17,7 @@
 
   <properties>
     <californium.version>2.7.4</californium.version>
-    <cxf.version>3.6.1</cxf.version>
+    <cxf.version>3.6.2</cxf.version>
     <jackson.version>2.15.2</jackson.version>
     <jetty.version>9.4.52.v20230823</jetty.version>
     <pax.logging.version>2.2.3</pax.logging.version>
@@ -517,7 +517,7 @@
     <dependency>
       <groupId>com.hivemq</groupId>
       <artifactId>hivemq-mqtt-client</artifactId>
-      <version>1.2.2</version>
+      <version>1.3.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

bom/test-index/pom.xml

@@ -19,12 +19,12 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.2</version>
+      <version>5.10.0</version>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.9.2</version>
+      <version>1.10.0</version>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>

bom/test/pom.xml

@@ -16,8 +16,8 @@
   <name>openHAB Core :: BOM :: Test</name>
 
   <properties>
-    <cxf.version>3.6.1</cxf.version>
-    <junit.version>5.9.2</junit.version>
+    <cxf.version>3.6.2</cxf.version>
+    <junit.version>5.10.0</junit.version>
     <mockito.version>4.11.0</mockito.version>
   </properties>
 

bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java

@@ -50,6 +50,7 @@
  *
  * @author Kai Kreuzer - Initial contribution
  * @author Laurent Garnier - Added support for icon color
+ * @author Laurent Garnier - Support added for multiple AND conditions in labelcolor/valuecolor/visibility
  * @author Laurent Garnier - New widget icon parameter based on conditional rules
  */
 public class PageChangeListener implements EventSubscriber {
@@ -129,19 +130,19 @@ private Set<Item> getAllItems(EList<Widget> widgets) {
                 }
                 // now scan visibility rules
                 for (VisibilityRule rule : widget.getVisibility()) {
-                    addItemWithName(items, rule.getItem());
+                    addItemsFromConditions(items, rule.getConditions());
                 }
                 // now scan label color rules
                 for (ColorArray rule : widget.getLabelColor()) {
-                    addItemWithName(items, rule.getItem());
+                    addItemsFromConditions(items, rule.getConditions());
                 }
                 // now scan value color rules
                 for (ColorArray rule : widget.getValueColor()) {
-                    addItemWithName(items, rule.getItem());
+                    addItemsFromConditions(items, rule.getConditions());
                 }
-                // now scan value icon rules
+                // now scan icon color rules
                 for (ColorArray rule : widget.getIconColor()) {
-                    addItemWithName(items, rule.getItem());
+                    addItemsFromConditions(items, rule.getConditions());
                 }
             }
         }
@@ -256,10 +257,10 @@ private Item getItemForWidget(Widget w) {
     }
 
     private boolean definesVisibilityOrColorOrIcon(Widget w, String name) {
-        return w.getVisibility().stream().anyMatch(r -> name.equals(r.getItem()))
-                || w.getLabelColor().stream().anyMatch(r -> name.equals(r.getItem()))
-                || w.getValueColor().stream().anyMatch(r -> name.equals(r.getItem()))
-                || w.getIconColor().stream().anyMatch(r -> name.equals(r.getItem()))
+        return w.getVisibility().stream().anyMatch(r -> conditionsDependsOnItem(r.getConditions(), name))
+                || w.getLabelColor().stream().anyMatch(r -> conditionsDependsOnItem(r.getConditions(), name))
+                || w.getValueColor().stream().anyMatch(r -> conditionsDependsOnItem(r.getConditions(), name))
+                || w.getIconColor().stream().anyMatch(r -> conditionsDependsOnItem(r.getConditions(), name))
                 || w.getIconRules().stream().anyMatch(r -> conditionsDependsOnItem(r.getConditions(), name));
     }
 

bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java

@@ -137,6 +137,7 @@
  * @author Mark Herwege - Added pattern and unit fields
  * @author Laurent Garnier - Added support for new sitemap element Buttongrid
  * @author Laurent Garnier - Added icon field for mappings used for switch element
+ * @author Laurent Garnier - Support added for multiple AND conditions in labelcolor/valuecolor/visibility
  * @author Laurent Garnier - New widget icon parameter based on conditional rules
  */
 @Component(service = { RESTResource.class, EventSubscriber.class })
@@ -774,35 +775,15 @@ private Set<GenericItem> getAllItems(EList<Widget> widgets) {
     private Set<GenericItem> getItemsInVisibilityCond(EList<VisibilityRule> ruleList) {
         Set<GenericItem> items = new HashSet<>();
         for (VisibilityRule rule : ruleList) {
-            String itemName = rule.getItem();
-            if (itemName != null) {
-                try {
-                    Item item = itemUIRegistry.getItem(itemName);
-                    if (item instanceof GenericItem genericItem) {
-                        items.add(genericItem);
-                    }
-                } catch (ItemNotFoundException e) {
-                    // ignore
-                }
-            }
+            getItemsInConditions(rule.getConditions(), items);
         }
         return items;
     }
 
     private Set<GenericItem> getItemsInColorCond(EList<ColorArray> colorList) {
         Set<GenericItem> items = new HashSet<>();
-        for (ColorArray color : colorList) {
-            String itemName = color.getItem();
-            if (itemName != null) {
-                try {
-                    Item item = itemUIRegistry.getItem(itemName);
-                    if (item instanceof GenericItem genericItem) {
-                        items.add(genericItem);
-                    }
-                } catch (ItemNotFoundException e) {
-                    // ignore
-                }
-            }
+        for (ColorArray rule : colorList) {
+            getItemsInConditions(rule.getConditions(), items);
         }
         return items;
     }

bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java

@@ -262,6 +262,30 @@ public void whenLongPollingShouldObserveItemsFromValueColorConditions() {
                                                 // return
     }
 
+    @Test
+    public void whenLongPollingShouldObserveItemsFromIconColorConditions() {
+        ItemEvent itemEvent = mock(ItemEvent.class);
+        when(itemEvent.getItemName()).thenReturn(iconColorItem.getName());
+        new Thread(() -> {
+            try {
+                Thread.sleep(STATE_UPDATE_WAIT_TIME); // wait for the #getPageData call and listeners to attach to the
+                                                      // item
+                sitemapResource.receive(itemEvent);
+            } catch (InterruptedException e) {
+            }
+        }).start();
+
+        // non-null is sufficient here.
+        when(headersMock.getRequestHeader(HTTP_HEADER_X_ATMOSPHERE_TRANSPORT)).thenReturn(List.of());
+
+        Response response = sitemapResource.getPageData(headersMock, null, SITEMAP_MODEL_NAME, SITEMAP_NAME, null,
+                false);
+
+        PageDTO pageDTO = (PageDTO) response.getEntity();
+        assertThat(pageDTO.timeout, is(false)); // assert that the item state change did trigger the blocking method to
+                                                // return
+    }
+
     @Test
     public void whenLongPollingShouldObserveItemsFromIconConditions() {
         ItemEvent itemEvent = mock(ItemEvent.class);
@@ -407,28 +431,44 @@ private EList<Widget> initSitemapWidgets() {
 
         // add visibility rules to the mock widget:
         VisibilityRule visibilityRule = mock(VisibilityRule.class);
-        when(visibilityRule.getItem()).thenReturn(VISIBILITY_RULE_ITEM_NAME);
-        BasicEList<VisibilityRule> visibilityRules = new BasicEList<>(1);
+        Condition conditon = mock(Condition.class);
+        when(conditon.getItem()).thenReturn(VISIBILITY_RULE_ITEM_NAME);
+        EList<Condition> conditions = new BasicEList<>();
+        conditions.add(conditon);
+        when(visibilityRule.getConditions()).thenReturn(conditions);
+        EList<VisibilityRule> visibilityRules = new BasicEList<>(1);
         visibilityRules.add(visibilityRule);
         when(w1.getVisibility()).thenReturn(visibilityRules);
 
         // add label color conditions to the item:
         ColorArray labelColor = mock(ColorArray.class);
-        when(labelColor.getItem()).thenReturn(LABEL_COLOR_ITEM_NAME);
+        Condition conditon1 = mock(Condition.class);
+        when(conditon1.getItem()).thenReturn(LABEL_COLOR_ITEM_NAME);
+        EList<Condition> conditions1 = new BasicEList<>();
+        conditions1.add(conditon1);
+        when(labelColor.getConditions()).thenReturn(conditions1);
         EList<ColorArray> labelColors = new BasicEList<>();
         labelColors.add(labelColor);
         when(w1.getLabelColor()).thenReturn(labelColors);
 
         // add value color conditions to the item:
         ColorArray valueColor = mock(ColorArray.class);
-        when(valueColor.getItem()).thenReturn(VALUE_COLOR_ITEM_NAME);
+        Condition conditon2 = mock(Condition.class);
+        when(conditon2.getItem()).thenReturn(VALUE_COLOR_ITEM_NAME);
+        EList<Condition> conditions2 = new BasicEList<>();
+        conditions2.add(conditon2);
+        when(valueColor.getConditions()).thenReturn(conditions2);
         EList<ColorArray> valueColors = new BasicEList<>();
         valueColors.add(valueColor);
         when(w1.getValueColor()).thenReturn(valueColors);
 
         // add icon color conditions to the item:
         ColorArray iconColor = mock(ColorArray.class);
-        when(iconColor.getItem()).thenReturn(ICON_COLOR_ITEM_NAME);
+        Condition conditon3 = mock(Condition.class);
+        when(conditon3.getItem()).thenReturn(ICON_COLOR_ITEM_NAME);
+        EList<Condition> conditions3 = new BasicEList<>();
+        conditions3.add(conditon3);
+        when(iconColor.getConditions()).thenReturn(conditions3);
         EList<ColorArray> iconColors = new BasicEList<>();
         iconColors.add(iconColor);
         when(w1.getIconColor()).thenReturn(iconColors);

bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.security.RolesAllowed;
-import javax.inject.Singleton;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -92,7 +91,6 @@
 @Path(SseResource.PATH_EVENTS)
 @RolesAllowed({ Role.USER, Role.ADMIN })
 @Tag(name = SseResource.PATH_EVENTS)
-@Singleton
 @NonNullByDefault
 public class SseResource implements RESTResource, SsePublisher {
 

bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/jaas/ManagedUserBackingEngine.java

@@ -36,7 +36,7 @@
  */
 public class ManagedUserBackingEngine implements BackingEngine {
 
-    UserRegistry userRegistry;
+    private final UserRegistry userRegistry;
 
     public ManagedUserBackingEngine(UserRegistry userRegistry) {
         this.userRegistry = userRegistry;

bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/jaas/ManagedUserBackingEngineFactory.java

@@ -14,8 +14,6 @@
 
 import java.util.Map;
 
-import javax.inject.Singleton;
-
 import org.apache.karaf.jaas.modules.BackingEngine;
 import org.apache.karaf.jaas.modules.BackingEngineFactory;
 import org.openhab.core.auth.UserRegistry;
@@ -28,11 +26,10 @@
  *
  * @author Yannick Schaus - initial contribution
  */
-@Singleton
 @Component(service = BackingEngineFactory.class)
 public class ManagedUserBackingEngineFactory implements BackingEngineFactory {
 
-    UserRegistry userRegistry;
+    private final UserRegistry userRegistry;
 
     @Activate
     public ManagedUserBackingEngineFactory(@Reference UserRegistry userRegistry) {

bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/jaas/ManagedUserRealm.java

@@ -15,7 +15,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Singleton;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
 
@@ -30,7 +29,6 @@
  *
  * @author Yannick Schaus - initial contribution
  */
-@Singleton
 @Component(service = JaasRealm.class)
 @Service
 public class ManagedUserRealm implements JaasRealm {