From 545c6fee4c26f40f184e2bd77ca2529fb823c944 Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Mon, 12 May 2025 18:41:23 +0300 Subject: [PATCH 1/2] Created a metrics model for TMF-related information --- .../osl/tmf/metrics/ActiveServiceOrders.java | 17 +++++++++++++ .../tmf/metrics/GroupByDayAggregations.java | 19 ++++++++++++++ .../org/etsi/osl/tmf/metrics/GroupByItem.java | 25 +++++++++++++++++++ .../tmf/metrics/GroupByStateAggregations.java | 19 ++++++++++++++ .../PublishedServiceSpecifications.java | 17 +++++++++++++ .../tmf/metrics/RegisteredIndividuals.java | 17 +++++++++++++ .../RegisteredResourceSpecifications.java | 17 +++++++++++++ .../org/etsi/osl/tmf/metrics/Resources.java | 8 ++++++ .../tmf/metrics/ResourcesGroupByState.java | 17 +++++++++++++ .../etsi/osl/tmf/metrics/ServiceOrders.java | 7 ++++++ .../osl/tmf/metrics/ServiceOrdersDay.java | 25 +++++++++++++++++++ .../tmf/metrics/ServiceOrdersGroupByDay.java | 17 +++++++++++++ .../metrics/ServiceOrdersGroupByState.java | 17 +++++++++++++ .../org/etsi/osl/tmf/metrics/Services.java | 25 +++++++++++++++++++ .../osl/tmf/metrics/ServicesGroupByState.java | 17 +++++++++++++ .../etsi/osl/tmf/metrics/TotalResources.java | 17 +++++++++++++ .../osl/tmf/metrics/TotalServiceOrders.java | 17 +++++++++++++ .../etsi/osl/tmf/metrics/TotalServices.java | 17 +++++++++++++ 18 files changed, 315 insertions(+) create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ActiveServiceOrders.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/PublishedServiceSpecifications.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/RegisteredIndividuals.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/RegisteredResourceSpecifications.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/Resources.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/Services.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByState.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/TotalResources.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/TotalServiceOrders.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/TotalServices.java diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ActiveServiceOrders.java b/src/main/java/org/etsi/osl/tmf/metrics/ActiveServiceOrders.java new file mode 100644 index 0000000..459afdd --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ActiveServiceOrders.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ActiveServiceOrders { + + @JsonProperty("activeServiceOrders") + private final int activeServiceOrders; + + public ActiveServiceOrders(int activeServiceOrders) { + this.activeServiceOrders = activeServiceOrders; + } + + public int getActiveServiceOrders() { + return activeServiceOrders; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java new file mode 100644 index 0000000..880b715 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java @@ -0,0 +1,19 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class GroupByDayAggregations { + + @JsonProperty("groupByDay") + private final List groupByDay; + + public GroupByDayAggregations(List groupByDay) { + this.groupByDay = groupByDay; + } + + public List getGroupByDay() { + return groupByDay; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java b/src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java new file mode 100644 index 0000000..6642747 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java @@ -0,0 +1,25 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GroupByItem { + + @JsonProperty("key") + private final String key; + + @JsonProperty("count") + private final int count; + + public GroupByItem(String key, int count) { + this.key = key; + this.count = count; + } + + public String getKey() { + return key; + } + + public int getCount() { + return count; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java new file mode 100644 index 0000000..c85ce93 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java @@ -0,0 +1,19 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class GroupByStateAggregations { + + @JsonProperty("groupByState") + private final List groupByState; + + public GroupByStateAggregations(List groupByState) { + this.groupByState = groupByState; + } + + public List getGroupByState() { + return groupByState; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/PublishedServiceSpecifications.java b/src/main/java/org/etsi/osl/tmf/metrics/PublishedServiceSpecifications.java new file mode 100644 index 0000000..60d104c --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/PublishedServiceSpecifications.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class PublishedServiceSpecifications { + + @JsonProperty("publishedServiceSpecifications") + private final int publishedServiceSpecifications; + + public PublishedServiceSpecifications(int publishedServiceSpecifications) { + this.publishedServiceSpecifications = publishedServiceSpecifications; + } + + public int getPublishedServiceSpecifications() { + return publishedServiceSpecifications; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/RegisteredIndividuals.java b/src/main/java/org/etsi/osl/tmf/metrics/RegisteredIndividuals.java new file mode 100644 index 0000000..156ca66 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/RegisteredIndividuals.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class RegisteredIndividuals { + + @JsonProperty("registeredIndividuals") + private final int registeredIndividuals; + + public RegisteredIndividuals(int registeredIndividuals) { + this.registeredIndividuals = registeredIndividuals; + } + + public int getRegisteredIndividuals() { + return registeredIndividuals; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/RegisteredResourceSpecifications.java b/src/main/java/org/etsi/osl/tmf/metrics/RegisteredResourceSpecifications.java new file mode 100644 index 0000000..f20f1d9 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/RegisteredResourceSpecifications.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class RegisteredResourceSpecifications { + + @JsonProperty("registeredResourceSpecifications") + private final int registeredResourceSpecifications; + + public RegisteredResourceSpecifications(int registeredResourceSpecifications) { + this.registeredResourceSpecifications = registeredResourceSpecifications; + } + + public int getRegisteredResourceSpecifications() { + return registeredResourceSpecifications; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/Resources.java b/src/main/java/org/etsi/osl/tmf/metrics/Resources.java new file mode 100644 index 0000000..ce26600 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/Resources.java @@ -0,0 +1,8 @@ +package org.etsi.osl.tmf.metrics; + +public class Resources extends Services{ + + public Resources(int total, GroupByStateAggregations aggregations) { + super(total, aggregations); + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java new file mode 100644 index 0000000..2c27f72 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ResourcesGroupByState { + + @JsonProperty("resources") + private final Resources resources; + + public ResourcesGroupByState(Resources resources) { + this.resources = resources; + } + + public Services getResources() { + return resources; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java new file mode 100644 index 0000000..7d883c8 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java @@ -0,0 +1,7 @@ +package org.etsi.osl.tmf.metrics; + +public class ServiceOrders extends Services{ + public ServiceOrders(int total, GroupByStateAggregations aggregations) { + super(total, aggregations); + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java new file mode 100644 index 0000000..206304f --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java @@ -0,0 +1,25 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ServiceOrdersDay { + + @JsonProperty("total") + private final int total; + + @JsonProperty("aggregations") + private final GroupByDayAggregations aggregations; + + public ServiceOrdersDay(int total, GroupByDayAggregations aggregations) { + this.total = total; + this.aggregations = aggregations; + } + + public int getTotal() { + return total; + } + + public GroupByDayAggregations getAggregations() { + return aggregations; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java new file mode 100644 index 0000000..54a2500 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ServiceOrdersGroupByDay { + + @JsonProperty("serviceOrders") + private final ServiceOrdersDay serviceOrders; + + public ServiceOrdersGroupByDay(ServiceOrdersDay serviceOrders) { + this.serviceOrders = serviceOrders; + } + + public ServiceOrdersDay getServiceOrders() { + return serviceOrders; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java new file mode 100644 index 0000000..9191c6a --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ServiceOrdersGroupByState { + + @JsonProperty("serviceOrders") + private final Services serviceOrders; + + public ServiceOrdersGroupByState(ServiceOrders serviceOrders) { + this.serviceOrders = serviceOrders; + } + + public Services getServiceOrders() { + return serviceOrders; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/Services.java b/src/main/java/org/etsi/osl/tmf/metrics/Services.java new file mode 100644 index 0000000..d926449 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/Services.java @@ -0,0 +1,25 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Services { + + @JsonProperty("total") + private final int total; + + @JsonProperty("aggregations") + private final GroupByStateAggregations aggregations; + + public Services(int total, GroupByStateAggregations aggregations) { + this.total = total; + this.aggregations = aggregations; + } + + public int getTotal() { + return total; + } + + public GroupByStateAggregations getAggregations() { + return aggregations; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByState.java b/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByState.java new file mode 100644 index 0000000..32abd7b --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByState.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ServicesGroupByState { + + @JsonProperty("services") + private final Services services; + + public ServicesGroupByState(Services services) { + this.services = services; + } + + public Services getServices() { + return services; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/TotalResources.java b/src/main/java/org/etsi/osl/tmf/metrics/TotalResources.java new file mode 100644 index 0000000..a1f5826 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/TotalResources.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TotalResources { + + @JsonProperty("totalResources") + private final int totalResources; + + public TotalResources(int totalResources) { + this.totalResources = totalResources; + } + + public int getTotalResources() { + return totalResources; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/TotalServiceOrders.java b/src/main/java/org/etsi/osl/tmf/metrics/TotalServiceOrders.java new file mode 100644 index 0000000..7fabda0 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/TotalServiceOrders.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TotalServiceOrders { + + @JsonProperty("totalServiceOrders") + private final int totalServiceOrders; + + public TotalServiceOrders(int totalServiceOrders) { + this.totalServiceOrders = totalServiceOrders; + } + + public int getTotalServiceOrders() { + return totalServiceOrders; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/TotalServices.java b/src/main/java/org/etsi/osl/tmf/metrics/TotalServices.java new file mode 100644 index 0000000..8d07c9e --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/TotalServices.java @@ -0,0 +1,17 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TotalServices { + + @JsonProperty("totalServices") + private final int totalServices; + + public TotalServices(int totalServices) { + this.totalServices = totalServices; + } + + public int getTotalServices() { + return totalServices; + } +} -- GitLab From 5dfb7046c91a6fa17886dac796b2d0fe68baa294 Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Wed, 14 May 2025 13:28:57 +0300 Subject: [PATCH 2/2] Restructured model to use enums for status type of Services, Resources and ServiceOrders --- .../tmf/metrics/GroupByDayAggregations.java | 19 ------------- .../tmf/metrics/GroupByStateAggregations.java | 19 ------------- .../org/etsi/osl/tmf/metrics/Resources.java | 23 +++++++++++++--- .../tmf/metrics/ResourcesGroupByState.java | 2 +- .../ResourcesGroupByStateAggregations.java | 19 +++++++++++++ .../metrics/ResourcesGroupByStateItem.java | 27 +++++++++++++++++++ .../etsi/osl/tmf/metrics/ServiceOrders.java | 7 ----- .../tmf/metrics/ServiceOrdersGroupByDay.java | 6 ++--- .../ServiceOrdersGroupByDayAggregations.java | 19 +++++++++++++ ....java => ServiceOrdersGroupByDayItem.java} | 5 ++-- ...ava => ServiceOrdersGroupByDayParent.java} | 8 +++--- .../metrics/ServiceOrdersGroupByState.java | 6 ++--- ...ServiceOrdersGroupByStateAggregations.java | 19 +++++++++++++ .../ServiceOrdersGroupByStateItem.java | 27 +++++++++++++++++++ .../ServiceOrdersGroupByStateParent.java | 25 +++++++++++++++++ .../org/etsi/osl/tmf/metrics/Services.java | 6 ++--- .../ServicesGroupByStateAggregations.java | 19 +++++++++++++ .../tmf/metrics/ServicesGroupByStateItem.java | 26 ++++++++++++++++++ 18 files changed, 218 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java delete mode 100644 src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateAggregations.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateItem.java delete mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayAggregations.java rename src/main/java/org/etsi/osl/tmf/metrics/{GroupByItem.java => ServiceOrdersGroupByDayItem.java} (69%) rename src/main/java/org/etsi/osl/tmf/metrics/{ServiceOrdersDay.java => ServiceOrdersGroupByDayParent.java} (55%) create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateAggregations.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateItem.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateParent.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateAggregations.java create mode 100644 src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateItem.java diff --git a/src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java deleted file mode 100644 index 880b715..0000000 --- a/src/main/java/org/etsi/osl/tmf/metrics/GroupByDayAggregations.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.etsi.osl.tmf.metrics; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; - -public class GroupByDayAggregations { - - @JsonProperty("groupByDay") - private final List groupByDay; - - public GroupByDayAggregations(List groupByDay) { - this.groupByDay = groupByDay; - } - - public List getGroupByDay() { - return groupByDay; - } -} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java deleted file mode 100644 index c85ce93..0000000 --- a/src/main/java/org/etsi/osl/tmf/metrics/GroupByStateAggregations.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.etsi.osl.tmf.metrics; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; - -public class GroupByStateAggregations { - - @JsonProperty("groupByState") - private final List groupByState; - - public GroupByStateAggregations(List groupByState) { - this.groupByState = groupByState; - } - - public List getGroupByState() { - return groupByState; - } -} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/Resources.java b/src/main/java/org/etsi/osl/tmf/metrics/Resources.java index ce26600..c8c2da4 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/Resources.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/Resources.java @@ -1,8 +1,25 @@ package org.etsi.osl.tmf.metrics; -public class Resources extends Services{ +import com.fasterxml.jackson.annotation.JsonProperty; - public Resources(int total, GroupByStateAggregations aggregations) { - super(total, aggregations); +public class Resources{ + + @JsonProperty("total") + private final int total; + + @JsonProperty("aggregations") + private final ResourcesGroupByStateAggregations aggregations; + + public Resources(int total, ResourcesGroupByStateAggregations aggregations) { + this.total = total; + this.aggregations = aggregations; + } + + public int getTotal() { + return total; + } + + public ResourcesGroupByStateAggregations getAggregations() { + return aggregations; } } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java index 2c27f72..c8a133c 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByState.java @@ -11,7 +11,7 @@ public class ResourcesGroupByState { this.resources = resources; } - public Services getResources() { + public Resources getResources() { return resources; } } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateAggregations.java new file mode 100644 index 0000000..e63134f --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateAggregations.java @@ -0,0 +1,19 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class ResourcesGroupByStateAggregations { + + @JsonProperty("groupByState") + private final List groupByState; + + public ResourcesGroupByStateAggregations(List groupByState) { + this.groupByState = groupByState; + } + + public List getGroupByState() { + return groupByState; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateItem.java b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateItem.java new file mode 100644 index 0000000..5cad74f --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ResourcesGroupByStateItem.java @@ -0,0 +1,27 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; +import org.etsi.osl.tmf.common.model.service.ServiceStateType; +import org.etsi.osl.tmf.ri639.model.ResourceStatusType; + +public class ResourcesGroupByStateItem { + + @JsonProperty("key") + private final ResourceStatusType key; + + @JsonProperty("count") + private final int count; + + public ResourcesGroupByStateItem(ResourceStatusType key, int count) { + this.key = key; + this.count = count; + } + + public String getKey() { + return key.name(); + } + + public int getCount() { + return count; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java deleted file mode 100644 index 7d883c8..0000000 --- a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrders.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.etsi.osl.tmf.metrics; - -public class ServiceOrders extends Services{ - public ServiceOrders(int total, GroupByStateAggregations aggregations) { - super(total, aggregations); - } -} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java index 54a2500..e8c6a71 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDay.java @@ -5,13 +5,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class ServiceOrdersGroupByDay { @JsonProperty("serviceOrders") - private final ServiceOrdersDay serviceOrders; + private final ServiceOrdersGroupByDayParent serviceOrders; - public ServiceOrdersGroupByDay(ServiceOrdersDay serviceOrders) { + public ServiceOrdersGroupByDay(ServiceOrdersGroupByDayParent serviceOrders) { this.serviceOrders = serviceOrders; } - public ServiceOrdersDay getServiceOrders() { + public ServiceOrdersGroupByDayParent getServiceOrders() { return serviceOrders; } } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayAggregations.java new file mode 100644 index 0000000..1e09939 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayAggregations.java @@ -0,0 +1,19 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class ServiceOrdersGroupByDayAggregations { + + @JsonProperty("groupByDay") + private final List groupByState; + + public ServiceOrdersGroupByDayAggregations(List groupByState) { + this.groupByState = groupByState; + } + + public List getGroupByState() { + return groupByState; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayItem.java similarity index 69% rename from src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java rename to src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayItem.java index 6642747..3c2a080 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/GroupByItem.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayItem.java @@ -1,8 +1,9 @@ package org.etsi.osl.tmf.metrics; import com.fasterxml.jackson.annotation.JsonProperty; +import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; -public class GroupByItem { +public class ServiceOrdersGroupByDayItem { @JsonProperty("key") private final String key; @@ -10,7 +11,7 @@ public class GroupByItem { @JsonProperty("count") private final int count; - public GroupByItem(String key, int count) { + public ServiceOrdersGroupByDayItem(String key, int count) { this.key = key; this.count = count; } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayParent.java similarity index 55% rename from src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java rename to src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayParent.java index 206304f..a7a9842 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersDay.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByDayParent.java @@ -2,15 +2,15 @@ package org.etsi.osl.tmf.metrics; import com.fasterxml.jackson.annotation.JsonProperty; -public class ServiceOrdersDay { +public class ServiceOrdersGroupByDayParent { @JsonProperty("total") private final int total; @JsonProperty("aggregations") - private final GroupByDayAggregations aggregations; + private final ServiceOrdersGroupByDayAggregations aggregations; - public ServiceOrdersDay(int total, GroupByDayAggregations aggregations) { + public ServiceOrdersGroupByDayParent(int total, ServiceOrdersGroupByDayAggregations aggregations) { this.total = total; this.aggregations = aggregations; } @@ -19,7 +19,7 @@ public class ServiceOrdersDay { return total; } - public GroupByDayAggregations getAggregations() { + public ServiceOrdersGroupByDayAggregations getAggregations() { return aggregations; } } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java index 9191c6a..f9d5bfc 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByState.java @@ -5,13 +5,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class ServiceOrdersGroupByState { @JsonProperty("serviceOrders") - private final Services serviceOrders; + private final ServiceOrdersGroupByStateParent serviceOrders; - public ServiceOrdersGroupByState(ServiceOrders serviceOrders) { + public ServiceOrdersGroupByState(ServiceOrdersGroupByStateParent serviceOrders) { this.serviceOrders = serviceOrders; } - public Services getServiceOrders() { + public ServiceOrdersGroupByStateParent getServiceOrders() { return serviceOrders; } } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateAggregations.java new file mode 100644 index 0000000..fa5d94f --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateAggregations.java @@ -0,0 +1,19 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class ServiceOrdersGroupByStateAggregations { + + @JsonProperty("groupByState") + private final List groupByState; + + public ServiceOrdersGroupByStateAggregations(List groupByState) { + this.groupByState = groupByState; + } + + public List getGroupByState() { + return groupByState; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateItem.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateItem.java new file mode 100644 index 0000000..390459e --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateItem.java @@ -0,0 +1,27 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; +import org.etsi.osl.tmf.common.model.service.ServiceStateType; +import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; + +public class ServiceOrdersGroupByStateItem { + + @JsonProperty("key") + private final ServiceOrderStateType key; + + @JsonProperty("count") + private final int count; + + public ServiceOrdersGroupByStateItem(ServiceOrderStateType key, int count) { + this.key = key; + this.count = count; + } + + public String getKey() { + return key.name(); + } + + public int getCount() { + return count; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateParent.java b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateParent.java new file mode 100644 index 0000000..dfa7110 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServiceOrdersGroupByStateParent.java @@ -0,0 +1,25 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class ServiceOrdersGroupByStateParent { + + @JsonProperty("total") + private final int total; + + @JsonProperty("aggregations") + private final ServiceOrdersGroupByStateAggregations aggregations; + + public ServiceOrdersGroupByStateParent(int total, ServiceOrdersGroupByStateAggregations aggregations) { + this.total = total; + this.aggregations = aggregations; + } + + public int getTotal() { + return total; + } + + public ServiceOrdersGroupByStateAggregations getAggregations() { + return aggregations; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/Services.java b/src/main/java/org/etsi/osl/tmf/metrics/Services.java index d926449..a8eb078 100644 --- a/src/main/java/org/etsi/osl/tmf/metrics/Services.java +++ b/src/main/java/org/etsi/osl/tmf/metrics/Services.java @@ -8,9 +8,9 @@ public class Services { private final int total; @JsonProperty("aggregations") - private final GroupByStateAggregations aggregations; + private final ServicesGroupByStateAggregations aggregations; - public Services(int total, GroupByStateAggregations aggregations) { + public Services(int total, ServicesGroupByStateAggregations aggregations) { this.total = total; this.aggregations = aggregations; } @@ -19,7 +19,7 @@ public class Services { return total; } - public GroupByStateAggregations getAggregations() { + public ServicesGroupByStateAggregations getAggregations() { return aggregations; } } diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateAggregations.java b/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateAggregations.java new file mode 100644 index 0000000..f882b05 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateAggregations.java @@ -0,0 +1,19 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class ServicesGroupByStateAggregations { + + @JsonProperty("groupByState") + private final List groupByState; + + public ServicesGroupByStateAggregations(List groupByState) { + this.groupByState = groupByState; + } + + public List getGroupByState() { + return groupByState; + } +} diff --git a/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateItem.java b/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateItem.java new file mode 100644 index 0000000..34e0e46 --- /dev/null +++ b/src/main/java/org/etsi/osl/tmf/metrics/ServicesGroupByStateItem.java @@ -0,0 +1,26 @@ +package org.etsi.osl.tmf.metrics; + +import com.fasterxml.jackson.annotation.JsonProperty; +import org.etsi.osl.tmf.common.model.service.ServiceStateType; + +public class ServicesGroupByStateItem { + + @JsonProperty("key") + private final ServiceStateType key; + + @JsonProperty("count") + private final int count; + + public ServicesGroupByStateItem(ServiceStateType key, int count) { + this.key = key; + this.count = count; + } + + public String getKey() { + return key.name(); + } + + public int getCount() { + return count; + } +} -- GitLab