aliases for getItemInfo, cleanup

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

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

@@ -16,10 +16,13 @@
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.Consumes;
@@ -105,6 +108,7 @@
  * @author Lyubomir Papazov - Change java.util.Date references to be of type java.time.ZonedDateTime
  * @author Markus Rathgeb - Migrated to JAX-RS Whiteboard Specification
  * @author Wouter Born - Migrated to OpenAPI annotations
+ * @author Mark Herwege - Implement aliases
  */
 @Component
 @JaxrsResource
@@ -551,26 +555,60 @@ private List<PersistenceServiceDTO> getPersistenceServiceList(Locale locale) {
     private Response getServiceItemList(@Nullable String serviceId) {
         // If serviceId is null, then use the default service
         PersistenceService service;
-        if (serviceId == null) {
-            service = persistenceServiceRegistry.getDefault();
-        } else {
-            service = persistenceServiceRegistry.get(serviceId);
+        String effectiveServiceId = serviceId != null ? serviceId : persistenceServiceRegistry.getDefaultId();
+        if (effectiveServiceId == null) {
+            logger.debug("Persistence service not found '{}'.", effectiveServiceId);
+            return JSONResponse.createErrorResponse(Status.BAD_REQUEST,
+                    "Persistence service not found: " + effectiveServiceId);
         }
+        service = persistenceServiceRegistry.get(effectiveServiceId);
 
         if (service == null) {
-            logger.debug("Persistence service not found '{}'.", serviceId);
-            return JSONResponse.createErrorResponse(Status.BAD_REQUEST, "Persistence service not found: " + serviceId);
+            logger.debug("Persistence service not found '{}'.", effectiveServiceId);
+            return JSONResponse.createErrorResponse(Status.BAD_REQUEST,
+                    "Persistence service not found: " + effectiveServiceId);
         }
 
         if (!(service instanceof QueryablePersistenceService)) {
-            logger.debug("Persistence service not queryable '{}'.", serviceId);
+            logger.debug("Persistence service not queryable '{}'.", effectiveServiceId);
             return JSONResponse.createErrorResponse(Status.BAD_REQUEST,
-                    "Persistence service not queryable: " + serviceId);
+                    "Persistence service not queryable: " + effectiveServiceId);
         }
 
         QueryablePersistenceService qService = (QueryablePersistenceService) service;
 
-        return JSONResponse.createResponse(Status.OK, qService.getItemInfo(), "");
+        PersistenceServiceConfiguration config = persistenceServiceConfigurationRegistry.get(effectiveServiceId);
+        Map<String, String> aliases = config != null ? config.getAliases() : Map.of();
+        Set<PersistenceItemInfo> itemInfo = qService.getItemInfo().stream().map(info -> {
+            String alias = aliases.get(info.getName());
+            if (alias != null) {
+                return new PersistenceItemInfo() {
+
+                    @Override
+                    public String getName() {
+                        return alias;
+                    }
+
+                    @Override
+                    public @Nullable Integer getCount() {
+                        return info.getCount();
+                    }
+
+                    @Override
+                    public @Nullable Date getEarliest() {
+                        return info.getEarliest();
+                    }
+
+                    @Override
+                    public @Nullable Date getLatest() {
+                        return info.getLatest();
+                    }
+                };
+            } else {
+                return info;
+            }
+        }).collect(Collectors.toSet());
+        return JSONResponse.createResponse(Status.OK, itemInfo, "");
     }
 
     private Response deletePersistenceItemData(@Nullable String serviceId, String itemName, @Nullable String timeBegin,

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

@@ -58,6 +58,7 @@
  * Tests for PersistenceItem Restresource
  *
  * @author Stefan Triller - Initial contribution
+ * @author Mark Herwege - Implement aliases
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)

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

@@ -35,8 +35,8 @@
  * a filter.
  *
  * @author Kai Kreuzer - Initial contribution
- * @author Lyubomir Papazov - Deprecate methods using java.util and add methods
- *         that use Java8's ZonedDateTime
+ * @author Lyubomir Papazov - Deprecate methods using java.util and add methods that use Java8's ZonedDateTime
+ * @author Mark Herwege - Copy constructor
  */
 @NonNullByDefault
 public class FilterCriteria {

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

@@ -25,6 +25,7 @@
  * and then periodically provide it to the server to be accommodated.
  *
  * @author Chris Jackson - Initial contribution
+ * @author Mark Herwege - Implement aliases
  */
 @NonNullByDefault
 public interface ModifiablePersistenceService extends QueryablePersistenceService {

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

@@ -25,7 +25,7 @@
  * This class holds the configuration of a persistence strategy for specific items.
  *
  * @author Markus Rathgeb - Initial contribution
- * @author Mark Herwege - extract alias configuration
+ * @author Mark Herwege - Extract alias configuration
  */
 @NonNullByDefault
 public record PersistenceItemConfiguration(List<PersistenceConfig> items, List<PersistenceStrategy> strategies,

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

@@ -27,6 +27,7 @@
  *
  * @author Kai Kreuzer - Initial contribution
  * @author Chris Jackson - Added getItems method
+ * @author Mark Herwege - Implement aliases
  */
 @NonNullByDefault
 public interface QueryablePersistenceService extends PersistenceService {
@@ -85,8 +86,9 @@ public String getName() {
      * {@link org.openhab.core.items.Item} in openHAB. If it is not possible to retrieve the information an empty set
      * should be returned.
      *
-     * Note that implementations of this method may return an alias for an existing item if the database does not store
-     * the mapping between item name and alias.
+     * Note that implementations for method callers that this method may return an alias for an existing item if the
+     * database does not store the mapping between item name and alias or the reverse mapping is not implemented in the
+     * persistence service.
      *
      * @return a set of information about the persisted items
      */

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/registry/PersistenceServiceConfiguration.java

@@ -26,6 +26,7 @@
  * The {@link PersistenceServiceConfiguration} represents the configuration for a persistence service.
  *
  * @author Jan N. Klug - Initial contribution
+ * @author Mark Herwege - Implement aliases
  */
 @NonNullByDefault
 public class PersistenceServiceConfiguration implements Identifiable<String> {

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/registry/PersistenceServiceConfigurationDTOMapper.java

@@ -46,6 +46,7 @@
  * The {@link PersistenceServiceConfigurationDTOMapper} is a utility class to map persistence configurations for storage
  *
  * @author Jan N. Klug - Initial contribution
+ * @author Mark Herwege - Implement aliases
  */
 @NonNullByDefault
 public class PersistenceServiceConfigurationDTOMapper {

bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/extensions/PersistenceExtensionsTest.java

@@ -66,6 +66,7 @@
  * @author Mark Herwege - lastChange and nextChange methods
  * @author Mark Herwege - handle persisted GroupItem with QuantityType
  * @author Mark Herwege - add median methods
+ * @author Mark Herwege - Implement aliases
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)

bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java

@@ -84,6 +84,7 @@
  * The {@link PersistenceManagerTest} contains tests for the {@link PersistenceManagerImpl}
  *
  * @author Jan N. Klug - Initial contribution
+ * @author Mark Herwege - Implement aliases
  */
 @NonNullByDefault
 @ExtendWith(MockitoExtension.class)

bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java

@@ -70,6 +70,7 @@
  * @author Holger Reichert - Support for themes, DPI, legend hiding
  * @author Christoph Weitkamp - Consider default persistence service
  * @author Jan N. Klug - Add y-axis label formatter
+ * @author Mark Herwege - Implement aliases
  */
 @NonNullByDefault
 @Component(immediate = true)