Fix issue parsing SingleMetric in the HawkularMetricData Topic listener.

hawkular · Feb 23, 2015 · 3dda95f · 3dda95f
1 parent 090f026
commit 3dda95f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java b/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
@@ -84,9 +84,9 @@ protected void onBasicMessage(MetricDataMessage msg) {
         // TODO: tenants?
         MetricData metricData = msg.getMetricData();
 
-        List<SingleMetric> metrics = metricData.getMetrics();
-        List<Data> alertData = new ArrayList<>(metrics.size());
-        for (SingleMetric m : metrics) {
+        List<SingleMetric> data = metricData.getData();
+        List<Data> alertData = new ArrayList<>(data.size());
+        for (SingleMetric m : data) {
             if (isNeeded(m.getSource())) {
                 alertData.add(new NumericData(m.getSource(), m.getTimestamp(), m.getValue()));
             }

diff --git a/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java b/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
@@ -54,7 +54,7 @@ public static class MetricData {
         @Expose
         String tenantId;
         @Expose
-        List<SingleMetric> metrics;
+        List<SingleMetric> data;
 
         public MetricData() {
         }
@@ -67,17 +67,17 @@ public void setTenantId(String tenantId) {
             this.tenantId = tenantId;
         }
 
-        public List<SingleMetric> getMetrics() {
-            return metrics;
+        public List<SingleMetric> getData() {
+            return data;
         }
 
-        public void setMetrics(List<SingleMetric> metrics) {
-            this.metrics = metrics;
+        public void setData(List<SingleMetric> data) {
+            this.data = data;
         }
 
         @Override
         public String toString() {
-            return "MetricData [tenantId=" + tenantId + ", metrics=" + metrics + "]";
+            return "MetricData [tenantId=" + tenantId + ", data=" + data + "]";
         }
     }