From ceb6e8e3dec5b3a1db412a98b41796620e83c2eb Mon Sep 17 00:00:00 2001
From: Nikos Kyriakoulis <kyriakoulis@ece.upatras.gr>
Date: Wed, 14 May 2025 12:10:07 +0300
Subject: [PATCH] Use new version of metrics model
---
.../org/etsi/osl/tmf/metrics/api/MetricsApiController.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApiController.java b/src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApiController.java
index 2e52478..70bd5a0 100644
--- a/src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApiController.java
@@ -11,7 +11,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import java.time.OffsetDateTime;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -56,12 +55,12 @@ public class MetricsApiController implements MetricsApi {
});
// Create aggregation items
- List<GroupByItem> groupByStateList = fullStateMap.entrySet().stream()
- .map(entry -> new GroupByItem(entry.getKey(), entry.getValue()))
+ List<ServicesGroupByStateItem> groupByStateList = fullStateMap.entrySet().stream()
+ .map(entry -> new ServicesGroupByStateItem(ServiceStateType.valueOf(entry.getKey()), entry.getValue()))
.toList();
// Build response structure using metrics models
- GroupByStateAggregations aggregations = new GroupByStateAggregations(groupByStateList);
+ ServicesGroupByStateAggregations aggregations = new ServicesGroupByStateAggregations(groupByStateList);
int total = fullStateMap.values().stream().mapToInt(Integer::intValue).sum();
Services services = new Services(total, aggregations);
ServicesGroupByState response = new ServicesGroupByState(services);
--
GitLab