git.hedgecode.org
/
snooker-score-api.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[LIB-8] New entities fields tests
[snooker-score-api.git]
/
src
/
main
/
java
/
org
/
hedgecode
/
snooker
/
json
/
JsonMatch.java
diff --git
a/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
b/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
index
2731565
..
cda1b86
100644
(file)
--- 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 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;
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;
private boolean onBreak;
@SerializedName("WorldSnookerID")
private int worldSnookerId;
+ @IsURL
@SerializedName("LiveUrl")
private String liveUrl;
@SerializedName("LiveUrl")
private String liveUrl;
+ @IsURL
@SerializedName("DetailsUrl")
private String detailsUrl;
@SerializedName("PointsDropped")
@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;
private int type;
@SerializedName("TableNo")
private int tableNo;
+ @IsURL
@SerializedName("VideoURL")
@SerializedName("VideoURL")
- private String videoU
RL
;
+ private String videoU
rl
;
@SerializedName("InitDate")
private Date initDate;
@SerializedName("ModDate")
@SerializedName("InitDate")
private Date initDate;
@SerializedName("ModDate")
@@
-94,14
+99,21
@@
public class JsonMatch extends JsonIdEntity implements Match {
private Date endDate;
@SerializedName("ScheduledDate")
private Date scheduledDate;
private Date endDate;
@SerializedName("ScheduledDate")
private Date scheduledDate;
+ @WithHTMLTags
@SerializedName("FrameScores")
private String frameScores;
@SerializedName("FrameScores")
private String frameScores;
+ @WithHTMLTags
@SerializedName("Sessions")
private String sessions;
@SerializedName("Sessions")
private String sessions;
+ @WithHTMLTags
@SerializedName("Note")
@SerializedName("Note")
- private String note;
+ private String note;
+ @WithHTMLTags
@SerializedName("ExtendedNote")
@SerializedName("ExtendedNote")
- private String extendedNote;
+ private String extendedNote;
+
+ protected JsonMatch() {
+ }
@Override
public int matchId() {
@Override
public int matchId() {
@@
-249,33
+261,43
@@
public class JsonMatch extends JsonIdEntity implements Match {
}
@Override
}
@Override
- public String videoU
RL
() {
- return videoU
RL
;
+ public String videoU
rl
() {
+ return videoU
rl
;
}
@Override
public Date initDate() {
}
@Override
public Date initDate() {
- return initDate;
+ return initDate == null
+ ? null
+ : new Date(initDate.getTime());
}
@Override
public Date modDate() {
}
@Override
public Date modDate() {
- return modDate;
+ return modDate == null
+ ? null
+ : new Date(modDate.getTime());
}
@Override
public Date startDate() {
}
@Override
public Date startDate() {
- return startDate;
+ return startDate == null
+ ? null
+ : new Date(startDate.getTime());
}
@Override
public Date endDate() {
}
@Override
public Date endDate() {
- return endDate;
+ return endDate == null
+ ? null
+ : new Date(endDate.getTime());
}
@Override
public Date scheduledDate() {
}
@Override
public Date scheduledDate() {
- return scheduledDate;
+ return scheduledDate == null
+ ? null
+ : new Date(scheduledDate.getTime());
}
@Override
}
@Override