rework 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,7 +52,6 @@
 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;
@@ -65,6 +64,7 @@
 import org.openhab.core.persistence.ModifiablePersistenceService;
 import org.openhab.core.persistence.PersistenceItemConfiguration;
 import org.openhab.core.persistence.PersistenceItemInfo;
+import org.openhab.core.persistence.PersistenceItemNotFoundException;
 import org.openhab.core.persistence.PersistenceManager;
 import org.openhab.core.persistence.PersistenceService;
 import org.openhab.core.persistence.PersistenceServiceProblem;
@@ -625,11 +625,15 @@ private List<PersistenceServiceDTO> getPersistenceServiceList(Locale locale) {
 
     private Response getServiceItemListDTO(@Nullable String serviceId, @Nullable String itemName) {
         // If serviceId is null, then use the default service
-        PersistenceService service;
         String effectiveServiceId = serviceId != null ? serviceId : persistenceServiceRegistry.getDefaultId();
-        service = effectiveServiceId != null ? persistenceServiceRegistry.get(effectiveServiceId) : null;
 
-        if (effectiveServiceId == null || service == null) {
+        if (effectiveServiceId == null) {
+            logger.debug("No default persistence service.");
+            return JSONResponse.createErrorResponse(Status.NOT_FOUND, "No default persistence service.");
+        }
+
+        PersistenceService service = persistenceServiceRegistry.get(effectiveServiceId);
+        if (service == null) {
             logger.debug("Persistence service not found '{}'.", effectiveServiceId);
             return JSONResponse.createErrorResponse(Status.NOT_FOUND,
                     "Persistence service not found: " + effectiveServiceId);
@@ -666,7 +670,7 @@ protected Set<PersistenceItemInfoDTO> createDTO(QueryablePersistenceService qSer
             String alias = itemToAlias.get(itemName);
             PersistenceItemInfo singleItemInfo = qService.getItemInfo(itemName, alias);
             if (singleItemInfo == null) {
-                throw new PersistenceItemNotFoundException(itemName, serviceId);
+                throw new PersistenceItemNotFoundException(serviceId, itemName, alias);
             }
             itemInfo = Set.of(singleItemInfo);
         } else {

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

@@ -44,7 +44,6 @@
 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;
@@ -54,6 +53,7 @@
 import org.openhab.core.persistence.HistoricItem;
 import org.openhab.core.persistence.ModifiablePersistenceService;
 import org.openhab.core.persistence.PersistenceItemInfo;
+import org.openhab.core.persistence.PersistenceItemNotFoundException;
 import org.openhab.core.persistence.PersistenceServiceRegistry;
 import org.openhab.core.persistence.dto.ItemHistoryDTO;
 import org.openhab.core.persistence.dto.ItemHistoryDTO.HistoryDataBean;

…ce/PersistenceItemNotFoundException.java …ce/PersistenceItemNotFoundException.javabundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/PersistenceItemNotFoundException.java renamed to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemNotFoundException.java bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/PersistenceItemNotFoundException.java renamed to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemNotFoundException.java

@@ -10,22 +10,28 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.core.io.rest.core.persistence;
+package org.openhab.core.persistence;
 
 import java.io.Serial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * This exception is thrown by the {@link PersistenceResource} if an item could not be found in a persistence service.
+ * This exception is thrown if an item cannot 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 + "'");
+    public PersistenceItemNotFoundException(String serviceId, String name) {
+        this(serviceId, name, null);
+    }
+
+    public PersistenceItemNotFoundException(String serviceId, String name, @Nullable String alias) {
+        super("Item '" + name + "' " + (alias != null ? "with alias '" + alias + "' " : "")
+                + "could not be found in persistence service '" + serviceId + "'");
     }
 
     @Serial