Remove state description when loading an item with a removed pattern (#…

…4068) * Remove state description when loading an item with a removed pattern Fix openhab/openhab-webui#2251 Signed-off-by: Laurent Garnier <lg.hc@free.fr> * Extended integration test testSquareBracketsInFormat Signed-off-by: Laurent Garnier <lg.hc@free.fr> --------- Signed-off-by: Laurent Garnier <lg.hc@free.fr>
openhab · Jan 27, 2024 · a957122 · a957122
1 parent 5f8da67
commit a957122
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java b/...openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
@@ -255,6 +255,8 @@ private void processBindingConfigsFromModel(String modelName, EventType type) {
                 label = label.substring(0, label.indexOf("[")).trim();
                 stateDescriptionFragments.put(modelItem.getName(),
                         StateDescriptionFragmentBuilder.create().withPattern(format).build());
+            } else {
+                stateDescriptionFragments.remove(modelItem.getName());
             }
             activeItem.setLabel(label);
             activeItem.setCategory(modelItem.getIcon());

diff --git a/...tem.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java b/...tem.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.model.item.internal;
 
-import static java.util.stream.Collectors.*;
+import static java.util.stream.Collectors.joining;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -655,5 +655,28 @@ public void testSquareBracketsInFormat() {
         StateDescription stateDescription = item.getStateDescription();
         assertThat(stateDescription, is(notNullValue()));
         assertThat(stateDescription.getPattern(), is("XPATH(/*[name()='liveStreams']/*[name()='stream']):%s"));
+
+        model = "Switch s \"Info [%s]\"";
+        modelRepository.addOrRefreshModel(TESTMODEL_NAME, new ByteArrayInputStream(model.getBytes()));
+        item = itemRegistry.get("s");
+        assertThat(item, is(notNullValue()));
+        stateDescription = item.getStateDescription();
+        assertThat(stateDescription, is(notNullValue()));
+        assertThat(stateDescription.getPattern(), is("%s"));
+
+        model = "Switch s \"Info\"";
+        modelRepository.addOrRefreshModel(TESTMODEL_NAME, new ByteArrayInputStream(model.getBytes()));
+        item = itemRegistry.get("s");
+        assertThat(item, is(notNullValue()));
+        stateDescription = item.getStateDescription();
+        assertThat(stateDescription, is(nullValue()));
+
+        model = "Switch s \"Info [%s]\"";
+        modelRepository.addOrRefreshModel(TESTMODEL_NAME, new ByteArrayInputStream(model.getBytes()));
+        item = itemRegistry.get("s");
+        assertThat(item, is(notNullValue()));
+        stateDescription = item.getStateDescription();
+        assertThat(stateDescription, is(notNullValue()));
+        assertThat(stateDescription.getPattern(), is("%s"));
     }
 }