X-Git-Url: https://git.hedgecode.org/?p=snooker-score-api.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fsnooker%2Fjson%2FJsonMatch.java;h=cda1b8629e6e16bfab79f1d249dc40f5e944d60d;hp=22248dd58965cc0d6dbcf281faf6df58efddc6de;hb=a9650805d204dba01a81100f2b9aa5d5f5f1a86e;hpb=10584f4eb4a18ecd3ad12f880c9d720d93a69e8a

diff --git a/src/main/java/org/hedgecode/snooker/json/JsonMatch.java b/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
index 22248dd..cda1b86 100644
--- a/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
+++ b/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
@@ -21,6 +21,8 @@ import java.util.Date;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
+import org.hedgecode.snooker.annotation.IsURL;
+import org.hedgecode.snooker.annotation.WithHTMLTags;
 import org.hedgecode.snooker.api.Event;
 import org.hedgecode.snooker.api.Match;
 import org.hedgecode.snooker.api.Player;
@@ -68,8 +70,10 @@ public class JsonMatch extends JsonIdEntity implements Match {
     private boolean onBreak;
     @SerializedName("WorldSnookerID")
     private int worldSnookerId;
+    @IsURL
     @SerializedName("LiveUrl")
     private String liveUrl;
+    @IsURL
     @SerializedName("DetailsUrl")
     private String detailsUrl;
     @SerializedName("PointsDropped")
@@ -82,8 +86,9 @@ public class JsonMatch extends JsonIdEntity implements Match {
     private int type;
     @SerializedName("TableNo")
     private int tableNo;
+    @IsURL
     @SerializedName("VideoURL")
-    private String videoURL;
+    private String videoUrl;
     @SerializedName("InitDate")
     private Date initDate;
     @SerializedName("ModDate")
@@ -94,14 +99,18 @@ public class JsonMatch extends JsonIdEntity implements Match {
     private Date endDate;
     @SerializedName("ScheduledDate")
     private Date scheduledDate;
+    @WithHTMLTags
     @SerializedName("FrameScores")
     private String frameScores;
+    @WithHTMLTags
     @SerializedName("Sessions")
     private String sessions;
+    @WithHTMLTags
     @SerializedName("Note")
-    private String  note;
+    private String note;
+    @WithHTMLTags
     @SerializedName("ExtendedNote")
-    private String  extendedNote;
+    private String extendedNote;
 
     protected JsonMatch() {
     }
@@ -252,8 +261,8 @@ public class JsonMatch extends JsonIdEntity implements Match {
     }
 
     @Override
-    public String videoURL() {
-        return videoURL;
+    public String videoUrl() {
+        return videoUrl;
     }
 
     @Override