Fix metric valueType on JsonKapuaPayload

Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse · Oct 21, 2019 · 055e282 · 055e282
1 parent 9177c1d
commit 055e282
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ava/org/eclipse/kapua/app/api/resources/v1/resources/model/data/JsonDatastoreMessage.java b/...ava/org/eclipse/kapua/app/api/resources/v1/resources/model/data/JsonDatastoreMessage.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources.model.data;
 
-import org.eclipse.kapua.message.device.data.KapuaDataChannel;
 import org.eclipse.kapua.service.datastore.model.DatastoreMessage;
 import org.eclipse.kapua.service.datastore.model.Storable;
 import org.eclipse.kapua.service.datastore.model.StorableId;
@@ -52,7 +51,7 @@ public JsonDatastoreMessage(DatastoreMessage datastoreMessage) {
         setCapturedOn(datastoreMessage.getCapturedOn());
 
         setPosition(datastoreMessage.getPosition());
-        setChannel((KapuaDataChannel) datastoreMessage.getChannel());
+        setChannel(datastoreMessage.getChannel());
         setPayload(datastoreMessage.getPayload());
     }
 

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
@@ -48,7 +48,7 @@ public JsonKapuaPayload(KapuaPayload payload) {
             XmlAdaptedMetric jsonMetric = new XmlAdaptedMetric();
 
             jsonMetric.setName(metricName);
-            jsonMetric.setValueType(metricName.getClass());
+            jsonMetric.setValueType(metricValue.getClass());
             jsonMetric.setValue(ObjectValueConverter.toString(metricValue));
 
             getMetrics().add(jsonMetric);