From 9d5f1667361f53b39d91cae5a5729279b6e31dce Mon Sep 17 00:00:00 2001 From: Giannis Neokleous Date: Sat, 17 Dec 2016 18:55:32 -0500 Subject: [PATCH] Fix broken event deserializer - The ChatAlyticsEventDeserializer was broken because a ChatAlyticsEvent doesn't receive a Serializable anymore --- .../java/com/chatalytics/core/model/data/ChatAlyticsEvent.java | 3 --- .../core/realtime/json/ChatAlyticsEventDeserializer.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/main/java/com/chatalytics/core/model/data/ChatAlyticsEvent.java b/core/src/main/java/com/chatalytics/core/model/data/ChatAlyticsEvent.java index e9345af..d3d5a1d 100644 --- a/core/src/main/java/com/chatalytics/core/model/data/ChatAlyticsEvent.java +++ b/core/src/main/java/com/chatalytics/core/model/data/ChatAlyticsEvent.java @@ -1,7 +1,5 @@ package com.chatalytics.core.model.data; -import com.fasterxml.jackson.annotation.JsonIgnore; - import org.joda.time.DateTime; import lombok.Data; @@ -22,6 +20,5 @@ public ChatAlyticsEvent(DateTime eventTime, String type, Object event) { } @Setter // null out clazz when it leaves the service - @JsonIgnore private Class clazz; } diff --git a/core/src/main/java/com/chatalytics/core/realtime/json/ChatAlyticsEventDeserializer.java b/core/src/main/java/com/chatalytics/core/realtime/json/ChatAlyticsEventDeserializer.java index 0236a60..ce9a02d 100644 --- a/core/src/main/java/com/chatalytics/core/realtime/json/ChatAlyticsEventDeserializer.java +++ b/core/src/main/java/com/chatalytics/core/realtime/json/ChatAlyticsEventDeserializer.java @@ -11,7 +11,6 @@ import org.joda.time.DateTime; import java.io.IOException; -import java.io.Serializable; /** * Deserializer specific to {@link ChatAlyticsEvent}s. This exists because it understands how to @@ -43,7 +42,7 @@ public ChatAlyticsEvent deserialize(JsonParser jp, DeserializationContext ctxt) } JsonParser eventParser = node.get("event").traverse(); - Serializable event = (Serializable) oc.readValue(eventParser, clazz); + Object event = oc.readValue(eventParser, clazz); return new ChatAlyticsEvent(eventTime, type, event); }