PDS-4: AbstractEvent properties are not serialized

suite-brokers/src/main/java/com/odeyalo/sonata/suite/brokers/events/AbstractEvent.java

@@ -1,8 +1,12 @@
 package com.odeyalo.sonata.suite.brokers.events;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.Getter;
+
 import java.util.UUID;
 
-public abstract class AbstractEvent<T> implements SonataEvent {
+@Getter
+public abstract class AbstractEvent<T> implements SonataEvent, EventTypeProvider {
     protected String id;
     protected long creationTime;
     protected T body;
@@ -13,6 +17,7 @@ public AbstractEvent(T body) {
         this.body = body;
     }
 
+    @JsonCreator
     public AbstractEvent(String id, long creationTime, T body) {
         this.id = id;
         this.creationTime = creationTime;
@@ -28,8 +33,4 @@ public String id() {
     public long creationTime() {
         return creationTime;
     }
-
-    public T getBody() {
-        return body;
-    }
 }

suite-brokers/src/main/java/com/odeyalo/sonata/suite/brokers/events/EventTypeProvider.java

@@ -1,12 +1,14 @@
 package com.odeyalo.sonata.suite.brokers.events;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.jetbrains.annotations.NotNull;
 
 public interface EventTypeProvider {
     /**
      * @return unique type of this event that used as identifier
      */
     @NotNull
+    @JsonProperty("event_type")
     String getEventType();
 
 }

suite-brokers/src/main/java/com/odeyalo/sonata/suite/brokers/events/activity/player/TrackResumedEvent.java

@@ -2,24 +2,24 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.odeyalo.sonata.suite.brokers.events.AbstractEvent;
-import com.odeyalo.sonata.suite.brokers.events.activity.player.payload.TrackSeekPayload;
+import com.odeyalo.sonata.suite.brokers.events.activity.player.payload.TrackPlayedPayload;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import org.jetbrains.annotations.NotNull;
 
 @EqualsAndHashCode(callSuper = true)
 @Value
-public class TrackResumedEvent extends AbstractEvent<TrackPlayedEvent> {
+public class TrackResumedEvent extends AbstractEvent<TrackPlayedPayload> {
     public static final String EVENT_TYPE = "track_resumed";
 
-    public TrackResumedEvent(final TrackPlayedEvent body) {
+    public TrackResumedEvent(final TrackPlayedPayload body) {
         super(body);
     }
 
     @JsonCreator
     public TrackResumedEvent(final String id,
                              final long creationTime,
-                             final TrackPlayedEvent body) {
+                             final TrackPlayedPayload body) {
         super(id, creationTime, body);
     }
 

suite-brokers/src/main/java/com/odeyalo/sonata/suite/brokers/events/activity/player/payload/TrackPlayedPayload.java

@@ -20,7 +20,7 @@ public class TrackPlayedPayload {
     public TrackPlayedPayload(@NotNull final String userId,
                               @NotNull final String trackId,
                               final int position) {
-        Assert.isTrue(position > 0, "Position should be positive");
+        Assert.isTrue(position >= 0, "Position should be positive");
         this.userId = userId;
         this.trackId = trackId;
         this.position = position;