From 679ebf292f7a2008760b995d502fbf5fd2f2264b Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Wed, 28 May 2025 13:40:03 +0300 Subject: [PATCH] Added safeguards for possibly null values in group by state TMF metrics endpoints --- .../osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java | 1 + .../osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java | 1 + .../tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java index 70feca73..02d26d51 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java @@ -37,6 +37,7 @@ public class ResourceMetricsRepoService { List rawResults = resourceRepository.groupByStateBetweenDates(starttime, endtime); return rawResults.stream() + .filter(row -> row[0] != null) .collect(Collectors.toMap( row -> row[0].toString(), row -> ((Number) row[1]).intValue() diff --git a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java index ef910dce..542ea87c 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java @@ -36,6 +36,7 @@ public class ServiceMetricsRepoService { List rawResults = serviceRepo.groupByStateBetweenDates(starttime, endtime); return rawResults.stream() + .filter(row -> row[0] != null) .collect(Collectors.toMap( row -> row[0].toString(), row -> ((Number) row[1]).intValue() diff --git a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java index 9bd49793..72730dd9 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java @@ -70,6 +70,7 @@ public class ServiceOrderMetricsRepoService { List rawResults = serviceOrderRepository.groupByStateBetweenDates(starttime, endtime); return rawResults.stream() + .filter(row -> row[0] != null) .collect(Collectors.toMap( row -> row[0].toString(), row -> ((Number) row[1]).intValue() -- GitLab