[HWKMETRICS-326] Unify metric request models.

hawkular · Nov 19, 2015 · b629553 · b629553
1 parent ae67e04
commit b629553
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 365 deletions.
diff --git a/api/diff.txt b/api/diff.txt
diff --git a/...i-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java b/...i-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
@@ -47,9 +47,9 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Availability;
 import org.hawkular.metrics.api.jaxrs.model.AvailabilityDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.param.BucketConfig;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Tags;
@@ -212,9 +212,10 @@ public Response addAvailabilityForMetric(
     @POST
     @Path("/data")
     public Response addAvailabilityData(
-            List<Availability> availabilities
+            List<MetricRequest<AvailabilityType, AvailabilityDataPoint>> availabilities
     ) {
-        Observable<Metric<AvailabilityType>> metrics = Availability.toObservable(tenantId, availabilities);
+        Observable<Metric<AvailabilityType>> metrics = MetricRequest.toObservable(tenantId, availabilities,
+                AVAILABILITY);
         try {
             metricsService.addDataPoints(AVAILABILITY, metrics).toBlocking().lastOrDefault(null);
             return Response.ok().build();

diff --git a/...cs-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java b/...cs-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
@@ -47,10 +47,10 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Counter;
 import org.hawkular.metrics.api.jaxrs.model.CounterDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.GaugeDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.param.BucketConfig;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Percentiles;
@@ -187,8 +187,8 @@ public Response deleteMetricTags(
 
     @POST
     @Path("/data")
-    public Response addData(List<Counter> counters) {
-        Observable<Metric<Long>> metrics = Counter.toObservable(tenantId, counters);
+    public Response addData(List<MetricRequest<Long, CounterDataPoint>> counters) {
+        Observable<Metric<Long>> metrics = MetricRequest.toObservable(tenantId, counters, COUNTER);
         try {
             metricsService.addDataPoints(COUNTER, metrics).toBlocking().lastOrDefault(null);
             return Response.ok().build();

diff --git a/...rics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java b/...rics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
@@ -48,9 +48,9 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Gauge;
 import org.hawkular.metrics.api.jaxrs.model.GaugeDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.param.BucketConfig;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Percentiles;
@@ -203,9 +203,9 @@ public Response addDataForMetric(
     @POST
     @Path("/data")
     public Response addGaugeData(
-            List<Gauge> gauges
+            List<MetricRequest<Double, GaugeDataPoint>> gauges
     ) {
-        Observable<Metric<Double>> metrics = Gauge.toObservable(tenantId, gauges);
+        Observable<Metric<Double>> metrics = MetricRequest.toObservable(tenantId, gauges, GAUGE);
         try {
             metricsService.addDataPoints(GAUGE, metrics).toBlocking().lastOrDefault(null);
             return Response.ok().build();

diff --git a/...ics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/...ics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -42,10 +42,8 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Availability;
-import org.hawkular.metrics.api.jaxrs.model.Counter;
-import org.hawkular.metrics.api.jaxrs.model.Gauge;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.model.MixedMetricsRequest;
 import org.hawkular.metrics.api.jaxrs.param.Tags;
 import org.hawkular.metrics.api.jaxrs.util.ApiUtils;
@@ -138,10 +136,11 @@ public Response addMetricsData(
             return emptyPayload();
         }
 
-        Observable<Metric<Double>> gauges = Gauge.toObservable(tenantId, metricsRequest.getGauges());
-        Observable<Metric<AvailabilityType>> availabilities = Availability.toObservable(tenantId,
-                metricsRequest.getAvailabilities());
-        Observable<Metric<Long>> counters = Counter.toObservable(tenantId, metricsRequest.getCounters());
+        Observable<Metric<Double>> gauges = MetricRequest.toObservable(tenantId, metricsRequest.getGauges(), GAUGE);
+        Observable<Metric<AvailabilityType>> availabilities = MetricRequest.toObservable(tenantId,
+                metricsRequest.getAvailabilities(), AVAILABILITY);
+        Observable<Metric<Long>> counters = MetricRequest.toObservable(tenantId, metricsRequest.getCounters(),
+                COUNTER);
 
         try {
             metricsService.addDataPoints(GAUGE, gauges)

diff --git a/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java b/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
@@ -51,9 +51,9 @@
 import org.hawkular.metrics.api.jaxrs.handler.observer.MetricCreatedObserver;
 import org.hawkular.metrics.api.jaxrs.handler.observer.ResultSetObserver;
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Availability;
 import org.hawkular.metrics.api.jaxrs.model.AvailabilityDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.param.BucketConfig;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Tags;
@@ -66,6 +66,8 @@
 import org.hawkular.metrics.core.api.MetricType;
 import org.hawkular.metrics.core.api.MetricsService;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -246,9 +248,11 @@ public void addAvailabilityForMetric(
     public void addAvailabilityData(
             @Suspended final AsyncResponse asyncResponse,
             @ApiParam(value = "List of availability metrics", required = true)
-            List<Availability> availabilities
+ @JsonDeserialize()
+            List<MetricRequest<AvailabilityType, AvailabilityDataPoint>> availabilities
     ) {
-        Observable<Metric<AvailabilityType>> metrics = Availability.toObservable(tenantId, availabilities);
+        Observable<Metric<AvailabilityType>> metrics = MetricRequest.toObservable(tenantId, availabilities,
+                AVAILABILITY);
         Observable<Void> observable = metricsService.addDataPoints(AVAILABILITY, metrics);
         observable.subscribe(new ResultSetObserver(asyncResponse));
     }

diff --git a/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java b/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
@@ -52,10 +52,10 @@
 import org.hawkular.metrics.api.jaxrs.handler.observer.MetricCreatedObserver;
 import org.hawkular.metrics.api.jaxrs.handler.observer.ResultSetObserver;
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Counter;
 import org.hawkular.metrics.api.jaxrs.model.CounterDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.GaugeDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.param.BucketConfig;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Percentiles;
@@ -230,9 +230,10 @@ public void deleteMetricTags(
                     response = ApiError.class)
     })
     public void addData(@Suspended final AsyncResponse asyncResponse,
-                        @ApiParam(value = "List of metrics", required = true) List<Counter> counters
+                        @ApiParam(value = "List of metrics", required = true)
+                        List<MetricRequest<Long, CounterDataPoint>> counters
     ) {
-        Observable<Metric<Long>> metrics = Counter.toObservable(tenantId, counters);
+        Observable<Metric<Long>> metrics = MetricRequest.toObservable(tenantId, counters, COUNTER);
         Observable<Void> observable = metricsService.addDataPoints(COUNTER, metrics);
         observable.subscribe(new ResultSetObserver(asyncResponse));
     }

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
@@ -51,9 +51,9 @@
 import org.hawkular.metrics.api.jaxrs.handler.observer.MetricCreatedObserver;
 import org.hawkular.metrics.api.jaxrs.handler.observer.ResultSetObserver;
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Gauge;
 import org.hawkular.metrics.api.jaxrs.model.GaugeDataPoint;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.param.BucketConfig;
 import org.hawkular.metrics.api.jaxrs.param.Duration;
 import org.hawkular.metrics.api.jaxrs.param.Percentiles;
@@ -250,9 +250,9 @@ public void addDataForMetric(
     })
     public void addGaugeData(
             @Suspended final AsyncResponse asyncResponse,
-            @ApiParam(value = "List of metrics", required = true) List<Gauge> gauges
+            @ApiParam(value = "List of metrics", required = true) List<MetricRequest<Double, GaugeDataPoint>> gauges
     ) {
-        Observable<Metric<Double>> metrics = Gauge.toObservable(tenantId, gauges);
+        Observable<Metric<Double>> metrics = MetricRequest.toObservable(tenantId, gauges, GAUGE);
         Observable<Void> observable = metricsService.addDataPoints(GAUGE, metrics);
         observable.subscribe(new ResultSetObserver(asyncResponse));
     }

diff --git a/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -45,10 +45,8 @@
 
 import org.hawkular.metrics.api.jaxrs.handler.observer.MetricCreatedObserver;
 import org.hawkular.metrics.api.jaxrs.model.ApiError;
-import org.hawkular.metrics.api.jaxrs.model.Availability;
-import org.hawkular.metrics.api.jaxrs.model.Counter;
-import org.hawkular.metrics.api.jaxrs.model.Gauge;
 import org.hawkular.metrics.api.jaxrs.model.MetricDefinition;
+import org.hawkular.metrics.api.jaxrs.model.MetricRequest;
 import org.hawkular.metrics.api.jaxrs.model.MixedMetricsRequest;
 import org.hawkular.metrics.api.jaxrs.param.Tags;
 import org.hawkular.metrics.api.jaxrs.util.ApiUtils;
@@ -171,10 +169,11 @@ public void addMetricsData(
             return;
         }
 
-        Observable<Metric<Double>> gauges = Gauge.toObservable(tenantId, metricsRequest.getGauges());
-        Observable<Metric<AvailabilityType>> availabilities = Availability.toObservable(tenantId,
-                metricsRequest.getAvailabilities());
-        Observable<Metric<Long>> counters = Counter.toObservable(tenantId, metricsRequest.getCounters());
+        Observable<Metric<Double>> gauges = MetricRequest.toObservable(tenantId, metricsRequest.getGauges(), GAUGE);
+        Observable<Metric<AvailabilityType>> availabilities = MetricRequest.toObservable(tenantId,
+                metricsRequest.getAvailabilities(), AVAILABILITY);
+        Observable<Metric<Long>> counters = MetricRequest.toObservable(tenantId, metricsRequest.getCounters(),
+                COUNTER);
 
         metricsService.addDataPoints(GAUGE, gauges)
                 .mergeWith(metricsService.addDataPoints(AVAILABILITY, availabilities))

diff --git a/api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java b/api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java