remove 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

@@ -64,7 +64,6 @@
 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;
@@ -646,31 +645,32 @@ private Response getServiceItemListDTO(@Nullable String serviceId, @Nullable Str
         }
 
         QueryablePersistenceService qService = (QueryablePersistenceService) service;
-        Set<PersistenceItemInfoDTO> itemInfo = Set.of();
         try {
-            itemInfo = createDTO(qService, itemName);
-        } catch (PersistenceItemNotFoundException e) {
-            return JSONResponse.createErrorResponse(Status.NOT_FOUND, e.getMessage());
+            Set<PersistenceItemInfoDTO> itemInfo = createDTO(qService, itemName);
+            if (itemInfo == null) {
+                return JSONResponse.createErrorResponse(Status.NOT_FOUND, "Item '" + itemName
+                        + "' could not be found in persistence service '" + effectiveServiceId + "'");
+            }
+
+            return JSONResponse.createResponse(Status.OK, itemInfo, "");
         } catch (UnsupportedOperationException e) {
             return JSONResponse.createErrorResponse(Status.METHOD_NOT_ALLOWED,
                     "Not supported for persistence service: " + effectiveServiceId);
         }
-
-        return JSONResponse.createResponse(Status.OK, itemInfo, "");
     }
 
-    protected Set<PersistenceItemInfoDTO> createDTO(QueryablePersistenceService qService, @Nullable String itemName)
-            throws UnsupportedOperationException, PersistenceItemNotFoundException {
+    protected @Nullable Set<PersistenceItemInfoDTO> createDTO(QueryablePersistenceService qService,
+            @Nullable String itemName) throws UnsupportedOperationException {
         String serviceId = qService.getId();
         PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(serviceId);
         Map<String, String> itemToAlias = config != null ? config.getAliases() : Map.of();
 
-        Set<PersistenceItemInfo> itemInfo = Set.of();
+        Set<PersistenceItemInfo> itemInfo;
         if (itemName != null) {
             String alias = itemToAlias.get(itemName);
             PersistenceItemInfo singleItemInfo = qService.getItemInfo(itemName, alias);
             if (singleItemInfo == null) {
-                throw new PersistenceItemNotFoundException(serviceId, itemName, alias);
+                return null;
             }
             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

@@ -52,7 +52,6 @@
 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;
@@ -137,6 +136,7 @@ public String getName() {
     public void testGetPersistenceItemData() {
         ItemHistoryDTO dto = pResource.createDTO(pServiceMock, "testItem", null, null, 1, 10, false, false);
 
+        assertNotNull(dto);
         assertThat(Integer.parseInt(dto.datapoints), is(5));
         assertThat(dto.data, hasSize(5));
 
@@ -168,6 +168,7 @@ public void testGetPersistenceItemData() {
     public void testGetPersistenceItemDataWithBoundery() {
         ItemHistoryDTO dto = pResource.createDTO(pServiceMock, "testItem", null, null, 1, 10, true, false);
 
+        assertNotNull(dto);
         assertThat(Integer.parseInt(dto.datapoints), is(7));
         assertThat(dto.data, hasSize(7));
     }
@@ -179,6 +180,7 @@ public void testGetPersistenceItemDataWithItemState() throws ItemNotFoundExcepti
 
         ItemHistoryDTO dto = pResource.createDTO(pServiceMock, "testItem", null, null, 1, 10, false, true);
 
+        assertNotNull(dto);
         assertThat(Integer.parseInt(dto.datapoints), is(6));
         assertThat(dto.data, hasSize(6));
         assertThat(dto.data.get(dto.data.size() - 1).state, is("0"));
@@ -191,6 +193,7 @@ public void testGetPersistenceItemDataWithItemStateUndefined() throws ItemNotFou
 
         ItemHistoryDTO dto = pResource.createDTO(pServiceMock, "testItem", null, null, 1, 10, false, true);
 
+        assertNotNull(dto);
         assertThat(Integer.parseInt(dto.datapoints), is(5));
         assertThat(dto.data, hasSize(5));
     }
@@ -202,6 +205,7 @@ public void testGetPersistenceItemDataWithItemStateNull() throws ItemNotFoundExc
 
         ItemHistoryDTO dto = pResource.createDTO(pServiceMock, "testItem", null, null, 1, 10, false, true);
 
+        assertNotNull(dto);
         assertThat(Integer.parseInt(dto.datapoints), is(5));
         assertThat(dto.data, hasSize(5));
     }
@@ -214,6 +218,7 @@ public void testGetPersistenceItemDataWithBoundaryAndItemStateButNoItemStateRequ
 
         ItemHistoryDTO dto = pResource.createDTO(pServiceMock, "testItem", null, null, 1, 10, true, true);
 
+        assertNotNull(dto);
         assertThat(Integer.parseInt(dto.datapoints), is(7));
         assertThat(dto.data, hasSize(7));
         assertThat(dto.data.get(dto.data.size() - 1).state, not("0"));
@@ -232,14 +237,14 @@ public void testPutPersistenceItemData() throws ItemNotFoundException {
     }
 
     @Test
-    public void testGetPersistenceItemInfoNotImplemented() throws ItemNotFoundException, UnsupportedOperationException {
+    public void testGetPersistenceItemInfoNotImplemented() throws UnsupportedOperationException {
         // Test method not supported
         when(pServiceMock.getItemInfo()).thenThrow(UnsupportedOperationException.class);
         assertThrows(UnsupportedOperationException.class, () -> pResource.createDTO(pServiceMock, null));
     }
 
     @Test
-    public void testGetPersistenceItemInfo() throws PersistenceItemNotFoundException, UnsupportedOperationException {
+    public void testGetPersistenceItemInfo() throws UnsupportedOperationException {
         when(pServiceMock.getItemInfo()).thenReturn(Set.of(new PersistenceItemInfo() {
 
             @Override
@@ -265,6 +270,7 @@ public String getName() {
 
         // Testing with a specific implementation
         Set<PersistenceItemInfoDTO> dto = pResource.createDTO(pServiceMock, null);
+        assertNotNull(dto);
         PersistenceItemInfoDTO itemInfo = dto.iterator().next();
         assertThat(itemInfo.name(), is(ITEM));
         assertThat(itemInfo.earliest(),
@@ -275,8 +281,7 @@ public String getName() {
     }
 
     @Test
-    public void testGetPersistenceItemInfoWithItemDefault()
-            throws PersistenceItemNotFoundException, UnsupportedOperationException {
+    public void testGetPersistenceItemInfoWithItemDefault() throws UnsupportedOperationException {
         when(pServiceMock.getItemInfo(any(), any())).thenReturn(new PersistenceItemInfo() {
 
             @Override
@@ -302,6 +307,7 @@ public String getName() {
 
         // This is testing the default behavior when no specific implementation exists in the service
         Set<PersistenceItemInfoDTO> dto = pResource.createDTO(pServiceMock, ITEM);
+        assertNotNull(dto);
         assertThat(dto.size(), is(1));
         PersistenceItemInfoDTO itemInfo = dto.iterator().next();
         assertThat(itemInfo.name(), is(ITEM));
@@ -312,8 +318,7 @@ public String getName() {
     }
 
     @Test
-    public void testGetPersistenceItemInfoWithItem()
-            throws PersistenceItemNotFoundException, UnsupportedOperationException {
+    public void testGetPersistenceItemInfoWithItem() throws UnsupportedOperationException {
         when(pServiceMock.getItemInfo(any(), any())).thenAnswer(invocation -> {
             String firstArg = invocation.getArgument(0);
             String secondArg = invocation.getArgument(1);
@@ -345,11 +350,13 @@ public String getName() {
             };
         });
 
-        // Testing when ITEM does not exist and getItemInfo returns null
-        assertThrows(PersistenceItemNotFoundException.class, () -> pResource.createDTO(pServiceMock, "NotFoundTest"));
+        // Testing when ITEM does not exist
+        Set<PersistenceItemInfoDTO> dto = pResource.createDTO(pServiceMock, "NotFoundTest");
+        assertNull(dto);
 
         // Test when specific implementation exists and no alias is used
-        Set<PersistenceItemInfoDTO> dto = pResource.createDTO(pServiceMock, ITEM);
+        dto = pResource.createDTO(pServiceMock, ITEM);
+        assertNotNull(dto);
         assertThat(dto.size(), is(1));
         PersistenceItemInfoDTO itemInfo = dto.iterator().next();
         assertThat(itemInfo.name(), is(ITEM));
@@ -363,6 +370,7 @@ public String getName() {
         when(persistenceServiceConfigurationRegistryMock.get(any())).thenReturn(persistenceServiceConfigurationMock);
         when(persistenceServiceConfigurationMock.getAliases()).thenReturn(Map.of(ITEM, "TestAlias"));
         dto = pResource.createDTO(pServiceMock, ITEM);
+        assertNotNull(dto);
         assertThat(dto.size(), is(1));
         itemInfo = dto.iterator().next();
         assertThat(itemInfo.name(), is("TestAlias"));