Code improvement

Signed-off-by: Florian Hotze <dev@florianhotze.com>

Author: florian-h05

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

@@ -619,8 +619,10 @@ private List<PersistenceServiceDTO> getPersistenceServiceList(Locale locale) {
         return dtoList;
     }
 
-    protected Set<PersistenceItemInfoDTO> getServiceItemList(QueryablePersistenceService service,
-            Map<String, String> aliases) {
+    protected Set<PersistenceItemInfoDTO> getServiceItemList(QueryablePersistenceService service) {
+        String serviceId = service.getId();
+        PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(serviceId);
+        Map<String, String> aliases = config != null ? config.getAliases() : Map.of();
         return service.getItemInfo().stream().map(info -> {
             String alias = aliases.get(info.getName());
             if (alias != null) {
@@ -656,9 +658,7 @@ private Response getServiceItemList(@Nullable String serviceId) {
 
         QueryablePersistenceService qService = (QueryablePersistenceService) service;
 
-        PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(effectiveServiceId);
-        Map<String, String> aliases = config != null ? config.getAliases() : Map.of();
-        Set<PersistenceItemInfoDTO> itemInfo = getServiceItemList(qService, aliases);
+        Set<PersistenceItemInfoDTO> itemInfo = getServiceItemList(qService);
         return JSONResponse.createResponse(Status.OK, itemInfo, "");
     }
 

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

@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import javax.ws.rs.core.HttpHeaders;
@@ -213,7 +212,7 @@ public void testGetPersistenceItemDataWithItemStateUndefined() throws ItemNotFou
 
     @Test
     public void testGetPersistenceServiceItems() {
-        Set<PersistenceItemInfoDTO> info = pResource.getServiceItemList(pServiceMock, Map.of());
+        Set<PersistenceItemInfoDTO> info = pResource.getServiceItemList(pServiceMock);
 
         assertEquals(1, info.size());
         PersistenceItemInfoDTO dto = info.iterator().next();
@@ -223,16 +222,6 @@ public void testGetPersistenceServiceItems() {
         assertNull(dto.latest);
     }
 
-    @Test
-    public void testGetPersistenceServiceItemsWithAlias() {
-        final String alias = "TestAlias";
-        Set<PersistenceItemInfoDTO> info = pResource.getServiceItemList(pServiceMock, Map.of(ITEM_NAME, alias));
-
-        assertEquals(1, info.size());
-        PersistenceItemInfoDTO dto = info.iterator().next();
-        assertEquals(alias, dto.name);
-    }
-
     @Test
     public void testGetPersistenceItemDataWithItemStateNull() throws ItemNotFoundException {
         when(itemRegistryMock.getItem("testItem")).thenReturn(itemMock);