Fix mapdb after core change (openhab#18285)

Signed-off-by: Mark Herwege <[email protected]>

Author: mherwege

bundles/org.openhab.persistence.mapdb/src/main/java/org/openhab/persistence/mapdb/internal/MapDbPersistenceService.java

@@ -211,13 +211,17 @@ public Iterable<HistoricItem> query(FilterCriteria filter) {
     }
 
     @Override
-    public @Nullable PersistedItem persistedItem(String itemName) {
-        String json = map.get(itemName);
+    public @Nullable PersistedItem persistedItem(String itemName, @Nullable String alias) {
+        String json = map.get(alias != null ? alias : itemName);
         if (json == null) {
             return null;
         }
         Optional<MapDbItem> item = deserialize(json);
-        return item.orElse(null);
+        MapDbItem dbItem = item.orElse(null);
+        if (dbItem != null) {
+            dbItem.setName(itemName);
+        }
+        return dbItem;
     }
 
     private String serialize(MapDbItem item) {

itests/org.openhab.persistence.mapdb.tests/src/main/java/org/openhab/persistence/mapdb/MapDbPersistenceServiceOSGiTest.java

@@ -135,6 +135,8 @@ public void queryShouldFindStoredItemsByAlias() {
         assertThat(persistenceService.query(filterByName), is(emptyIterable()));
         waitForAssert(() -> assertThat(persistenceService.query(filterByAlias),
                 contains(allOf(hasProperty("name", equalTo(alias)), hasProperty("state", equalTo(state))))));
+        waitForAssert(() -> assertThat(persistenceService.query(filterByName, alias),
+                contains(allOf(hasProperty("name", equalTo(name)), hasProperty("state", equalTo(state))))));
     }
 
     @Test
@@ -148,11 +150,11 @@ public void persistedItemShouldFindItem() {
         GenericItem item = new DimmerItem(name);
         item.setState(state, lastState, lastStateUpdate, lastStateChange);
 
-        assertNull(persistenceService.persistedItem(name));
+        assertNull(persistenceService.persistedItem(name, null));
 
         persistenceService.store(item);
 
-        waitForAssert(() -> assertThat(persistenceService.persistedItem(name),
+        waitForAssert(() -> assertThat(persistenceService.persistedItem(name, null),
                 allOf(hasProperty("name", equalTo(name)), hasProperty("state", equalTo(state)),
                         hasProperty("lastState", equalTo(lastState)),
                         hasProperty("timestamp", any(ZonedDateTime.class)),