Fixed JsonKapuaPayload serialization

Signed-off-by: coduz <alberto.codutti@eurotech.com>
eclipse · Nov 21, 2019 · 4337573 · 4337573
1 parent e15f4e7
commit 4337573
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/...java/org/eclipse/kapua/app/api/resources/v1/resources/model/message/JsonKapuaPayload.java b/...java/org/eclipse/kapua/app/api/resources/v1/resources/model/message/JsonKapuaPayload.java
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources.model.message;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.message.KapuaPayload;
 import org.eclipse.kapua.message.xml.XmlAdaptedMetric;
 import org.eclipse.kapua.model.type.ObjectValueConverter;
@@ -25,8 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.swagger.annotations.ApiModelProperty;
-
 @XmlRootElement(name = "payload")
 @XmlAccessorType(XmlAccessType.PROPERTY)
 public class JsonKapuaPayload {
@@ -44,12 +43,12 @@ public JsonKapuaPayload(KapuaPayload payload) {
 
         setBody(payload.getBody());
 
-        payload.getMetrics().forEach((metricName, metricValue) -> {
-            XmlAdaptedMetric jsonMetric = new XmlAdaptedMetric();
+        payload.getMetrics().entrySet().stream().filter((metric) -> metric.getValue() != null).forEach((metric) -> {
 
-            jsonMetric.setName(metricName);
-            jsonMetric.setValueType(metricValue.getClass());
-            jsonMetric.setValue(ObjectValueConverter.toString(metricValue));
+            XmlAdaptedMetric jsonMetric = new XmlAdaptedMetric();
+            jsonMetric.setName(metric.getKey());
+            jsonMetric.setValueType(metric.getValue().getClass());
+            jsonMetric.setValue(ObjectValueConverter.toString(metric.getValue()));
 
             getMetrics().add(jsonMetric);
         });