From 2730133cd1f5b0f4d26b042c1171155797636929 Mon Sep 17 00:00:00 2001 From: gotty Date: Fri, 22 Nov 2019 04:33:27 +0000 Subject: [PATCH] [LIB-10] SerialVersionUID for Serializable classes git-svn-id: https://svn.hedgecode.org/lib/snooker-score-api/trunk@190 fb0bcced-7025-49ed-a12f-f98bce993226 --- src/main/java/org/hedgecode/snooker/api/Season.java | 2 ++ .../java/org/hedgecode/snooker/api/SnookerURL.java | 2 ++ .../hedgecode/snooker/compare/EventComparators.java | 5 ++--- .../hedgecode/snooker/compare/MatchComparators.java | 5 ++--- .../snooker/compare/PlayerComparators.java | 5 ++--- .../snooker/compare/RankingComparators.java | 5 ++--- .../hedgecode/snooker/compare/RoundComparators.java | 5 ++--- .../snooker/compare/SeedingComparators.java | 7 +++---- .../snooker/json/JsonCollectionEntity.java | 6 ++++-- .../java/org/hedgecode/snooker/json/JsonEvent.java | 7 +++++-- .../java/org/hedgecode/snooker/json/JsonEvents.java | 9 ++++++--- .../org/hedgecode/snooker/json/JsonIdEntity.java | 13 ++++--------- .../java/org/hedgecode/snooker/json/JsonMatch.java | 7 +++++-- .../org/hedgecode/snooker/json/JsonMatches.java | 9 ++++++--- .../hedgecode/snooker/json/JsonOngoingMatch.java | 8 ++++++-- .../hedgecode/snooker/json/JsonOngoingMatches.java | 9 +++++++-- .../java/org/hedgecode/snooker/json/JsonPlayer.java | 7 +++++-- .../org/hedgecode/snooker/json/JsonPlayers.java | 9 ++++++--- .../org/hedgecode/snooker/json/JsonRanking.java | 8 ++++++-- .../org/hedgecode/snooker/json/JsonRankings.java | 9 ++++++--- .../java/org/hedgecode/snooker/json/JsonRound.java | 8 ++++++-- .../java/org/hedgecode/snooker/json/JsonRounds.java | 9 ++++++--- .../org/hedgecode/snooker/json/JsonSeeding.java | 8 ++++++-- .../org/hedgecode/snooker/json/JsonSeedings.java | 9 ++++++--- .../hedgecode/snooker/json/AbstractJsonTest.java | 6 ++++++ .../org/hedgecode/snooker/json/JsonEventTest.java | 2 +- .../org/hedgecode/snooker/json/JsonEventsTest.java | 2 +- .../org/hedgecode/snooker/json/JsonMatchTest.java | 2 +- .../org/hedgecode/snooker/json/JsonMatchesTest.java | 2 +- .../snooker/json/JsonOngoingMatchTest.java | 2 +- .../snooker/json/JsonOngoingMatchesTest.java | 2 +- .../org/hedgecode/snooker/json/JsonPlayerTest.java | 2 +- .../org/hedgecode/snooker/json/JsonPlayersTest.java | 2 +- .../org/hedgecode/snooker/json/JsonRankingTest.java | 2 +- .../hedgecode/snooker/json/JsonRankingsTest.java | 2 +- .../org/hedgecode/snooker/json/JsonRoundTest.java | 2 +- .../org/hedgecode/snooker/json/JsonRoundsTest.java | 2 +- .../org/hedgecode/snooker/json/JsonSeedingTest.java | 2 +- .../hedgecode/snooker/json/JsonSeedingsTest.java | 2 +- .../org/hedgecode/snooker/json/JsonEventTest.ser | Bin 1327 -> 1273 bytes .../org/hedgecode/snooker/json/JsonEventsTest.ser | Bin 25914 -> 25860 bytes .../org/hedgecode/snooker/json/JsonMatchTest.ser | Bin 949 -> 895 bytes .../org/hedgecode/snooker/json/JsonMatchesTest.ser | Bin 4028 -> 3974 bytes .../hedgecode/snooker/json/JsonOngoingMatchTest.ser | Bin 909 -> 855 bytes .../snooker/json/JsonOngoingMatchesTest.ser | Bin 1435 -> 1381 bytes .../org/hedgecode/snooker/json/JsonPlayerTest.ser | Bin 786 -> 732 bytes .../org/hedgecode/snooker/json/JsonPlayersTest.ser | Bin 24582 -> 24528 bytes .../org/hedgecode/snooker/json/JsonRankingTest.ser | Bin 385 -> 331 bytes .../org/hedgecode/snooker/json/JsonRankingsTest.ser | Bin 8292 -> 8238 bytes .../org/hedgecode/snooker/json/JsonRoundTest.ser | Bin 490 -> 436 bytes .../org/hedgecode/snooker/json/JsonRoundsTest.ser | Bin 1891 -> 1837 bytes .../org/hedgecode/snooker/json/JsonSeedingTest.ser | Bin 248 -> 194 bytes .../org/hedgecode/snooker/json/JsonSeedingsTest.ser | Bin 3813 -> 3759 bytes 53 files changed, 127 insertions(+), 78 deletions(-) diff --git a/src/main/java/org/hedgecode/snooker/api/Season.java b/src/main/java/org/hedgecode/snooker/api/Season.java index e206d8b..14c5364 100644 --- a/src/main/java/org/hedgecode/snooker/api/Season.java +++ b/src/main/java/org/hedgecode/snooker/api/Season.java @@ -28,6 +28,8 @@ import java.util.Map; */ public class Season implements Serializable { + private static final long serialVersionUID = -4233073149675278053L; + private static final Calendar CURRENT_CALENDAR = Calendar.getInstance(); private static final int NEW_SEASON_MONTH = 5; /* June */ diff --git a/src/main/java/org/hedgecode/snooker/api/SnookerURL.java b/src/main/java/org/hedgecode/snooker/api/SnookerURL.java index db14607..ceff340 100644 --- a/src/main/java/org/hedgecode/snooker/api/SnookerURL.java +++ b/src/main/java/org/hedgecode/snooker/api/SnookerURL.java @@ -26,6 +26,8 @@ import java.net.URL; */ public class SnookerURL implements Serializable { + private static final long serialVersionUID = 5068013909126568563L; + private String name; private URL url; diff --git a/src/main/java/org/hedgecode/snooker/compare/EventComparators.java b/src/main/java/org/hedgecode/snooker/compare/EventComparators.java index 3e2577f..63db086 100644 --- a/src/main/java/org/hedgecode/snooker/compare/EventComparators.java +++ b/src/main/java/org/hedgecode/snooker/compare/EventComparators.java @@ -16,7 +16,6 @@ package org.hedgecode.snooker.compare; -import java.io.Serializable; import java.util.Comparator; import org.hedgecode.snooker.api.Event; @@ -43,7 +42,7 @@ public enum EventComparators { return comparator; } - static class DateComparator implements Comparator, Serializable { + static class DateComparator implements Comparator { @Override public int compare(Event event1, Event event2) { @@ -52,7 +51,7 @@ public enum EventComparators { } - static class SnookerIdComparator implements Comparator, Serializable { + static class SnookerIdComparator implements Comparator { @Override public int compare(Event event1, Event event2) { diff --git a/src/main/java/org/hedgecode/snooker/compare/MatchComparators.java b/src/main/java/org/hedgecode/snooker/compare/MatchComparators.java index b7439ac..6138f84 100644 --- a/src/main/java/org/hedgecode/snooker/compare/MatchComparators.java +++ b/src/main/java/org/hedgecode/snooker/compare/MatchComparators.java @@ -16,7 +16,6 @@ package org.hedgecode.snooker.compare; -import java.io.Serializable; import java.util.Comparator; import org.hedgecode.snooker.api.Match; @@ -43,7 +42,7 @@ public enum MatchComparators { return comparator; } - static class RoundNumberComparator implements Comparator, Serializable { + static class RoundNumberComparator implements Comparator { @Override public int compare(Match match1, Match match2) { @@ -54,7 +53,7 @@ public enum MatchComparators { } - static class EventComparator implements Comparator, Serializable { + static class EventComparator implements Comparator { @Override public int compare(Match match1, Match match2) { diff --git a/src/main/java/org/hedgecode/snooker/compare/PlayerComparators.java b/src/main/java/org/hedgecode/snooker/compare/PlayerComparators.java index f389c9c..fc18aba 100644 --- a/src/main/java/org/hedgecode/snooker/compare/PlayerComparators.java +++ b/src/main/java/org/hedgecode/snooker/compare/PlayerComparators.java @@ -16,7 +16,6 @@ package org.hedgecode.snooker.compare; -import java.io.Serializable; import java.util.Comparator; import org.hedgecode.snooker.api.Player; @@ -43,7 +42,7 @@ public enum PlayerComparators { return comparator; } - static class NameComparator implements Comparator, Serializable { + static class NameComparator implements Comparator { @Override public int compare(Player player1, Player player2) { @@ -52,7 +51,7 @@ public enum PlayerComparators { } - static class AgeComparator implements Comparator, Serializable { + static class AgeComparator implements Comparator { @Override public int compare(Player player1, Player player2) { diff --git a/src/main/java/org/hedgecode/snooker/compare/RankingComparators.java b/src/main/java/org/hedgecode/snooker/compare/RankingComparators.java index 2d1bb56..3cac7a3 100644 --- a/src/main/java/org/hedgecode/snooker/compare/RankingComparators.java +++ b/src/main/java/org/hedgecode/snooker/compare/RankingComparators.java @@ -16,7 +16,6 @@ package org.hedgecode.snooker.compare; -import java.io.Serializable; import java.util.Comparator; import org.hedgecode.snooker.api.Ranking; @@ -43,7 +42,7 @@ public enum RankingComparators { return comparator; } - static class PositionComparator implements Comparator, Serializable { + static class PositionComparator implements Comparator { @Override public int compare(Ranking ranking1, Ranking ranking2) { @@ -52,7 +51,7 @@ public enum RankingComparators { } - static class SumComparator implements Comparator, Serializable { + static class SumComparator implements Comparator { @Override public int compare(Ranking ranking1, Ranking ranking2) { diff --git a/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java b/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java index 12226a9..1508ee3 100644 --- a/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java +++ b/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java @@ -16,7 +16,6 @@ package org.hedgecode.snooker.compare; -import java.io.Serializable; import java.util.Comparator; import org.hedgecode.snooker.api.Round; @@ -43,7 +42,7 @@ public enum RoundComparators { return comparator; } - static class RoundComparator implements Comparator, Serializable { + static class RoundComparator implements Comparator { @Override public int compare(Round round1, Round round2) { @@ -52,7 +51,7 @@ public enum RoundComparators { } - static class EventComparator implements Comparator, Serializable { + static class EventComparator implements Comparator { @Override public int compare(Round round1, Round round2) { diff --git a/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java b/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java index fa7c562..842039b 100644 --- a/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java +++ b/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java @@ -16,7 +16,6 @@ package org.hedgecode.snooker.compare; -import java.io.Serializable; import java.util.Comparator; import org.hedgecode.snooker.api.Seeding; @@ -45,7 +44,7 @@ public enum SeedingComparators { return comparator; } - static class EventComparator implements Comparator, Serializable { + static class EventComparator implements Comparator { @Override public int compare(Seeding seeding1, Seeding seeding2) { @@ -54,7 +53,7 @@ public enum SeedingComparators { } - static class PlayerComparator implements Comparator, Serializable { + static class PlayerComparator implements Comparator { @Override public int compare(Seeding seeding1, Seeding seeding2) { @@ -63,7 +62,7 @@ public enum SeedingComparators { } - static class SeedingComparator implements Comparator, Serializable { + static class SeedingComparator implements Comparator { @Override public int compare(Seeding seeding1, Seeding seeding2) { diff --git a/src/main/java/org/hedgecode/snooker/json/JsonCollectionEntity.java b/src/main/java/org/hedgecode/snooker/json/JsonCollectionEntity.java index 69c9f13..11f300d 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonCollectionEntity.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonCollectionEntity.java @@ -36,9 +36,11 @@ import org.hedgecode.snooker.api.IdEntity; public abstract class JsonCollectionEntity implements CollectionEntity, Serializable { + private static final long serialVersionUID = 6302642716627217361L; + private final Map entities = new LinkedHashMap<>(); - protected JsonCollectionEntity(E[] entities) { + JsonCollectionEntity(E[] entities) { for (E entity : entities) { if (entity != null) this.entities.put( @@ -47,7 +49,7 @@ public abstract class JsonCollectionEntity } } - protected JsonCollectionEntity(List entities) { + JsonCollectionEntity(List entities) { for (E entity : entities) { this.entities.put( entity.getId(), entity diff --git a/src/main/java/org/hedgecode/snooker/json/JsonEvent.java b/src/main/java/org/hedgecode/snooker/json/JsonEvent.java index 9b1eece..526389f 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonEvent.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonEvent.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.Date; import com.google.gson.annotations.Expose; @@ -34,7 +35,9 @@ import org.hedgecode.snooker.api.Season; * * @author Dmitry Samoshin aka gotty */ -public class JsonEvent extends JsonIdEntity implements Event { +public class JsonEvent extends JsonIdEntity implements Event, Serializable { + + private static final long serialVersionUID = 3074418501643772690L; @SerializedName("ID") private int eventId; @@ -127,7 +130,7 @@ public class JsonEvent extends JsonIdEntity implements Event { @Expose private Event previousEdition; - protected JsonEvent() { + JsonEvent() { } @Override diff --git a/src/main/java/org/hedgecode/snooker/json/JsonEvents.java b/src/main/java/org/hedgecode/snooker/json/JsonEvents.java index 4a7aec7..d536507 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonEvents.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonEvents.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -31,15 +32,17 @@ import org.hedgecode.snooker.compare.EventComparators; * * @author Dmitry Samoshin aka gotty */ -public class JsonEvents extends JsonCollectionEntity implements Events { +public class JsonEvents extends JsonCollectionEntity implements Events, Serializable { + + private static final long serialVersionUID = 3333612126168481839L; private static final JsonEvents EMPTY = new JsonEvents(new Event[0]); - protected JsonEvents(Event[] entities) { + JsonEvents(Event[] entities) { super(entities); } - protected JsonEvents(List entities) { + JsonEvents(List entities) { super(entities); } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonIdEntity.java b/src/main/java/org/hedgecode/snooker/json/JsonIdEntity.java index 4ee0c88..ec84274 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonIdEntity.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonIdEntity.java @@ -16,8 +16,6 @@ package org.hedgecode.snooker.json; -import java.io.Serializable; - import org.hedgecode.snooker.api.IdEntity; /** @@ -25,10 +23,8 @@ import org.hedgecode.snooker.api.IdEntity; * * @author Dmitry Samoshin aka gotty */ -public abstract class JsonIdEntity - extends JsonURLEntity - implements IdEntity, Serializable -{ +public abstract class JsonIdEntity extends JsonURLEntity implements IdEntity { + @Override public boolean equals(Object obj) { if (this == obj) @@ -43,9 +39,8 @@ public abstract class JsonIdEntity @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + getId(); + int result = getClass().getSimpleName().hashCode(); + result = 31 * result + getId(); return result; } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonMatch.java b/src/main/java/org/hedgecode/snooker/json/JsonMatch.java index f593735..3a2ad3d 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonMatch.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonMatch.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.Date; import com.google.gson.annotations.Expose; @@ -32,7 +33,9 @@ import org.hedgecode.snooker.api.Player; * * @author Dmitry Samoshin aka gotty */ -public class JsonMatch extends JsonIdEntity implements Match { +public class JsonMatch extends JsonIdEntity implements Match, Serializable { + + private static final long serialVersionUID = 1503003854433798119L; @SerializedName("ID") private int matchId; @@ -112,7 +115,7 @@ public class JsonMatch extends JsonIdEntity implements Match { @SerializedName("ExtendedNote") private String extendedNote; - protected JsonMatch() { + JsonMatch() { } @Override diff --git a/src/main/java/org/hedgecode/snooker/json/JsonMatches.java b/src/main/java/org/hedgecode/snooker/json/JsonMatches.java index fa99374..70698da 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonMatches.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonMatches.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -28,15 +29,17 @@ import org.hedgecode.snooker.compare.MatchComparators; * * @author Dmitry Samoshin aka gotty */ -public class JsonMatches extends JsonCollectionEntity implements Matches { +public class JsonMatches extends JsonCollectionEntity implements Matches, Serializable { + + private static final long serialVersionUID = 7399435317464241002L; private static final JsonMatches EMPTY = new JsonMatches(new Match[0]); - protected JsonMatches(Match[] entities) { + JsonMatches(Match[] entities) { super(entities); } - protected JsonMatches(List entities) { + JsonMatches(List entities) { super(entities); } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatch.java b/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatch.java index 33530c2..1bbb18c 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatch.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatch.java @@ -16,6 +16,8 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; + import org.hedgecode.snooker.api.OngoingMatch; /** @@ -23,9 +25,11 @@ import org.hedgecode.snooker.api.OngoingMatch; * * @author Dmitry Samoshin aka gotty */ -public class JsonOngoingMatch extends JsonMatch implements OngoingMatch { +public class JsonOngoingMatch extends JsonMatch implements OngoingMatch, Serializable { + + private static final long serialVersionUID = -6395358544537389727L; - protected JsonOngoingMatch() { + JsonOngoingMatch() { } } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatches.java b/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatches.java index 427ebfd..3d939d6 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatches.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonOngoingMatches.java @@ -16,6 +16,8 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; + import org.hedgecode.snooker.api.OngoingMatch; import org.hedgecode.snooker.api.OngoingMatches; @@ -25,9 +27,12 @@ import org.hedgecode.snooker.api.OngoingMatches; * @author Dmitry Samoshin aka gotty */ public class JsonOngoingMatches - extends JsonCollectionEntity implements OngoingMatches + extends JsonCollectionEntity + implements OngoingMatches, Serializable { - protected JsonOngoingMatches(OngoingMatch[] entities) { + private static final long serialVersionUID = 1026260972671849624L; + + JsonOngoingMatches(OngoingMatch[] entities) { super(entities); } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonPlayer.java b/src/main/java/org/hedgecode/snooker/json/JsonPlayer.java index 43be4fd..51a6e89 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonPlayer.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonPlayer.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.net.URL; import java.util.Date; @@ -33,7 +34,9 @@ import org.hedgecode.snooker.api.PlayerImage; * * @author Dmitry Samoshin aka gotty */ -public class JsonPlayer extends JsonIdEntity implements Player { +public class JsonPlayer extends JsonIdEntity implements Player, Serializable { + + private static final long serialVersionUID = 5978347071162091429L; @SerializedName("ID") private int playerId; @@ -90,7 +93,7 @@ public class JsonPlayer extends JsonIdEntity implements Player { @SerializedName("Info") private String info; - protected JsonPlayer() { + JsonPlayer() { } @Override diff --git a/src/main/java/org/hedgecode/snooker/json/JsonPlayers.java b/src/main/java/org/hedgecode/snooker/json/JsonPlayers.java index 8503521..2c4e65f 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonPlayers.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonPlayers.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -28,15 +29,17 @@ import org.hedgecode.snooker.compare.PlayerComparators; * * @author Dmitry Samoshin aka gotty */ -public class JsonPlayers extends JsonCollectionEntity implements Players { +public class JsonPlayers extends JsonCollectionEntity implements Players, Serializable { + + private static final long serialVersionUID = 7472642207778686468L; private static final JsonPlayers EMPTY = new JsonPlayers(new Player[0]); - protected JsonPlayers(Player[] entities) { + JsonPlayers(Player[] entities) { super(entities); } - protected JsonPlayers(List entities) { + JsonPlayers(List entities) { super(entities); } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonRanking.java b/src/main/java/org/hedgecode/snooker/json/JsonRanking.java index 572d599..6be0124 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonRanking.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonRanking.java @@ -16,6 +16,8 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -29,7 +31,9 @@ import org.hedgecode.snooker.api.Season; * * @author Dmitry Samoshin aka gotty */ -public class JsonRanking extends JsonIdEntity implements Ranking { +public class JsonRanking extends JsonIdEntity implements Ranking, Serializable { + + private static final long serialVersionUID = -8009582917499815478L; @SerializedName("ID") private int rankingId; @@ -50,7 +54,7 @@ public class JsonRanking extends JsonIdEntity implements Ranking { @Expose private RankingType rankingType; - protected JsonRanking() { + JsonRanking() { } @Override diff --git a/src/main/java/org/hedgecode/snooker/json/JsonRankings.java b/src/main/java/org/hedgecode/snooker/json/JsonRankings.java index 0cb9d54..d00a814 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonRankings.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonRankings.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -28,15 +29,17 @@ import org.hedgecode.snooker.compare.RankingComparators; * * @author Dmitry Samoshin aka gotty */ -public class JsonRankings extends JsonCollectionEntity implements Rankings { +public class JsonRankings extends JsonCollectionEntity implements Rankings, Serializable { + + private static final long serialVersionUID = -1765390719034378729L; private static final JsonRankings EMPTY = new JsonRankings(new Ranking[0]); - protected JsonRankings(Ranking[] entities) { + JsonRankings(Ranking[] entities) { super(entities); } - protected JsonRankings(List entities) { + JsonRankings(List entities) { super(entities); } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonRound.java b/src/main/java/org/hedgecode/snooker/json/JsonRound.java index 89921ec..2737cac 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonRound.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonRound.java @@ -16,6 +16,8 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -28,7 +30,9 @@ import org.hedgecode.snooker.api.Round; * * @author Dmitry Samoshin aka gotty */ -public class JsonRound extends JsonIdEntity implements Round { +public class JsonRound extends JsonIdEntity implements Round, Serializable { + + private static final long serialVersionUID = -2010008975829800984L; @SerializedName("Round") private int round; @@ -70,7 +74,7 @@ public class JsonRound extends JsonIdEntity implements Round { @SerializedName("SeedPoints") private int seedPoints; - protected JsonRound() { + JsonRound() { } @Override diff --git a/src/main/java/org/hedgecode/snooker/json/JsonRounds.java b/src/main/java/org/hedgecode/snooker/json/JsonRounds.java index 11a75e7..44e5b9d 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonRounds.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonRounds.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -28,15 +29,17 @@ import org.hedgecode.snooker.compare.RoundComparators; * * @author Dmitry Samoshin aka gotty */ -public class JsonRounds extends JsonCollectionEntity implements Rounds { +public class JsonRounds extends JsonCollectionEntity implements Rounds, Serializable { + + private static final long serialVersionUID = -292582814222405882L; private static final JsonRounds EMPTY = new JsonRounds(new Round[0]); - protected JsonRounds(Round[] entities) { + JsonRounds(Round[] entities) { super(entities); } - protected JsonRounds(List entities) { + JsonRounds(List entities) { super(entities); } diff --git a/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java b/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java index 8b9f9ff..30dfd43 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java @@ -16,6 +16,8 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -28,7 +30,9 @@ import org.hedgecode.snooker.api.Seeding; * * @author Dmitry Samoshin aka gotty */ -public class JsonSeeding extends JsonIdEntity implements Seeding { +public class JsonSeeding extends JsonIdEntity implements Seeding, Serializable { + + private static final long serialVersionUID = -9182126924854384725L; @SerializedName("EventID") private int eventId; @@ -41,7 +45,7 @@ public class JsonSeeding extends JsonIdEntity implements Seeding { @SerializedName("Seeding") private int seeding; - protected JsonSeeding() { + JsonSeeding() { } @Override diff --git a/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java b/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java index 3b71237..6c3ef8c 100644 --- a/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java +++ b/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java @@ -16,6 +16,7 @@ package org.hedgecode.snooker.json; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -28,15 +29,17 @@ import org.hedgecode.snooker.compare.SeedingComparators; * * @author Dmitry Samoshin aka gotty */ -public class JsonSeedings extends JsonCollectionEntity implements Seedings { +public class JsonSeedings extends JsonCollectionEntity implements Seedings, Serializable { + + private static final long serialVersionUID = 8251290277292098461L; private static final JsonSeedings EMPTY = new JsonSeedings(new Seeding[0]); - protected JsonSeedings(Seeding[] entities) { + JsonSeedings(Seeding[] entities) { super(entities); } - protected JsonSeedings(List entities) { + JsonSeedings(List entities) { super(entities); } diff --git a/src/test/java/org/hedgecode/snooker/json/AbstractJsonTest.java b/src/test/java/org/hedgecode/snooker/json/AbstractJsonTest.java index cb8f2c7..d42fd4d 100644 --- a/src/test/java/org/hedgecode/snooker/json/AbstractJsonTest.java +++ b/src/test/java/org/hedgecode/snooker/json/AbstractJsonTest.java @@ -80,6 +80,12 @@ public abstract class AbstractJsonTest extends Assert { return sb.toString(); } + protected void verifySerialize(Serializable serializeObject) throws IOException { + if (!serializeFile.exists()) { + serialize(serializeObject); + } + } + protected void serialize(Serializable serializeObject) throws IOException { try (ObjectOutputStream oos = new ObjectOutputStream( diff --git a/src/test/java/org/hedgecode/snooker/json/JsonEventTest.java b/src/test/java/org/hedgecode/snooker/json/JsonEventTest.java index 1421a96..dd24814 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonEventTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonEventTest.java @@ -36,7 +36,7 @@ public class JsonEventTest extends AbstractJsonTest { ), JsonEvent[].class ); - //serialize(jsonEvents[0]); + verifySerialize(jsonEvents[0]); JsonEvent expectedEvent = (JsonEvent) deserialize(); assertNull( expectedEvent, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonEventsTest.java b/src/test/java/org/hedgecode/snooker/json/JsonEventsTest.java index c5fb327..5fe91eb 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonEventsTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonEventsTest.java @@ -40,7 +40,7 @@ public class JsonEventsTest extends AbstractJsonTest { JsonEvent[].class ) ); - //serialize(actualEvents); + verifySerialize(actualEvents); JsonEvents expectedEvents = (JsonEvents) deserialize(); assertEquals( expectedEvents, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonMatchTest.java b/src/test/java/org/hedgecode/snooker/json/JsonMatchTest.java index e9e31ea..0fd040e 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonMatchTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonMatchTest.java @@ -36,7 +36,7 @@ public class JsonMatchTest extends AbstractJsonTest { ), JsonMatch[].class ); - //serialize(jsonMatches[0]); + verifySerialize(jsonMatches[0]); JsonMatch expectedMatch = (JsonMatch) deserialize(); assertNull( expectedMatch, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonMatchesTest.java b/src/test/java/org/hedgecode/snooker/json/JsonMatchesTest.java index 7db2941..9a17f33 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonMatchesTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonMatchesTest.java @@ -40,7 +40,7 @@ public class JsonMatchesTest extends AbstractJsonTest { JsonMatch[].class ) ); - //serialize(actualMatches); + verifySerialize(actualMatches); JsonMatches expectedMatches = (JsonMatches) deserialize(); assertEquals( expectedMatches, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchTest.java b/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchTest.java index c778cd8..8739b49 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchTest.java @@ -36,7 +36,7 @@ public class JsonOngoingMatchTest extends JsonMatchTest { ), JsonOngoingMatch[].class ); - //serialize(jsonOngoingMatches[0]); + verifySerialize(jsonOngoingMatches[0]); JsonOngoingMatch expectedOngoingMatch = (JsonOngoingMatch) deserialize(); assertNull( expectedOngoingMatch, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchesTest.java b/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchesTest.java index ee96b6c..870f654 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchesTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonOngoingMatchesTest.java @@ -40,7 +40,7 @@ public class JsonOngoingMatchesTest extends AbstractJsonTest { JsonOngoingMatch[].class ) ); - //serialize(actualOngoingMatches); + verifySerialize(actualOngoingMatches); JsonOngoingMatches expectedOngoingMatches = (JsonOngoingMatches) deserialize(); assertEquals( expectedOngoingMatches, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonPlayerTest.java b/src/test/java/org/hedgecode/snooker/json/JsonPlayerTest.java index be885d1..654facd 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonPlayerTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonPlayerTest.java @@ -36,7 +36,7 @@ public class JsonPlayerTest extends AbstractJsonTest { ), JsonPlayer[].class ); - //serialize(jsonPlayers[0]); + verifySerialize(jsonPlayers[0]); JsonPlayer expectedPlayer = (JsonPlayer) deserialize(); assertNull( expectedPlayer, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonPlayersTest.java b/src/test/java/org/hedgecode/snooker/json/JsonPlayersTest.java index d0b7fc3..46e62d4 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonPlayersTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonPlayersTest.java @@ -40,7 +40,7 @@ public class JsonPlayersTest extends AbstractJsonTest { JsonPlayer[].class ) ); - //serialize(actualPlayers); + verifySerialize(actualPlayers); JsonPlayers expectedPlayers = (JsonPlayers) deserialize(); assertEquals( expectedPlayers, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonRankingTest.java b/src/test/java/org/hedgecode/snooker/json/JsonRankingTest.java index 63a3ef0..a6b8afe 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonRankingTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonRankingTest.java @@ -36,7 +36,7 @@ public class JsonRankingTest extends AbstractJsonTest { ), JsonRanking[].class ); - //serialize(jsonRankings[0]); + verifySerialize(jsonRankings[0]); JsonRanking expectedRanking = (JsonRanking) deserialize(); assertNull( expectedRanking, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonRankingsTest.java b/src/test/java/org/hedgecode/snooker/json/JsonRankingsTest.java index bcec928..fc0e7c7 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonRankingsTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonRankingsTest.java @@ -40,7 +40,7 @@ public class JsonRankingsTest extends AbstractJsonTest { JsonRanking[].class ) ); - //serialize(actualRankings); + verifySerialize(actualRankings); JsonRankings expectedRankings = (JsonRankings) deserialize(); assertEquals( expectedRankings, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonRoundTest.java b/src/test/java/org/hedgecode/snooker/json/JsonRoundTest.java index b3c4629..7dad5e8 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonRoundTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonRoundTest.java @@ -36,7 +36,7 @@ public class JsonRoundTest extends AbstractJsonTest { ), JsonRound[].class ); - //serialize(jsonRounds[0]); + verifySerialize(jsonRounds[0]); JsonRound expectedRound = (JsonRound) deserialize(); assertNull( expectedRound, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonRoundsTest.java b/src/test/java/org/hedgecode/snooker/json/JsonRoundsTest.java index cb06cea..27fef6f 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonRoundsTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonRoundsTest.java @@ -40,7 +40,7 @@ public class JsonRoundsTest extends AbstractJsonTest { JsonRound[].class ) ); - //serialize(actualRounds); + verifySerialize(actualRounds); JsonRounds expectedRounds = (JsonRounds) deserialize(); assertEquals( expectedRounds, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonSeedingTest.java b/src/test/java/org/hedgecode/snooker/json/JsonSeedingTest.java index 48d21fe..5140b71 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonSeedingTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonSeedingTest.java @@ -36,7 +36,7 @@ public class JsonSeedingTest extends AbstractJsonTest { ), JsonSeeding[].class ); - //serialize(jsonSeedings[0]); + verifySerialize(jsonSeedings[0]); JsonSeeding expectedSeeding = (JsonSeeding) deserialize(); assertNull( expectedSeeding, diff --git a/src/test/java/org/hedgecode/snooker/json/JsonSeedingsTest.java b/src/test/java/org/hedgecode/snooker/json/JsonSeedingsTest.java index 5f20446..6a7ca1a 100644 --- a/src/test/java/org/hedgecode/snooker/json/JsonSeedingsTest.java +++ b/src/test/java/org/hedgecode/snooker/json/JsonSeedingsTest.java @@ -40,7 +40,7 @@ public class JsonSeedingsTest extends AbstractJsonTest { JsonSeeding[].class ) ); - //serialize(actualSeedings); + verifySerialize(actualSeedings); JsonSeedings expectedSeedings = (JsonSeedings) deserialize(); assertEquals( expectedSeedings, diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonEventTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonEventTest.ser index 51976bd57ed2cb6040e222d5e59e40b2338c670d..ece49036d2c4aaa2ecc3be83baeb5da14d5d6393 100644 GIT binary patch delta 30 mcmZ3_^^lt-40Xmt zhbL~ZB``xYh#^M1?E@M~6!(G1hM6%srZF)_f{9{c49haNbKbrWseJk8IsgCfxt!95q5@MQs%Qi|UASB6KZkH9>!htFg#hx`c`~5~TcxC7DzVM$`1S z(IZ5~tb^%gW*m*l5@9kY7A!Gmc>m}Jo*aIN-7oMJal!m(9PyU;#r)FcjK97-nAao_ zKbo+Z?@VNTc2Y3^eG>5+>039nTbaqhP(4`2r|tE|*P%jzRhfe!2&<#4(z2}0F# z=)YCtf&Aty{`qS)-9nr8y}eV|rX1!qFOYhg?L{@L86?fg2f6lR9QpDqVMx16@FbaH zXswQiF})nRbkRcoKo`jAN{J8CGrnIXh7oT)Nna*EVq^9fWEOuktkBT`erq>;0ZNJL(!I`o| zX#eOb2K6O2q=rjkiMqair$9MMeD~o;Qnl6?ZO$481k36Drv|vD6lim%LHnka$oFlUW#Mjz6N$wWbv5+?p1s)c-t$PH&w|zxi%FJ zSJ6B6m<{lI74yq=!TxX6%-@$2>`#8m{6T%Nf47F-uBg_3C{7QD0G;4cwuUtu6^_zd+>!+F#d_A1mpc4|4QH%h4QdqDYdi|rm(>hk%+|2#Al3; zs5wzlqroUkWE#<`$&9+h7!8;xQOB}nZdqbk))EoxqNR=Kd>)OY-R2zX<7_yCuE ztWu}6ciX-m>>V7o&g7JjhCR;+<2bm#Xilykl5rg0GQY?Qe>{)o?qa2^k&v z0687$l9E~zW_vIx32J1&qLCiu;nksUqOy4mF3KA)_*WiA!G~xU29B6?3i@NI*S**) z$Uem`iMW>;ZZ0KHuik*1Q>a4c)OtGDW6c24oHT>%NOpi_zgOmIaf<~iVS8q+?cF>PiU(=6#s(`At6%%J^JGsXQf;D^lb zFb-sG!wLS9<)VWcvUg%|HCsW!y_^>5Iow@YcZ4@9%B45c=Iz0((Yz?i8eb7WM(Zyi z-xn9-ndGpbiU4a}3@qrEqdH-%hXKQvlCO%7lRS-L?I6bua(wfa&D;)7OdQQ;iI#%Z zQt^`lru7>|?UvN+%;zj8uaM#F>$etJ^)C_>MwqABh7)tCn6HFuF8*KCxsJl+@c z@ZQz|Q`NiCXt13^{$-nG_TI=Bkm4zW#F{KLDr$a2{#UaR*;zY=6lpRJ@LHNi){v3OQA9rmk1g3hJ45x}ItIPNto5GR@Gyw2=m;=^L4LvQgCV z!^JaH!HFh%1-{vfgYh-z)AbLnYiD;l_h=LctAQxjQ8Z4wx{#k-Z;`Vt^pRLv&m;eA z-GsESr}f+QPGq^8Zt}{FUBTM+9GU2$No@DfR7~w7(gy9p;ac3F2;#hbXnZSh*833G z*EUdr+INYi9=x1`^VPy@pB)Wj$InQa-+^@buOlM@L1b^>5>nYox7yM92)Q;`i#!sf bog2G?Qaf+OgMj!W?7E1?P`4ZTw7cYg+XJ{| diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonMatchTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonMatchTest.ser index b27434cc9dbccb5fcc54e47cc3d55c3893e00737..bc153e42fbe0ea604d0204b3151f7cfb6866dcc9 100644 GIT binary patch delta 75 zcmdnW{-14v4u{C?eO%Wk9)G^k#ENP15~e~?_Hqse2F8d}K9Ld?B@7J3g$#8J?31;a RZJ;udYnmMzkYuWvtpL3f7H$9l delta 88 zcmey*wv~N?4#(!z`Qa8mha@+eSTQjdF{n@EkQeq$am_2qEU9$3reV2&>9R5t1H}at;Ot#)wlskrEXp3=GAE40Q|~lfN+8Fmg;bWEKXJuFO^d%C8vM diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonMatchesTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonMatchesTest.ser index 02d6906cd123249ea1fe13a897edb8ddfae6d0e1..653f0c34cddfd69de81be7f283c39d588bcdb0ad 100644 GIT binary patch delta 948 zcmdlZ-zGmnk3VgLu=(Qmle3r@7%GYw^e10rmY*0Sz!6?vqmg%H^~H@P5{w)oxA$>f zpLqQF<|&L;Op{qyO2viCIT#oiBTmn252z?%U??akE@Y@<5S~1Nr9~Smcgl}z14s@c z15tlwdS?cTdVAI^nEKOm|IHw%{t80~Qm8a(LBia3twM!Y6Xk|1Av_1;7A83!_s$krD`hP2SFtEeg|N*3p0@W6oI> z4wYG#$^L+_S>QN`Tzh_*19BKaMbBJEHk*U13g*tWCi4yuHhc1VE*qFT*EBmInKg;K zlTmnb7q`DXEMcH{5MurE*ck?xj#?h`1j(Su5iA|r4CmV7IPnP5N!(m|~zo;72s*Nk>V7PnZrXvnuV=EW{W1tAf delta 954 zcmZpZ-y=UkkE45UR_8Lw!GvmIT#oiBTmn252z?%U??akE@Y@< z5Sbjs(xMHOJLSi<0VD^Jfv7(-y)y$vJtu1xO#SJ(|7H+WKaVxb1ZKXkw+FiV)3f(f zAe#@iHFDeeACoV#2~YNC^MhG-iU`eN tSbVZ>UiJ-SpG-c(2Tu{GVFvN}#!pHwP}C>#3kyMGapR^V4q&+o1^^a-3?Tpj diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonOngoingMatchTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonOngoingMatchTest.ser index 71ee53e75a8d3df8e15e2c39e525fb5af98601dd..96c096745480275943cc98155a8757b338cb19c4 100644 GIT binary patch delta 94 zcmeBWzs@$nm}9xUyyx0!UlS)Gj^Q@RA-(xDZ;wtB0U|@{g_(|zS dMF|5#K|ygLLmdN5bmg1|kSL1SrXvnul>mb^Ab0=( delta 121 zcmcc4*2_M@m}9cn_Q`wC`n;cLtsQ(W^(GD|8Q zu4z~KI_6E9W$TL{Y>x9dQ7w F1OOhoC!zoV diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonOngoingMatchesTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonOngoingMatchesTest.ser index 609476139b9bac6241729d0410a46f24563a395b..64637c0390f6f28b01f91362432b16a19f87a1c4 100644 GIT binary patch delta 173 zcmbQu{gi8hDF>e&)2mCLugsWeYsL{?UZatBWc9_3)$)w|%kAYo*G~JI$i%=E=SP!s6P|tvM=3ex`}bJEYnv2b~Xw3 delta 50 zcmV-20L}m01(F7kEeLq6(Z%!q_4BbcvH=5f04I?M9}`JrMQ(Iyba_D5C^?`4(<1@^ I0F&kc_ApiyeE*90%~b&ck_#6OL2zkhsthx=6~Ar{ua2=Scq)>tWSan+YL3*=p&2v9+Nx zQVHQgDGy8eC+)~GZOtE9>EB9Lv-Eyf|Gf6y@B96IzMt>=b8%Q~9un86q=hDBxilux z;<{Qb%`Pfc9v^L+=sK+sOVbw(OEnGFEj_j3ZgEeU#9u6y3C$LRcCsR=NF+Lyp)!gD zv5m7(VR-{Pu2%Qppw$38W8DV*rDnJ&eGNx#zQKOmE_lT584R%Jdd7YT-ds5giyhv= zG{+9O|HgQh!2!<)uwX6gNWJ>uh}RQX;#~|Ey!oZWhbM!5d2-s9 zuRgYpmBaiV!+F0!*t&iM9`@%e+ygGa#(+MUrDQ(KO1`UW13Nqv_y$G<@%x7$6Ep@h zJ?+M)&_?wNnpMoFCgd_ygtGtNp}hV6rf!%Q#yYa_5_lz?DMdxJ!_N`Cy>7Dr1J%{g zq#lRowv@vak<5Q6lF6Kinuq$W1GfLB+9=6$7j&s|q0YfU&_o-tIThUmi?&gZnD=lY z<`%5o&Vgul;L*m|3M?yQ*`=+9ee`Kqy)bSDYT`MkukjObbSKLcCX~Xt1a@;Uk@HAR z!uyTM45vGpn;|I-d_ILEXxh~blT!KQUw>`i&EXzRV-#}jEc~J6`OZDPut3MYf9e>c zX)nj8N^gYY>1^a|#(5~od;!NYr(pd)#;(s|j8j=`zcRZLO7v{7O3$@rP8F=qxeDD3 stUPJp_sm@SE_eBVfN{-ZX2ILwDtymt#YX*pUgnd}pIh=dY3+gjKMme2!~g&Q delta 923 zcmXZado0yq7zglklAKUFs46X;u_(%2$p)wM)kB zmWV{{AsP;1u~f)h`WU)sw!$gR23Wf65e(M44ZmoOz+TB9EMGncPiiyLOQ#Ed)#18c zR}J^9n1Vqo$Dy%av$ixxA`*$J7p7&xsLV+CpjU~5+*N1A(n@I~mQ7OTPtxy!W(Kd} zH-i>fznZnO4C|o2QSJXcRT?t|Lb|7sFlJPRgMG%`JXpj}kT(cf=7z%MXk(!<(porX zl8k_tCjIb==`1WV`^dkTk3rux%&ui|9F|zzf-*~18nf(x=d3!R$~q6Kt+|tH!^n9X zM%LM~w8D;=f7{)IZEM-P!|QsXr+qV=wl9JE9UeeyM|ShMBYTv;z8$(b4Z{T|?%#C2 z3sX0+*Cs9x;ke6FSnbMgCcBlw88_blnT*wsy0<}l59XQl$cOQs?4yQP6KwTj_1$s- zewUZQLd6h_^gaOxy*aJ2jd!4r&nIZ>%errUS*vE#br|SJXZZ=1n`Xm z0YxxE$y-e*S+_Wl+1$6hfjU8)TvyO2EDvTLcU1vwRWjs%J&Y0vKs|qJpC2M z4!4D~=LfgmfYJ!Q@yS1PBD=AcNAd0NqNZTaHpb^g--ogoeolQc>|0?h=k+tT2433E zn}o%khC^|Euwusq%-G5I+QzeQHSxTEL_#qfO5hEn61jencnZcPormv}nE7fl_bpRs ZZOS4|<@7VsnE!Jc;}7lPG)>Yw{sL>?K7s%M diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRankingTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonRankingTest.ser index e3ae79bed23fc6761c4b0784fd6100384da40c9e..7675fc6ef861277b016d85fef506e9e0a1327eae 100644 GIT binary patch delta 22 ecmZof FEj57z(y diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRankingsTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonRankingsTest.ser index 0417587ba8cd280335ad9b606ce19bc48132f5da..0abe8540bcd1ccd4dd75777918e8d9a99d64f5b2 100644 GIT binary patch delta 49 zcmV-10M7s9K(0WLF9_#=5`LC1HW!gMHV9XDd?;?jtI@G_8UYB9*gnPUV)@FGmjUUs HwgRpl20#`U delta 76 zcmV-S0JHzDK;%G>F9=HnfnfPl71EJ6HV7-Q&Nnv@r&)+jlk0@EV`006Up0 diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.ser index 1615f482873991746adaed23bec99a23fe5db7b1..7e9d6fff27182dfa5ff73d0e9014ebc002b8f018 100644 GIT binary patch delta 50 zcmV-20L}m74y_K5EeQMYiF*p;uLhAdHV9XDd?;?jtI@G@7y$_68v}f3QD^A0lK~_F Iv+V+Q1R}f?dH?_b delta 91 zcmZ3>_n2>jE=Rac)ydVf!=_I(HRI6UaL(MEM}uQyu>>Q>;(rTzQp-yJZ=TGk!pL02 rpgz$?Ue+_kHLoPIq|)J5_oP%xR1MQrmmrf?Pj;bR>8 diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.ser index 364327604fb8d36305646a565b1955faac0e0379..9eaf365d560b66e569c1d3269bda48a64eb448b9 100644 GIT binary patch delta 34 ocmeytc!+U=9!JBZ4%45F>Z>Q3)$$iGFfdMLU|^5~V#b030N4Hr^Z)<= delta 61 zcmX@a_=9nR9tXpZjtc={zvfOft7R@?P@l*luk4xPnpcupQt5C_!*T)BWo0G?hKd3P Q2FA$@3=DEW%vewW0Icj1fdBvi diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.ser index cf561604af20177d403950c1ed9a2d4c509a06e4..7b5e27533a3869b2cb828e7f5e76ea47a68ce92b 100644 GIT binary patch delta 49 zcmV-10M7sA9j_gbF9>pic*;DXL!FT~HV9XDd?;?jtI@G_8UYA^l880=fhVhzmjQjV HN&=e<1Tz$2 delta 76 zcmV-S0JHzE9pxR6F9^s~sX!$GTy2pzHV7-Q&Nnv@r&)+jlk0@EV`006TS0-Ov7-5IF> -- 2.10.0