fix alias handling

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

@@ -445,11 +445,8 @@ private Response getItemHistoryDTO(@Nullable String serviceId, String itemName,
 
         QueryablePersistenceService qService = (QueryablePersistenceService) service;
 
-        PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(effectiveServiceId);
-        String alias = config != null ? config.getAliases().get(itemName) : null;
-        alias = alias != null ? alias : itemName;
         @Nullable
-        ItemHistoryDTO dto = createDTO(qService, alias, timeBegin, timeEnd, pageNumber, pageLength, boundary,
+        ItemHistoryDTO dto = createDTO(qService, itemName, timeBegin, timeEnd, pageNumber, pageLength, boundary,
                 itemState);
         if (dto == null) {
             return JSONResponse.createErrorResponse(Status.NOT_FOUND, "Item not found: " + itemName);
@@ -462,6 +459,9 @@ 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 alias = config != null ? config.getAliases().get(itemName) : null;
+
         ZonedDateTime dateTimeBegin = ZonedDateTime.now();
         ZonedDateTime dateTimeEnd = dateTimeBegin;
         if (timeBegin != null) {
@@ -507,7 +507,7 @@ private Response getItemHistoryDTO(@Nullable String serviceId, String itemName,
             filterBeforeStart.setEndDate(dateTimeBegin);
             filterBeforeStart.setPageSize(1);
             filterBeforeStart.setOrdering(Ordering.DESCENDING);
-            result = qService.query(filterBeforeStart, itemName);
+            result = qService.query(filterBeforeStart, alias);
             if (result.iterator().hasNext()) {
                 dto.addData(dateTimeBegin.toInstant().toEpochMilli(), result.iterator().next().getState());
                 quantity++;
@@ -526,7 +526,7 @@ private Response getItemHistoryDTO(@Nullable String serviceId, String itemName,
         filter.setBeginDate(dateTimeBegin);
         filter.setEndDate(dateTimeEnd);
         filter.setOrdering(Ordering.ASCENDING);
-        result = qService.query(filter, itemName);
+        result = qService.query(filter, alias);
         Iterator<HistoricItem> it = result.iterator();
 
         // Iterate through the data
@@ -558,7 +558,7 @@ private Response getItemHistoryDTO(@Nullable String serviceId, String itemName,
             filterAfterEnd.setBeginDate(dateTimeEnd);
             filterAfterEnd.setPageSize(1);
             filterAfterEnd.setOrdering(Ordering.ASCENDING);
-            result = qService.query(filterAfterEnd, itemName);
+            result = qService.query(filterAfterEnd, alias);
             if (result.iterator().hasNext()) {
                 dto.addData(dateTimeEnd.toInstant().toEpochMilli(), result.iterator().next().getState());
                 quantity++;

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java

@@ -112,7 +112,7 @@ default Set<PersistenceItemInfo> getItemInfo() throws UnsupportedOperationExcept
      * item is not found in the persistence service. If it is not possible to retrieve the information or it would be
      * too expensive to do so an {@link UnsupportedOperationException} should be thrown.
      * The default implementation will query the persistence service for the last value in the persistence store and
-     * set the latest timestamp, leaving the {@link PersistenceItemInfo} count to null.
+     * set the latest timestamp, leaving the {@link PersistenceItemInfo} earliest timestamp and count equal to null.
      *
      * Note that the method should return the alias for the item in its response if an alias is being used.
      *