updated Metric.getSimplifiedValues() to Metric.getFormattedValues()

Author: lksfrnz

src/main/java/software/amazon/cloudwatchlogs/emf/model/Metric.java

@@ -16,11 +16,11 @@
 
 package software.amazon.cloudwatchlogs.emf.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import lombok.Getter;
 import software.amazon.cloudwatchlogs.emf.serializers.StorageResolutionFilter;
 import software.amazon.cloudwatchlogs.emf.serializers.StorageResolutionSerializer;
@@ -48,7 +48,13 @@ public abstract class Metric {
     @JsonSerialize(using = StorageResolutionSerializer.class)
     protected StorageResolution storageResolution;
 
-    @JsonIgnore @Getter protected Object values;
+    /** @return the values stored by this metric. */
+    abstract Object getValues();
+
+    /** @return a simplified representation of the values of this metric. */
+    protected Object getFormattedValues() {
+        return this.getValues();
+    }
 
     /**
      * Change the name of this metric. Should only be used within this package in MetricContext when
@@ -80,7 +86,4 @@ protected void setName(String name) {
      *     metric. If there are less than {@code size} values, null is returned.
      */
     protected abstract Metric getMetricValuesOverSize(int size);
-
-    /** @return a simplified representation of the values of this metric. */
-    protected abstract Object getSimplifiedValues();
 }

src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDefinitionBuilder.java

@@ -68,7 +68,7 @@ protected Metric getMetricValuesOverSize(int size) {
      *     one value
      */
     @Override
-    protected Object getSimplifiedValues() {
+    protected Object getFormattedValues() {
         return values.size() == 1 ? values.get(0) : values;
     }
 }

src/main/java/software/amazon/cloudwatchlogs/emf/model/RootNode.java

@@ -66,7 +66,7 @@ Map<String, Object> getTargetMembers() throws DimensionSetExceededException {
         targetMembers.putAll(getDimensions());
         for (MetricDirective metricDirective : aws.getCloudWatchMetrics()) {
             for (Metric metric : metricDirective.getMetrics().values()) {
-                targetMembers.put(metric.getName(), metric.getSimplifiedValues());
+                targetMembers.put(metric.getName(), metric.getFormattedValues());
             }
         }
         return targetMembers;