Commit 9757982f authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '75-check-group-by-state-tmf-metrics-endpoints-for-null-values' into 'develop' 

Added safeguards for possibly null values in group by state TMF metrics endpoints

See merge request !71
parents c362dae5 679ebf29

src/main/java/org/etsi/osl/tmf/metrics/reposervices/ResourceMetricsRepoService.java

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class ResourceMetricsRepoService { 
        List<Object[]> 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()

src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceMetricsRepoService.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class ServiceMetricsRepoService { 
        List<Object[]> 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()

src/main/java/org/etsi/osl/tmf/metrics/reposervices/ServiceOrderMetricsRepoService.java

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class ServiceOrderMetricsRepoService { 
        List<Object[]> 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()