diff options
| author |  alx | 2019-03-16 23:56:27 +0300 |
|---|---|---|
| committer | alx | 2019-03-16 23:56:27 +0300 |
| commit | 06105f76dbfa3b65e63ed06f9c4d5107bd49ed88 (patch) | |
| tree | 5702c01cec9688039d891f4a711878706101c1c5 /src/main/java/com/juick/server/api/activity/model/Activity.java | |
| parent | 3ea4cd1942fa4e763034da11c5fa429407b67829 (diff) | |
| parent | a49105285d0d7719d7f222a507af2d5ac5b4bdb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/com/juick/server/api/activity/model/Activity.java')
| -rw-r--r-- | src/main/java/com/juick/server/api/activity/model/Activity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/juick/server/api/activity/model/Activity.java b/src/main/java/com/juick/server/api/activity/model/Activity.java index ec126b88..2af14479 100644 --- a/src/main/java/com/juick/server/api/activity/model/Activity.java +++ b/src/main/java/com/juick/server/api/activity/model/Activity.java @@ -1,7 +1,11 @@ package com.juick.server.api.activity.model; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.juick.server.api.activity.helpers.ActivityIdDeserializer; + public abstract class Activity extends Context { + @JsonDeserialize(using = ActivityIdDeserializer.class) private String actor; private Object object; |