[LIB-5] Collection empty objects,reporting and serializable

[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..22248dd 100644 (file)
--- a/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
+++ b/src/main/java/org/hedgecode/snooker/json/JsonMatch.java
@@ -103,6 +103,9 @@ public class JsonMatch extends JsonIdEntity implements Match {
     @SerializedName("ExtendedNote")

     private String  extendedNote;

 

+    protected JsonMatch() {

+    }

+

     @Override

     public int matchId() {

         return matchId;

@@ -255,27 +258,37 @@ public class JsonMatch extends JsonIdEntity implements Match {
 

     @Override

     public Date initDate() {

-        return initDate;

+        return initDate == null

+                ? null

+                : new Date(initDate.getTime());

     }

 

     @Override

     public Date modDate() {

-        return modDate;

+        return modDate == null

+                ? null

+                : new Date(modDate.getTime());

     }

 

     @Override

     public Date startDate() {

-        return startDate;

+        return startDate == null

+                ? null

+                : new Date(startDate.getTime());

     }

 

     @Override

     public Date endDate() {

-        return endDate;

+        return endDate == null

+                ? null

+                : new Date(endDate.getTime());

     }

 

     @Override

     public Date scheduledDate() {

-        return scheduledDate;

+        return scheduledDate == null

+                ? null

+                : new Date(scheduledDate.getTime());

     }

 

     @Override