specific exception

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>

Author: mherwege

bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java

@@ -52,6 +52,7 @@
 import org.openhab.core.io.rest.RESTConstants;
 import org.openhab.core.io.rest.RESTResource;
 import org.openhab.core.io.rest.core.config.ConfigurationService;
+import org.openhab.core.io.rest.core.persistence.PersistenceItemNotFoundException;
 import org.openhab.core.items.Item;
 import org.openhab.core.items.ItemNotFoundException;
 import org.openhab.core.items.ItemRegistry;
@@ -459,7 +460,8 @@ private Response getItemHistoryDTO(@Nullable String serviceId, String itemName,
     protected @Nullable ItemHistoryDTO createDTO(QueryablePersistenceService qService, String itemName,
             @Nullable String timeBegin, @Nullable String timeEnd, int pageNumber, int pageLength, boolean boundary,
             boolean itemState) {
-        PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(qService.getId());
+        String serviceId = qService.getId();
+        PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(serviceId);
         String alias = config != null ? config.getAliases().get(itemName) : null;
 
         ZonedDateTime dateTimeBegin = ZonedDateTime.now();
@@ -643,7 +645,7 @@ private Response getServiceItemListDTO(@Nullable String serviceId, @Nullable Str
         Set<PersistenceItemInfoDTO> itemInfo = Set.of();
         try {
             itemInfo = createDTO(qService, itemName);
-        } catch (ItemNotFoundException e) {
+        } catch (PersistenceItemNotFoundException e) {
             return JSONResponse.createErrorResponse(Status.NOT_FOUND, e.getMessage());
         } catch (UnsupportedOperationException e) {
             return JSONResponse.createErrorResponse(Status.METHOD_NOT_ALLOWED,
@@ -654,7 +656,7 @@ private Response getServiceItemListDTO(@Nullable String serviceId, @Nullable Str
     }
 
     protected Set<PersistenceItemInfoDTO> createDTO(QueryablePersistenceService qService, @Nullable String itemName)
-            throws ItemNotFoundException, UnsupportedOperationException {
+            throws UnsupportedOperationException, PersistenceItemNotFoundException {
         String serviceId = qService.getId();
         PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(serviceId);
         Map<String, String> itemToAlias = config != null ? config.getAliases() : Map.of();
@@ -664,8 +666,7 @@ protected Set<PersistenceItemInfoDTO> createDTO(QueryablePersistenceService qSer
             String alias = itemToAlias.get(itemName);
             PersistenceItemInfo singleItemInfo = qService.getItemInfo(itemName, alias);
             if (singleItemInfo == null) {
-                throw new ItemNotFoundException(
-                        "Item '" + itemName + "' not found in persistence service: " + serviceId);
+                throw new PersistenceItemNotFoundException(itemName, serviceId);
             }
             itemInfo = Set.of(singleItemInfo);
         } else {

bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/PersistenceItemNotFoundException.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010-2026 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.io.rest.core.persistence;
+
+import java.io.Serial;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * This exception is thrown by the {@link PersistenceResource} if an item could not be found in a persistence service.
+ *
+ * @author Mark Herwege - Initial contribution
+ */
+@NonNullByDefault
+public class PersistenceItemNotFoundException extends Exception {
+
+    public PersistenceItemNotFoundException(String name, String serviceId) {
+        super("Item '" + name + "' could not be found in persistence service '" + serviceId + "'");
+    }
+
+    @Serial
+    private static final long serialVersionUID = 360588429692588595L;
+}

bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java

@@ -44,6 +44,7 @@
 import org.openhab.core.io.rest.LocaleService;
 import org.openhab.core.io.rest.core.config.ConfigurationService;
 import org.openhab.core.io.rest.core.internal.persistence.PersistenceResource.PersistenceItemInfoDTO;
+import org.openhab.core.io.rest.core.persistence.PersistenceItemNotFoundException;
 import org.openhab.core.items.Item;
 import org.openhab.core.items.ItemNotFoundException;
 import org.openhab.core.items.ItemRegistry;
@@ -126,9 +127,9 @@ public String getName() {
             });
         }
 
-        when(pServiceMock.query(any(), any())).thenReturn(items);
-
         when(persistenceServiceRegistryMock.get(PERSISTENCE_SERVICE_ID)).thenReturn(pServiceMock);
+        when(pServiceMock.getId()).thenReturn(PERSISTENCE_SERVICE_ID);
+        when(pServiceMock.query(any(), any())).thenReturn(items);
         when(timeZoneProviderMock.getTimeZone()).thenReturn(ZoneId.systemDefault());
     }
 
@@ -238,7 +239,7 @@ public void testGetPersistenceItemInfoNotImplemented() throws ItemNotFoundExcept
     }
 
     @Test
-    public void testGetPersistenceItemInfo() throws ItemNotFoundException, UnsupportedOperationException {
+    public void testGetPersistenceItemInfo() throws PersistenceItemNotFoundException, UnsupportedOperationException {
         when(pServiceMock.getItemInfo()).thenReturn(Set.of(new PersistenceItemInfo() {
 
             @Override
@@ -275,7 +276,7 @@ public String getName() {
 
     @Test
     public void testGetPersistenceItemInfoWithItemDefault()
-            throws ItemNotFoundException, UnsupportedOperationException, IOException {
+            throws PersistenceItemNotFoundException, UnsupportedOperationException, IOException {
         when(pServiceMock.getItemInfo(any(), any())).thenReturn(new PersistenceItemInfo() {
 
             @Override
@@ -312,7 +313,7 @@ public String getName() {
 
     @Test
     public void testGetPersistenceItemInfoWithItem()
-            throws ItemNotFoundException, UnsupportedOperationException, IOException {
+            throws PersistenceItemNotFoundException, UnsupportedOperationException, IOException {
         when(pServiceMock.getItemInfo(any(), any())).thenAnswer(invocation -> {
             String firstArg = invocation.getArgument(0);
             String secondArg = invocation.getArgument(1);
@@ -345,7 +346,7 @@ public String getName() {
         });
 
         // Testing when item does not exist and getItemInfo returns null
-        assertThrows(ItemNotFoundException.class, () -> pResource.createDTO(pServiceMock, "NotFoundTest"));
+        assertThrows(PersistenceItemNotFoundException.class, () -> pResource.createDTO(pServiceMock, "NotFoundTest"));
 
         // Test when specific implementation exists and no alias is used
         Set<PersistenceItemInfoDTO> dto = pResource.createDTO(pServiceMock, item);