jackson-databind WIP

1 files changed, 18 insertions, 11 deletions

diff --git a/juick-core/src/main/java/com/juick/Message.java b/juick-core/src/main/java/com/juick/Message.java
index c128b4f2..2b66e667 100644
--- a/juick-core/src/main/java/com/juick/Message.java
+++ b/juick-core/src/main/java/com/juick/Message.java
@@ -17,7 +17,10 @@
  */
 package com.juick;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -28,11 +31,12 @@ public class Message implements Comparable {
     private int MID = 0;
     
     private int RID = 0;
-    
+
+    @JsonProperty("replyto")
     public int ReplyTo = 0;
     private String Text = null;
     private User User = null;
-    public List<String> Tags = new ArrayList<>();
+    public List<Tag> Tags = new ArrayList<>();
     private Date date;
     public int TimeAgo = 0;
     public int Privacy = 1;
@@ -49,8 +53,8 @@ public class Message implements Comparable {
     public int Likes = 0;
     private boolean liked = false;
     public List<Message> childs = new ArrayList<>();
-    private Optional<PM> PM = Optional.empty();
-    private Optional<Recommendation> Recommendation = Optional.empty();
+    private PM PM;
+    private Recommendation Recommendation;
 
     public Message() {
     }
@@ -82,7 +86,8 @@ public class Message implements Comparable {
 
     public void parseTags(String strTags) {
         if (strTags != null) {
-            Tags.addAll(Arrays.asList(strTags.split(" ")));
+            List<String> tags = Arrays.asList(strTags.split(" "));
+            Tags.addAll(tags.stream().map(Tag::new).collect(Collectors.toList()));
         }
     }
 
@@ -156,8 +161,8 @@ public class Message implements Comparable {
     public String getTagsString() {
         String ret = "";
         if (!Tags.isEmpty()) {
-            for (String Tag : Tags) {
-                ret += " *" + Tag;
+            for (Tag Tag : Tags) {
+                ret += " *" + Tag.getName();
             }
             if (FriendsOnly) {
                 ret += " *friends";
@@ -178,6 +183,7 @@ public class Message implements Comparable {
         return ret;
     }
 
+    @JsonProperty("mid")
     public int getMID() {
         return MID;
     }
@@ -186,6 +192,7 @@ public class Message implements Comparable {
         this.MID = MID;
     }
 
+    @JsonProperty("rid")
     public int getRID() {
         return RID;
     }
@@ -219,19 +226,19 @@ public class Message implements Comparable {
         this.date = date;
     }
 
-    public Optional<com.juick.PM> getPM() {
+    public com.juick.PM getPM() {
         return PM;
     }
 
     public void setPM(com.juick.PM PM) {
-        this.PM = Optional.ofNullable(PM);
+        this.PM = PM;
     }
 
-    public Optional<Recommendation> getRecommendation() {
+    public Recommendation getRecommendation() {
         return Recommendation;
     }
     public void setRecommendation(Recommendation recommendation) {
-        this.Recommendation = Optional.ofNullable(recommendation);
+        this.Recommendation = recommendation;
     }
 
     public boolean isLiked() {