From 882752b7c78bf7efbeee7e462f99c7f3de70b50f Mon Sep 17 00:00:00 2001
From: gotty <gotty@fb0bcced-7025-49ed-a12f-f98bce993226>
Date: Wed, 18 Sep 2019 23:06:50 +0000
Subject: [PATCH] [LIB-8] Add Event Rounds and Seedings functional

git-svn-id: https://svn.hedgecode.org/lib/snooker-score-api/trunk@171 fb0bcced-7025-49ed-a12f-f98bce993226
---
 pom.xml                                            |  17 +-
 src/main/java/org/hedgecode/snooker/api/Round.java |  64 +++++++
 .../java/org/hedgecode/snooker/api/Rounds.java     |  34 ++++
 .../java/org/hedgecode/snooker/api/Seeding.java    |  36 ++++
 .../java/org/hedgecode/snooker/api/Seedings.java   |  34 ++++
 .../org/hedgecode/snooker/api/SnookerScoreAPI.java |   4 +
 .../hedgecode/snooker/cache/CacheSnookerScore.java |  20 +++
 .../snooker/cache/assign/RoundAssigner.java        |  56 +++++++
 .../snooker/cache/assign/RoundsAssigner.java       |  44 +++++
 .../snooker/cache/assign/SeedingAssigner.java      |  56 +++++++
 .../snooker/cache/assign/SeedingsAssigner.java     |  44 +++++
 .../snooker/compare/RoundComparators.java          |  64 +++++++
 .../snooker/compare/SeedingComparators.java        |  75 +++++++++
 .../org/hedgecode/snooker/json/JsonEvents.java     |   1 -
 .../java/org/hedgecode/snooker/json/JsonRound.java | 184 +++++++++++++++++++++
 .../org/hedgecode/snooker/json/JsonRounds.java     |  94 +++++++++++
 .../org/hedgecode/snooker/json/JsonSeeding.java    |  87 ++++++++++
 .../org/hedgecode/snooker/json/JsonSeedings.java   |  89 ++++++++++
 .../hedgecode/snooker/json/JsonSnookerScore.java   |  48 ++++++
 .../snooker/request/EventRoundsRequester.java      |  57 +++++++
 .../snooker/request/EventSeedingRequester.java     |  57 +++++++
 .../org/hedgecode/snooker/request/RequestType.java |   4 +-
 .../org/hedgecode/snooker/json/JsonRoundTest.json  |   1 +
 .../org/hedgecode/snooker/json/JsonRoundTest.ser   | Bin 0 -> 490 bytes
 .../org/hedgecode/snooker/json/JsonRoundsTest.json |   1 +
 .../org/hedgecode/snooker/json/JsonRoundsTest.ser  | Bin 0 -> 1891 bytes
 .../hedgecode/snooker/json/JsonSeedingTest.json    |   1 +
 .../org/hedgecode/snooker/json/JsonSeedingTest.ser | Bin 0 -> 248 bytes
 .../hedgecode/snooker/json/JsonSeedingsTest.json   |   1 +
 .../hedgecode/snooker/json/JsonSeedingsTest.ser    | Bin 0 -> 3813 bytes
 30 files changed, 1163 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/org/hedgecode/snooker/api/Round.java
 create mode 100644 src/main/java/org/hedgecode/snooker/api/Rounds.java
 create mode 100644 src/main/java/org/hedgecode/snooker/api/Seeding.java
 create mode 100644 src/main/java/org/hedgecode/snooker/api/Seedings.java
 create mode 100644 src/main/java/org/hedgecode/snooker/cache/assign/RoundAssigner.java
 create mode 100644 src/main/java/org/hedgecode/snooker/cache/assign/RoundsAssigner.java
 create mode 100644 src/main/java/org/hedgecode/snooker/cache/assign/SeedingAssigner.java
 create mode 100644 src/main/java/org/hedgecode/snooker/cache/assign/SeedingsAssigner.java
 create mode 100644 src/main/java/org/hedgecode/snooker/compare/RoundComparators.java
 create mode 100644 src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java
 create mode 100644 src/main/java/org/hedgecode/snooker/json/JsonRound.java
 create mode 100644 src/main/java/org/hedgecode/snooker/json/JsonRounds.java
 create mode 100644 src/main/java/org/hedgecode/snooker/json/JsonSeeding.java
 create mode 100644 src/main/java/org/hedgecode/snooker/json/JsonSeedings.java
 create mode 100644 src/main/java/org/hedgecode/snooker/request/EventRoundsRequester.java
 create mode 100644 src/main/java/org/hedgecode/snooker/request/EventSeedingRequester.java
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.json
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.ser
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.json
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.ser
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.json
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.ser
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.json
 create mode 100644 src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.ser

diff --git a/pom.xml b/pom.xml
index f171311..95424bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <!--
-  ~ Copyright (c) 2017. Developed by Hedgecode.
+  ~ Copyright (c) 2017-2019. Developed by Hedgecode.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 
     <groupId>org.hedgecode.snooker</groupId>
     <artifactId>snooker-score-api</artifactId>
-    <version>0.1</version>
+    <version>0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Hedgecode Snooker Score API</name>
@@ -68,7 +68,7 @@
         <mavenDependencyPluginVersion>2.8</mavenDependencyPluginVersion>
         <mavenAssemblyPluginVersion>2.4.1</mavenAssemblyPluginVersion>
         <issueComponentId>10012</issueComponentId>
-        <issueNumber>5</issueNumber>
+        <issueNumber>8</issueNumber>
     </properties>
 
     <dependencies>
@@ -219,11 +219,12 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
                             <sourceFileExcludes>
-                                <exclude>org//hedgecode/snooker/cache/assign/*.java</exclude>
-                                <exclude>org//hedgecode/snooker/compare/*.java</exclude>
-                                <exclude>org//hedgecode/snooker/gson/*.java</exclude>
-                                <exclude>org//hedgecode/snooker/json/*.java</exclude>
-                                <exclude>org//hedgecode/snooker/request/*.java</exclude>
+                                <exclude>org/hedgecode/snooker/annotation/*.java</exclude>
+                                <exclude>org/hedgecode/snooker/cache/assign/*.java</exclude>
+                                <exclude>org/hedgecode/snooker/compare/*.java</exclude>
+                                <exclude>org/hedgecode/snooker/gson/*.java</exclude>
+                                <exclude>org/hedgecode/snooker/json/*.java</exclude>
+                                <exclude>org/hedgecode/snooker/request/*.java</exclude>
                             </sourceFileExcludes>
                         </configuration>
                     </plugin>
diff --git a/src/main/java/org/hedgecode/snooker/api/Round.java b/src/main/java/org/hedgecode/snooker/api/Round.java
new file mode 100644
index 0000000..49049ff
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/api/Round.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.api;
+
+/**
+ * Round Entity API Interface.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public interface Round extends IdEntity {
+
+    int round();
+
+    String roundName();
+
+    int eventId();
+
+    Event event();
+
+    int mainEventId();
+
+    Event mainEvent();
+
+    int distance();
+
+    int numLeft();
+
+    int numMatches();
+
+    String note();
+
+    String valueType();
+
+    int rank();
+
+    long money();
+
+    int seedGetsHalf();
+
+    long actualMoney();
+
+    String currency();
+
+    int conversionRate();
+
+    int points();
+
+    int seedPoints();
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/api/Rounds.java b/src/main/java/org/hedgecode/snooker/api/Rounds.java
new file mode 100644
index 0000000..9a6ce79
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/api/Rounds.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.api;
+
+/**
+ * Rounds Entity (set of {@link Round}) API Interface.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public interface Rounds extends CollectionEntity<Round> {
+
+    Round byRound(int roundId);
+    Rounds byRoundName(String roundName);
+    Rounds byEvent(int eventId);
+    Rounds byMainEvent(int mainEventId);
+
+    void sortByRound();
+    void sortByEvent();
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/api/Seeding.java b/src/main/java/org/hedgecode/snooker/api/Seeding.java
new file mode 100644
index 0000000..dfa8484
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/api/Seeding.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.api;
+
+/**
+ * Seeding Entity API Interface.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public interface Seeding extends IdEntity {
+
+    int eventId();
+
+    Event event();
+
+    int playerId();
+
+    Player player();
+
+    int seeding();
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/api/Seedings.java b/src/main/java/org/hedgecode/snooker/api/Seedings.java
new file mode 100644
index 0000000..2901cfd
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/api/Seedings.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.api;
+
+/**
+ * Seedings Entity (set of {@link Seeding}) API Interface.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public interface Seedings extends CollectionEntity<Seeding> {
+
+    Seedings byEvent(int eventId);
+    Seeding byPlayer(int playerId);
+    Seeding bySeeding(int seedingNum);
+
+    void sortByEvent();
+    void sortByPlayer();
+    void sortBySeeding();
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/api/SnookerScoreAPI.java b/src/main/java/org/hedgecode/snooker/api/SnookerScoreAPI.java
index 787f9fd..54d1aa0 100644
--- a/src/main/java/org/hedgecode/snooker/api/SnookerScoreAPI.java
+++ b/src/main/java/org/hedgecode/snooker/api/SnookerScoreAPI.java
@@ -43,6 +43,10 @@ public interface SnookerScoreAPI {
 
     Rankings getRankings(Season season, RankingType type) throws APIException;
 
+    Rounds getEventRounds(int eventId) throws APIException;
+
+    Seedings getEventSeedings(int eventId) throws APIException;
+
     void setCurrentSeason(Season season) throws APIException;
 
     Season currentSeason() throws APIException;
diff --git a/src/main/java/org/hedgecode/snooker/cache/CacheSnookerScore.java b/src/main/java/org/hedgecode/snooker/cache/CacheSnookerScore.java
index df72b51..09c7bbe 100644
--- a/src/main/java/org/hedgecode/snooker/cache/CacheSnookerScore.java
+++ b/src/main/java/org/hedgecode/snooker/cache/CacheSnookerScore.java
@@ -27,13 +27,17 @@ import org.hedgecode.snooker.api.PlayerCategory;
 import org.hedgecode.snooker.api.Players;
 import org.hedgecode.snooker.api.RankingType;
 import org.hedgecode.snooker.api.Rankings;
+import org.hedgecode.snooker.api.Rounds;
 import org.hedgecode.snooker.api.Season;
+import org.hedgecode.snooker.api.Seedings;
 import org.hedgecode.snooker.api.SnookerScoreAPI;
 import org.hedgecode.snooker.cache.assign.EventAssigner;
 import org.hedgecode.snooker.cache.assign.EventsAssigner;
 import org.hedgecode.snooker.cache.assign.MatchAssigner;
 import org.hedgecode.snooker.cache.assign.MatchesAssigner;
 import org.hedgecode.snooker.cache.assign.RankingsAssigner;
+import org.hedgecode.snooker.cache.assign.RoundsAssigner;
+import org.hedgecode.snooker.cache.assign.SeedingsAssigner;
 import org.hedgecode.snooker.json.JsonSnookerScore;
 
 /**
@@ -54,6 +58,8 @@ public class CacheSnookerScore extends JsonSnookerScore implements SnookerScoreA
     private final EventsAssigner eventsAssigner = EventsAssigner.getInstance();
     private final MatchesAssigner matchesAssigner = MatchesAssigner.getInstance();
     private final RankingsAssigner rankingsAssigner = RankingsAssigner.getInstance();
+    private final RoundsAssigner roundsAssigner = RoundsAssigner.getInstance();
+    private final SeedingsAssigner seedingsAssigner = SeedingsAssigner.getInstance();
 
     private static CacheSnookerScore _instance;
 
@@ -181,4 +187,18 @@ public class CacheSnookerScore extends JsonSnookerScore implements SnookerScoreA
         return rankings;
     }
 
+    @Override
+    public Rounds getEventRounds(int eventId) throws APIException {
+        Rounds rounds = super.getEventRounds(eventId);
+        roundsAssigner.assign(rounds);
+        return rounds;
+    }
+
+    @Override
+    public Seedings getEventSeedings(int eventId) throws APIException {
+        Seedings seedings = super.getEventSeedings(eventId);
+        seedingsAssigner.assign(seedings);
+        return seedings;
+    }
+
 }
diff --git a/src/main/java/org/hedgecode/snooker/cache/assign/RoundAssigner.java b/src/main/java/org/hedgecode/snooker/cache/assign/RoundAssigner.java
new file mode 100644
index 0000000..44fa838
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/cache/assign/RoundAssigner.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.cache.assign;
+
+import org.hedgecode.snooker.api.APIException;
+import org.hedgecode.snooker.api.Round;
+import org.hedgecode.snooker.json.JsonRound;
+
+/**
+ * Assigner for Entity fields of {@link Round}.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class RoundAssigner extends CacheIdAssigner<Round> {
+
+    private static RoundAssigner _instance;
+
+    private RoundAssigner() {
+    }
+
+    public static RoundAssigner getInstance() {
+        if (_instance == null)
+            _instance = new RoundAssigner();
+        return _instance;
+    }
+
+    @Override
+    public void assign(Round round) throws APIException {
+        JsonRound jsonRound = (JsonRound) round;
+        jsonRound.setEvent(
+                cacheScore.getCachedEvent(
+                        round.eventId()
+                )
+        );
+        jsonRound.setMainEvent(
+                cacheScore.getCachedEvent(
+                        round.mainEventId()
+                )
+        );
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/cache/assign/RoundsAssigner.java b/src/main/java/org/hedgecode/snooker/cache/assign/RoundsAssigner.java
new file mode 100644
index 0000000..47bf963
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/cache/assign/RoundsAssigner.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.cache.assign;
+
+import org.hedgecode.snooker.api.Round;
+import org.hedgecode.snooker.api.Rounds;
+
+/**
+ * Assigner for Collections of Entities {@link Round}.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class RoundsAssigner
+        extends CacheCollectionAssigner<Round, Rounds, RoundAssigner>
+{
+    private static RoundsAssigner _instance;
+
+    private RoundsAssigner() {
+        super(
+                RoundAssigner.getInstance()
+        );
+    }
+
+    public static RoundsAssigner getInstance() {
+        if (_instance == null)
+            _instance = new RoundsAssigner();
+        return _instance;
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/cache/assign/SeedingAssigner.java b/src/main/java/org/hedgecode/snooker/cache/assign/SeedingAssigner.java
new file mode 100644
index 0000000..7101565
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/cache/assign/SeedingAssigner.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.cache.assign;
+
+import org.hedgecode.snooker.api.APIException;
+import org.hedgecode.snooker.api.Seeding;
+import org.hedgecode.snooker.json.JsonSeeding;
+
+/**
+ * Assigner for Entity fields of {@link Seeding}.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class SeedingAssigner extends CacheIdAssigner<Seeding> {
+
+    private static SeedingAssigner _instance;
+
+    private SeedingAssigner() {
+    }
+
+    public static SeedingAssigner getInstance() {
+        if (_instance == null)
+            _instance = new SeedingAssigner();
+        return _instance;
+    }
+
+    @Override
+    public void assign(Seeding seeding) throws APIException {
+        JsonSeeding jsonSeeding = (JsonSeeding) seeding;
+        jsonSeeding.setEvent(
+                cacheScore.getCachedEvent(
+                        seeding.eventId()
+                )
+        );
+        jsonSeeding.setPlayer(
+                cacheScore.getCachedPlayer(
+                        seeding.playerId()
+                )
+        );
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/cache/assign/SeedingsAssigner.java b/src/main/java/org/hedgecode/snooker/cache/assign/SeedingsAssigner.java
new file mode 100644
index 0000000..bad9c06
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/cache/assign/SeedingsAssigner.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.cache.assign;
+
+import org.hedgecode.snooker.api.Seeding;
+import org.hedgecode.snooker.api.Seedings;
+
+/**
+ * Assigner for Collections of Entities {@link Seeding}.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class SeedingsAssigner
+        extends CacheCollectionAssigner<Seeding, Seedings, SeedingAssigner>
+{
+    private static SeedingsAssigner _instance;
+
+    private SeedingsAssigner() {
+        super(
+                SeedingAssigner.getInstance()
+        );
+    }
+
+    public static SeedingsAssigner getInstance() {
+        if (_instance == null)
+            _instance = new SeedingsAssigner();
+        return _instance;
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java b/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java
new file mode 100644
index 0000000..360a4bd
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/compare/RoundComparators.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.compare;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import org.hedgecode.snooker.api.Round;
+
+/**
+ * Set of Comparators for {@link Round}.
+ * 1. Sorting by Round Number {@link RoundComparator};
+ * 2. Sorting by Event {@link EventComparator};
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public enum RoundComparators {
+
+    ROUND ( new RoundComparator() ),
+    EVENT ( new EventComparator() );
+
+    private Comparator<Round> comparator;
+
+    RoundComparators(Comparator<Round> comparator) {
+        this.comparator = comparator;
+    }
+
+    public Comparator<Round> comparator() {
+        return comparator;
+    }
+
+    static class RoundComparator implements Comparator<Round>, Serializable {
+
+        @Override
+        public int compare(Round round1, Round round2) {
+            return round1.round() - round2.round();
+        }
+
+    }
+
+    static class EventComparator implements Comparator<Round>, Serializable {
+
+        @Override
+        public int compare(Round round1, Round round2) {
+            return round1.eventId() - round2.eventId();
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java b/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java
new file mode 100644
index 0000000..e98c934
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/compare/SeedingComparators.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.compare;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import org.hedgecode.snooker.api.Seeding;
+
+/**
+ * Set of Comparators for {@link Seeding}.
+ * 1. Sorting by Event {@link EventComparator};
+ * 2. Sorting by Player {@link PlayerComparator};
+ * 3. Sorting by Seeding Number {@link SeedingComparator}.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public enum SeedingComparators {
+
+    EVENT   ( new EventComparator() ),
+    PLAYER  ( new PlayerComparator() ),
+    SEEDING ( new SeedingComparator() );
+
+    private Comparator<Seeding> comparator;
+
+    SeedingComparators(Comparator<Seeding> comparator) {
+        this.comparator = comparator;
+    }
+
+    public Comparator<Seeding> comparator() {
+        return comparator;
+    }
+
+    static class EventComparator implements Comparator<Seeding>, Serializable {
+
+        @Override
+        public int compare(Seeding seeding1, Seeding seeding2) {
+            return seeding1.eventId() - seeding2.eventId();
+        }
+
+    }
+
+    static class PlayerComparator implements Comparator<Seeding>, Serializable {
+
+        @Override
+        public int compare(Seeding seeding1, Seeding seeding2) {
+            return seeding1.playerId() - seeding2.playerId();
+        }
+
+    }
+
+    static class SeedingComparator implements Comparator<Seeding>, Serializable {
+
+        @Override
+        public int compare(Seeding seeding1, Seeding seeding2) {
+            return seeding1.seeding() - seeding2.seeding();
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/json/JsonEvents.java b/src/main/java/org/hedgecode/snooker/json/JsonEvents.java
index 664dcd8..3800d49 100644
--- a/src/main/java/org/hedgecode/snooker/json/JsonEvents.java
+++ b/src/main/java/org/hedgecode/snooker/json/JsonEvents.java
@@ -17,7 +17,6 @@
 package org.hedgecode.snooker.json;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
diff --git a/src/main/java/org/hedgecode/snooker/json/JsonRound.java b/src/main/java/org/hedgecode/snooker/json/JsonRound.java
new file mode 100644
index 0000000..7dbb3b1
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/json/JsonRound.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.json;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import org.hedgecode.snooker.api.Event;
+import org.hedgecode.snooker.api.Round;
+
+/**
+ * Round Entity to JSON deserialize.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class JsonRound extends JsonIdEntity implements Round {
+
+    @SerializedName("Round")
+    private int round;
+    @SerializedName("RoundName")
+    private String roundName;
+    @SerializedName("EventID")
+    private int eventId;
+    @Expose
+    private Event event;
+    @SerializedName("MainEvent")
+    private int mainEventId;
+    @Expose
+    private Event mainEvent;
+    @SerializedName("Distance")
+    private int distance;
+    @SerializedName("NumLeft")
+    private int numLeft;
+    @SerializedName("NumMatches")
+    private int numMatches;
+    @SerializedName("Note")
+    private String note;
+    @SerializedName("ValueType")
+    private String valueType;
+    @SerializedName("Rank")
+    private int rank;
+    @SerializedName("Money")
+    private long money;
+    @SerializedName("SeedGetsHalf")
+    private int seedGetsHalf;
+    @SerializedName("ActualMoney")
+    private long actualMoney;
+    @SerializedName("Currency")
+    private String currency;
+    @SerializedName("ConversionRate")
+    private int conversionRate;
+    @SerializedName("Points")
+    private int points;
+    @SerializedName("SeedPoints")
+    private int seedPoints;
+
+    protected JsonRound() {
+    }
+
+    @Override
+    public int round() {
+        return round;
+    }
+
+    @Override
+    public String roundName() {
+        return roundName;
+    }
+
+    @Override
+    public int eventId() {
+        return eventId;
+    }
+
+    @Override
+    public Event event() {
+        return event;
+    }
+
+    public void setEvent(Event event) {
+        if (event != null && eventId == event.eventId())
+            this.event = event;
+    }
+
+    @Override
+    public int mainEventId() {
+        return mainEventId;
+    }
+
+    @Override
+    public Event mainEvent() {
+        return mainEvent;
+    }
+
+    public void setMainEvent(Event mainEvent) {
+        if (mainEvent != null && mainEventId == mainEvent.eventId())
+            this.mainEvent = mainEvent;
+    }
+
+    @Override
+    public int distance() {
+        return distance;
+    }
+
+    @Override
+    public int numLeft() {
+        return numLeft;
+    }
+
+    @Override
+    public int numMatches() {
+        return numMatches;
+    }
+
+    @Override
+    public String note() {
+        return note;
+    }
+
+    @Override
+    public String valueType() {
+        return valueType;
+    }
+
+    @Override
+    public int rank() {
+        return rank;
+    }
+
+    @Override
+    public long money() {
+        return money;
+    }
+
+    @Override
+    public int seedGetsHalf() {
+        return seedGetsHalf;
+    }
+
+    @Override
+    public long actualMoney() {
+        return actualMoney;
+    }
+
+    @Override
+    public String currency() {
+        return currency;
+    }
+
+    @Override
+    public int conversionRate() {
+        return conversionRate;
+    }
+
+    @Override
+    public int points() {
+        return points;
+    }
+
+    @Override
+    public int seedPoints() {
+        return seedPoints;
+    }
+
+    @Override
+    public int getId() {
+        return round;
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/json/JsonRounds.java b/src/main/java/org/hedgecode/snooker/json/JsonRounds.java
new file mode 100644
index 0000000..eaa1a2d
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/json/JsonRounds.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.json;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hedgecode.snooker.api.Round;
+import org.hedgecode.snooker.api.Rounds;
+import org.hedgecode.snooker.compare.RoundComparators;
+
+/**
+ * Rounds Entity (set of {@link Round}) to JSON deserialize.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class JsonRounds extends JsonCollectionEntity<Round> implements Rounds {
+
+    private static final JsonRounds EMPTY = new JsonRounds(new Round[0]);
+
+    protected JsonRounds(Round[] entities) {
+        super(entities);
+    }
+
+    protected JsonRounds(List<Round> entities) {
+        super(entities);
+    }
+
+    @Override
+    public Round byRound(int roundId) {
+        for (Round round : this)
+            if (round.round() == roundId)
+                return round;
+        return null;
+    }
+
+    @Override
+    public Rounds byRoundName(String roundName) {
+        if (roundName == null || roundName.isEmpty())
+            return EMPTY;
+        List<Round> rounds = new ArrayList<>();
+        for (Round round : this)
+            if (roundName.equals(round.roundName()))
+                rounds.add(round);
+        return rounds.isEmpty() ? EMPTY : new JsonRounds(rounds);
+    }
+
+    @Override
+    public Rounds byEvent(int eventId) {
+        List<Round> rounds = new ArrayList<>();
+        for (Round round : this)
+            if (round.eventId() == eventId)
+                rounds.add(round);
+        return rounds.isEmpty() ? EMPTY : new JsonRounds(rounds);
+    }
+
+    @Override
+    public Rounds byMainEvent(int mainEventId) {
+        List<Round> rounds = new ArrayList<>();
+        for (Round round : this)
+            if (round.mainEventId() == mainEventId)
+                rounds.add(round);
+        return rounds.isEmpty() ? EMPTY : new JsonRounds(rounds);
+    }
+
+    @Override
+    public void sortByRound() {
+        sort(
+                RoundComparators.ROUND.comparator()
+        );
+    }
+
+    @Override
+    public void sortByEvent() {
+        sort(
+                RoundComparators.EVENT.comparator()
+        );
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java b/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java
new file mode 100644
index 0000000..6029450
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/json/JsonSeeding.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.json;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import org.hedgecode.snooker.api.Event;
+import org.hedgecode.snooker.api.Player;
+import org.hedgecode.snooker.api.Seeding;
+
+/**
+ * Seeding Entity to JSON deserialize.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class JsonSeeding extends JsonIdEntity implements Seeding {
+
+    @SerializedName("EventID")
+    private int eventId;
+    @Expose
+    private Event event;
+    @SerializedName("PlayerID")
+    private int playerId;
+    @Expose
+    private Player player;
+    @SerializedName("Seeding")
+    private int seeding;
+
+    protected JsonSeeding() {
+    }
+
+    @Override
+    public int eventId() {
+        return eventId;
+    }
+
+    @Override
+    public Event event() {
+        return event;
+    }
+
+    public void setEvent(Event event) {
+        if (event != null && eventId == event.eventId())
+            this.event = event;
+    }
+
+    @Override
+    public int playerId() {
+        return playerId;
+    }
+
+    @Override
+    public Player player() {
+        return player;
+    }
+
+    public void setPlayer(Player player) {
+        if (player != null && playerId == player.playerId())
+            this.player = player;
+    }
+
+    @Override
+    public int seeding() {
+        return seeding;
+    }
+
+    @Override
+    public int getId() {
+        return seeding;
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java b/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java
new file mode 100644
index 0000000..a504cff
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/json/JsonSeedings.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.json;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hedgecode.snooker.api.Seeding;
+import org.hedgecode.snooker.api.Seedings;
+import org.hedgecode.snooker.compare.SeedingComparators;
+
+/**
+ * Seedings Entity (set of {@link Seeding}) to JSON deserialize.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class JsonSeedings extends JsonCollectionEntity<Seeding> implements Seedings {
+
+    private static final JsonSeedings EMPTY = new JsonSeedings(new Seeding[0]);
+
+    protected JsonSeedings(Seeding[] entities) {
+        super(entities);
+    }
+
+    protected JsonSeedings(List<Seeding> entities) {
+        super(entities);
+    }
+
+    @Override
+    public Seedings byEvent(int eventId) {
+        List<Seeding> seedings = new ArrayList<>();
+        for (Seeding seeding : this)
+            if (seeding.eventId() == eventId)
+                seedings.add(seeding);
+        return seedings.isEmpty() ? EMPTY : new JsonSeedings(seedings);
+    }
+
+    @Override
+    public Seeding byPlayer(int playerId) {
+        for (Seeding seeding : this)
+            if (seeding.playerId() == playerId)
+                return seeding;
+        return null;
+    }
+
+    @Override
+    public Seeding bySeeding(int seedingNum) {
+        for (Seeding seeding : this)
+            if (seeding.seeding() == seedingNum)
+                return seeding;
+        return null;
+    }
+
+    @Override
+    public void sortByEvent() {
+        sort(
+                SeedingComparators.EVENT.comparator()
+        );
+    }
+
+    @Override
+    public void sortByPlayer() {
+        sort(
+                SeedingComparators.PLAYER.comparator()
+        );
+    }
+
+    @Override
+    public void sortBySeeding() {
+        sort(
+                SeedingComparators.SEEDING.comparator()
+        );
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/json/JsonSnookerScore.java b/src/main/java/org/hedgecode/snooker/json/JsonSnookerScore.java
index aa27161..6666165 100644
--- a/src/main/java/org/hedgecode/snooker/json/JsonSnookerScore.java
+++ b/src/main/java/org/hedgecode/snooker/json/JsonSnookerScore.java
@@ -29,7 +29,9 @@ import org.hedgecode.snooker.api.PlayerCategory;
 import org.hedgecode.snooker.api.Players;
 import org.hedgecode.snooker.api.RankingType;
 import org.hedgecode.snooker.api.Rankings;
+import org.hedgecode.snooker.api.Rounds;
 import org.hedgecode.snooker.api.Season;
+import org.hedgecode.snooker.api.Seedings;
 import org.hedgecode.snooker.api.SnookerScoreAPI;
 import org.hedgecode.snooker.gson.SnookerGsonBuilder;
 import org.hedgecode.snooker.request.RequestException;
@@ -288,6 +290,52 @@ public class JsonSnookerScore implements SnookerScoreAPI {
     }
 
     @Override
+    public Rounds getEventRounds(int eventId) throws APIException {
+        Rounds rounds;
+        try {
+            rounds = new JsonRounds(
+                    GSON.fromJson(
+                            JsonStringToken.token(
+                                    RequestType.request(
+                                            RequestType.EVENT_ROUNDS,
+                                            eventId
+                                    )
+                            ),
+                            JsonRound[].class
+                    )
+            );
+        } catch (RequestException e) {
+            throw new APIException(
+                    APIException.Type.REQUEST, e.getMessage()
+            );
+        }
+        return rounds;
+    }
+
+    @Override
+    public Seedings getEventSeedings(int eventId) throws APIException {
+        Seedings seedings;
+        try {
+            seedings = new JsonSeedings(
+                    GSON.fromJson(
+                            JsonStringToken.token(
+                                    RequestType.request(
+                                            RequestType.EVENT_SEEDING,
+                                            eventId
+                                    )
+                            ),
+                            JsonSeeding[].class
+                    )
+            );
+        } catch (RequestException e) {
+            throw new APIException(
+                    APIException.Type.REQUEST, e.getMessage()
+            );
+        }
+        return seedings;
+    }
+
+    @Override
     public void setCurrentSeason(Season season) throws APIException {
         throw new APIException(
                 APIException.Type.INFO, "This feature is only available in Cached API"
diff --git a/src/main/java/org/hedgecode/snooker/request/EventRoundsRequester.java b/src/main/java/org/hedgecode/snooker/request/EventRoundsRequester.java
new file mode 100644
index 0000000..0b0ee5c
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/request/EventRoundsRequester.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.request;
+
+/**
+ * Requester of Rounds Info for an Event.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class EventRoundsRequester extends AbstractRequester {
+
+    private static final String EVENT_ROUNDS_URL = API_SNOOKER_URL + "?t=12&e=[EventID]";
+
+    private static final Requester _instance = new EventRoundsRequester();
+
+    private EventRoundsRequester() {
+    }
+
+    public static Requester getInstance() {
+        return _instance;
+    }
+
+    @Override
+    protected String getRequestUrl(int id) throws RequestException {
+        if (!isCorrectId(id))
+            throw new RequestException(EVENT_ROUNDS_URL, "Incorrect Event ID");
+
+        return EVENT_ROUNDS_URL.replace(
+                "[EventID]", String.valueOf(id)
+        );
+    }
+
+    @Override
+    protected String getRequestUrl(RequestParams params) throws RequestException {
+        if (params == null || !isCorrectId(params.getEventId()))
+            throw new RequestException(EVENT_ROUNDS_URL, "Incorrect Event ID");
+
+        return EVENT_ROUNDS_URL.replace(
+                "[EventID]", String.valueOf(params.getEventId())
+        );
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/request/EventSeedingRequester.java b/src/main/java/org/hedgecode/snooker/request/EventSeedingRequester.java
new file mode 100644
index 0000000..fc50215
--- /dev/null
+++ b/src/main/java/org/hedgecode/snooker/request/EventSeedingRequester.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017-2019. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.snooker.request;
+
+/**
+ * Requester of Seeding for an Event.
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class EventSeedingRequester extends AbstractRequester {
+
+    private static final String EVENT_SEEDING_URL = API_SNOOKER_URL + "?t=13&e=[EventID]";
+
+    private static final Requester _instance = new EventSeedingRequester();
+
+    private EventSeedingRequester() {
+    }
+
+    public static Requester getInstance() {
+        return _instance;
+    }
+
+    @Override
+    protected String getRequestUrl(int id) throws RequestException {
+        if (!isCorrectId(id))
+            throw new RequestException(EVENT_SEEDING_URL, "Incorrect Event ID");
+
+        return EVENT_SEEDING_URL.replace(
+                "[EventID]", String.valueOf(id)
+        );
+    }
+
+    @Override
+    protected String getRequestUrl(RequestParams params) throws RequestException {
+        if (params == null || !isCorrectId(params.getEventId()))
+            throw new RequestException(EVENT_SEEDING_URL, "Incorrect Event ID");
+
+        return EVENT_SEEDING_URL.replace(
+                "[EventID]", String.valueOf(params.getEventId())
+        );
+    }
+
+}
diff --git a/src/main/java/org/hedgecode/snooker/request/RequestType.java b/src/main/java/org/hedgecode/snooker/request/RequestType.java
index d62bbb1..47ddf35 100644
--- a/src/main/java/org/hedgecode/snooker/request/RequestType.java
+++ b/src/main/java/org/hedgecode/snooker/request/RequestType.java
@@ -32,7 +32,9 @@ public enum RequestType {
     PLAYER_MATCHES  ( PlayerMatchesRequester.getInstance()  ),
     EVENT_PLAYERS   ( EventPlayersRequester.getInstance()   ),
     SEASON_PLAYERS  ( SeasonPlayersRequester.getInstance()  ),
-    RANKING         ( RankingRequester.getInstance()        );
+    RANKING         ( RankingRequester.getInstance()        ),
+    EVENT_ROUNDS    ( EventRoundsRequester.getInstance()    ),
+    EVENT_SEEDING   ( EventSeedingRequester.getInstance()   );
 
     private Requester requester;
 
diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.json b/src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.json
new file mode 100644
index 0000000..d8fc8d7
--- /dev/null
+++ b/src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.json
@@ -0,0 +1 @@
+[{"Round": 1,"RoundName": "Qual Round 1","EventID": 398,"MainEvent": 403,"Distance": 5,"NumLeft": 128,"NumMatches": 32,"Note": "","ValueType": "SM","Rank": 160,"Money": 0,"SeedGetsHalf": 1,"ActualMoney": 0,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0}]
\ No newline at end of file
diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonRoundTest.ser
new file mode 100644
index 0000000000000000000000000000000000000000..5c9cbb3e9f58f134e2ac206b85b4a292932525de
GIT binary patch
literal 490
zcmaix!AiqG5Qe9*vDFq2`T`XNJtcS)FCrA(l1jC{z>-YUw8?DTOhS7RA3(hL0tK(W
zjo@4O3hE{;?a_tV{bu$b_-FUy8|+NOvC^S4#vnvr1?Xg?)D*Qd$rL#~v)!wlg7=@r
z3l{mW1qVH7NuP5W_Z8t>z@D$DK%GTKDj5YdgD7K3zQG0-NGt*YtwcuDU1mM7lVxv%
z^2Eat3)nT(m+X%*6R@4Ch}b|~OPUI>b?HGsJ3|bvk+T~ak4#UQ4l1b!O+VKf$)7Xq
zdlOkmH<lE-L)H<67arJ^6^294%<Hb_byxGcGL78IpV98D%|5~tSRT|#F_v62mz9}Y
znXC(ijB|XLr^~`j!^uBSDuOO?#PiFq)ANP(d1L|1QrN7TK^vg<YT|8EhG)Z_RlYE1
csVf5*wyv)RY04$G@66|Ps&DI@F<8U?A2FGc{{R30

literal 0
HcmV?d00001

diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.json b/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.json
new file mode 100644
index 0000000..53c612a
--- /dev/null
+++ b/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.json
@@ -0,0 +1 @@
+[{"Round": 1,"RoundName": "Qual Round 1","EventID": 398,"MainEvent": 403,"Distance": 5,"NumLeft": 128,"NumMatches": 32,"Note": "","ValueType": "SM","Rank": 160,"Money": 0,"SeedGetsHalf": 1,"ActualMoney": 0,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 2,"RoundName": "Qual Round 2","EventID": 398,"MainEvent": 403,"Distance": 5,"NumLeft": 96,"NumMatches": 32,"Note": "","ValueType": "SM","Rank": 150,"Money": 500,"SeedGetsHalf": 1,"ActualMoney": 500,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 3,"RoundName": "Qual Round 3","EventID": 398,"MainEvent": 403,"Distance": 5,"NumLeft": 64,"NumMatches": 16,"Note": "","ValueType": "SM","Rank": 140,"Money": 2000,"SeedGetsHalf": 0,"ActualMoney": 2000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 4,"RoundName": "Qual Round 4","EventID": 398,"MainEvent": 403,"Distance": 5,"NumLeft": 48,"NumMatches": 16,"Note": "","ValueType": "SM","Rank": 130,"Money": 3000,"SeedGetsHalf": 1,"ActualMoney": 3000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 16,"RoundName": "Wild Card Round","EventID": 403,"MainEvent": 403,"Distance": 5,"NumLeft": 40,"NumMatches": 8,"Note": "","ValueType": "SM","Rank": 100,"Money": 6000,"SeedGetsHalf": 0,"ActualMoney": 6000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 7,"RoundName": "Round 1","EventID": 403,"MainEvent": 403,"Distance": 5,"NumLeft": 32,"NumMatches": 16,"Note": "","ValueType": "SM","Rank": 90,"Money": 6000,"SeedGetsHalf": 1,"ActualMoney": 6000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 8,"RoundName": "Round 2","EventID": 403,"MainEvent": 403,"Distance": 5,"NumLeft": 16,"NumMatches": 8,"Note": "","ValueType": "SM","Rank": 80,"Money": 8000,"SeedGetsHalf": 0,"ActualMoney": 8000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 13,"RoundName": "Quarterfinals","EventID": 403,"MainEvent": 403,"Distance": 5,"NumLeft": 8,"NumMatches": 4,"Note": "","ValueType": "SM","Rank": 30,"Money": 12000,"SeedGetsHalf": 0,"ActualMoney": 12000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 14,"RoundName": "Semifinals","EventID": 403,"MainEvent": 403,"Distance": 6,"NumLeft": 4,"NumMatches": 2,"Note": "","ValueType": "SM","Rank": 20,"Money": 19500,"SeedGetsHalf": 0,"ActualMoney": 19500,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 15,"RoundName": "Final","EventID": 403,"MainEvent": 403,"Distance": 10,"NumLeft": 2,"NumMatches": 1,"Note": "","ValueType": "SM","Rank": 10,"Money": 35000,"SeedGetsHalf": 0,"ActualMoney": 35000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0},{"Round": 17,"RoundName": "Final","EventID": 403,"MainEvent": 403,"Distance": 0,"NumLeft": 1,"NumMatches": 0,"Note": "","ValueType": "SM","Rank": 5,"Money": 85000,"SeedGetsHalf": 0,"ActualMoney": 85000,"Currency": "GBP","ConversionRate": 1,"Points": 0,"SeedPoints": 0}]
\ No newline at end of file
diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonRoundsTest.ser
new file mode 100644
index 0000000000000000000000000000000000000000..1615f482873991746adaed23bec99a23fe5db7b1
GIT binary patch
literal 1891
zcma)+O=uHA6o6lo#-vHwq*e5!MpP^)8~>n+f<>{qWm~Hi1@YjxJ5APZX4lzCY(0p2
zP(ktH-@!{kZ+h_PQSszO6v2Zh@$OCVAgJ$6lDb<{;=r4}yqP!O``bSM2B}cOW?xo}
zDt9W}_8o47!uMynG%kd`Fvf8^;n#%|p5A}??X$<H9wh+gB$T`O9P&Mn+sgIDVWC_#
zzxBntk&*mxCILMbWH{Me9x5nU7g&Rp>&o@Y6D-&_7hphZ$Yzkuuv{_Aoue$Q;_2>J
zlV^+GtDpGD8OSl)=3#hDI$UBvgMWQmw^QlQuivab_aO<1G01v8bH<phd}%_Ts!ASK
zeb1Q-4vYe={G|-;MU)%{(0t5eqGFgr@d}qiUl*SKxOQ_7qD@FOm{;crEo!K~H(9Tp
z=kmt$2WxZpzucxG1^8GGKDMb#sdRat{93rf8};7_SUFCqsXFr}e8J~U7_fcO;4;Ko
zo?wcbka65lF=3;c<_)Z+>6nnKF;^UJ{u+l=t?8Q<^_s<JlnGhXCYZ9TJTzfN;JZSh
z(kq#m#e^ia*o1t@xpRc8@F??U(1(6b>8sc@yDlXc_Pm0jX45F|^0bn!sO+;Kr9)A$
z!NPpYi{n&ojZ>KgZdu2Ncl#EDy$DwzZ$Yo{6(>E1hdP)^R$Daaa-W<Jng*=<mM$eV
zo#xbyej47pkodT<-45)CUOl*{use5A?zL?6=PF7Gh1LQJ-6H`7$s-4+f<Td)KaR~Q
z>9&=2C`e3CgcN!j?<KUBB^UJkP8-S+l(wHkdkKZsLlg|L3u<Q^m5id&?_2ImP})9<
zXEfQg?w};KhTF1P?TVv%qo~|V^z4w8wr|I?HtIU+y{)^;qjtwp#VBe`5J6#|+P%{D
zVLYR6mX?Fk#>P>F)2`=~4l(I88y2Uf|C?5d5YC`Z&Hi^X(jA8)6Q!&lZFy3sA~|V0
z<<QP)Dx$}8YEhQVLw}TFeCbTlb|O$?Xstu(*BWlIdFaO}mx{|7S1=F%Q%A>qAj-0~
zp)1v5MLZ*ICk~A^tyL%kTEi{I%1-l|+X+;Nf^M}Z55KQy>9l?E`@y&A`zv$=rN$_m
bcrt?#Mvq0s(T$BUVs`y9whsooG3MY8&+n1X

literal 0
HcmV?d00001

diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.json b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.json
new file mode 100644
index 0000000..62fc83b
--- /dev/null
+++ b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.json
@@ -0,0 +1 @@
+[{"EventID": 403,"PlayerID": 30,"Seeding": 1}]
\ No newline at end of file
diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingTest.ser
new file mode 100644
index 0000000000000000000000000000000000000000..364327604fb8d36305646a565b1955faac0e0379
GIT binary patch
literal 248
zcmZ4UmVvdnh(RsCC|xfjH6=YYIX@*;uQ)G1KRdNZFRM5|PtOZT1gEB^Wagza{OGt4
z5cX>>69cO!1AA&&YF>$FiYEg{K~7?2Y7vOZUJOy`!@vrbE@4pg0h+B3H(MWSwtiwk
zroJo41Zy7#Hi!Ww3`%$u2Y@ZHt|($qC*WGo6xY0x%#uonYZ{gdm@X?bF)&mVFfcGq
NW?*2D17gO40st4FRUZHV

literal 0
HcmV?d00001

diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.json b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.json
new file mode 100644
index 0000000..4b6cbec
--- /dev/null
+++ b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.json
@@ -0,0 +1 @@
+[{"EventID": 403,"PlayerID": 30,"Seeding": 1},{"EventID": 403,"PlayerID": 17,"Seeding": 2},{"EventID": 403,"PlayerID": 224,"Seeding": 3},{"EventID": 403,"PlayerID": 154,"Seeding": 4},{"EventID": 403,"PlayerID": 97,"Seeding": 5},{"EventID": 403,"PlayerID": 12,"Seeding": 6},{"EventID": 403,"PlayerID": 16,"Seeding": 7},{"EventID": 403,"PlayerID": 168,"Seeding": 8},{"EventID": 403,"PlayerID": 62,"Seeding": 9},{"EventID": 403,"PlayerID": 202,"Seeding": 10},{"EventID": 403,"PlayerID": 237,"Seeding": 11},{"EventID": 403,"PlayerID": 4,"Seeding": 12},{"EventID": 403,"PlayerID": 1,"Seeding": 13},{"EventID": 403,"PlayerID": 2,"Seeding": 14},{"EventID": 403,"PlayerID": 171,"Seeding": 15},{"EventID": 403,"PlayerID": 52,"Seeding": 16},{"EventID": 403,"PlayerID": 15,"Seeding": 17},{"EventID": 403,"PlayerID": 92,"Seeding": 18},{"EventID": 403,"PlayerID": 68,"Seeding": 19},{"EventID": 403,"PlayerID": 200,"Seeding": 20},{"EventID": 403,"PlayerID": 24,"Seeding": 21},{"EventID": 403,"PlayerID": 22,"Seeding": 22},{"EventID": 403,"PlayerID": 125,"Seeding": 23},{"EventID": 403,"PlayerID": 27,"Seeding": 24},{"EventID": 403,"PlayerID": 44,"Seeding": 25},{"EventID": 403,"PlayerID": 63,"Seeding": 26},{"EventID": 403,"PlayerID": 47,"Seeding": 27},{"EventID": 403,"PlayerID": 158,"Seeding": 28},{"EventID": 403,"PlayerID": 42,"Seeding": 29},{"EventID": 403,"PlayerID": 10,"Seeding": 30},{"EventID": 403,"PlayerID": 546,"Seeding": 31},{"EventID": 403,"PlayerID": 19,"Seeding": 32},{"EventID": 403,"PlayerID": 9,"Seeding": 33},{"EventID": 403,"PlayerID": 28,"Seeding": 34},{"EventID": 403,"PlayerID": 177,"Seeding": 35},{"EventID": 403,"PlayerID": 61,"Seeding": 36},{"EventID": 403,"PlayerID": 118,"Seeding": 37},{"EventID": 403,"PlayerID": 33,"Seeding": 38},{"EventID": 403,"PlayerID": 38,"Seeding": 39},{"EventID": 403,"PlayerID": 48,"Seeding": 40},{"EventID": 403,"PlayerID": 93,"Seeding": 41},{"EventID": 403,"PlayerID": 53,"Seeding": 42},{"EventID": 403,"PlayerID": 101,"Seeding": 43},{"EventID": 403,"PlayerID": 54,"Seeding": 44},{"EventID": 403,"PlayerID": 217,"Seeding": 45},{"EventID": 403,"PlayerID": 170,"Seeding": 46},{"EventID": 403,"PlayerID": 25,"Seeding": 47},{"EventID": 403,"PlayerID": 96,"Seeding": 48},{"EventID": 403,"PlayerID": 108,"Seeding": 49},{"EventID": 403,"PlayerID": 582,"Seeding": 50},{"EventID": 403,"PlayerID": 85,"Seeding": 51},{"EventID": 403,"PlayerID": 184,"Seeding": 52},{"EventID": 403,"PlayerID": 39,"Seeding": 53},{"EventID": 403,"PlayerID": 190,"Seeding": 54},{"EventID": 403,"PlayerID": 295,"Seeding": 55},{"EventID": 403,"PlayerID": 549,"Seeding": 56},{"EventID": 403,"PlayerID": 128,"Seeding": 57},{"EventID": 403,"PlayerID": 35,"Seeding": 58},{"EventID": 403,"PlayerID": 37,"Seeding": 59},{"EventID": 403,"PlayerID": 8,"Seeding": 60},{"EventID": 403,"PlayerID": 115,"Seeding": 61},{"EventID": 403,"PlayerID": 50,"Seeding": 62},{"EventID": 403,"PlayerID": 507,"Seeding": 63},{"EventID": 403,"PlayerID": 76,"Seeding": 64},{"EventID": 403,"PlayerID": 131,"Seeding": 65},{"EventID": 403,"PlayerID": 45,"Seeding": 66},{"EventID": 403,"PlayerID": 906,"Seeding": 67},{"EventID": 403,"PlayerID": 592,"Seeding": 68},{"EventID": 403,"PlayerID": 218,"Seeding": 69},{"EventID": 403,"PlayerID": 87,"Seeding": 70},{"EventID": 403,"PlayerID": 81,"Seeding": 71},{"EventID": 403,"PlayerID": 169,"Seeding": 72},{"EventID": 403,"PlayerID": 497,"Seeding": 73},{"EventID": 403,"PlayerID": 49,"Seeding": 74},{"EventID": 403,"PlayerID": 34,"Seeding": 75},{"EventID": 403,"PlayerID": 894,"Seeding": 76},{"EventID": 403,"PlayerID": 6,"Seeding": 77},{"EventID": 403,"PlayerID": 1168,"Seeding": 78},{"EventID": 403,"PlayerID": 89,"Seeding": 79},{"EventID": 403,"PlayerID": 41,"Seeding": 80},{"EventID": 403,"PlayerID": 528,"Seeding": 81},{"EventID": 403,"PlayerID": 520,"Seeding": 82},{"EventID": 403,"PlayerID": 216,"Seeding": 83},{"EventID": 403,"PlayerID": 67,"Seeding": 84},{"EventID": 403,"PlayerID": 666,"Seeding": 85},{"EventID": 403,"PlayerID": 510,"Seeding": 86},{"EventID": 403,"PlayerID": 908,"Seeding": 87},{"EventID": 403,"PlayerID": 82,"Seeding": 88},{"EventID": 403,"PlayerID": 605,"Seeding": 89},{"EventID": 403,"PlayerID": 26,"Seeding": 90},{"EventID": 403,"PlayerID": 1044,"Seeding": 91},{"EventID": 403,"PlayerID": 534,"Seeding": 92},{"EventID": 403,"PlayerID": 193,"Seeding": 93},{"EventID": 403,"PlayerID": 3,"Seeding": 94},{"EventID": 403,"PlayerID": 14,"Seeding": 95},{"EventID": 403,"PlayerID": 23,"Seeding": 96},{"EventID": 403,"PlayerID": 32,"Seeding": 97},{"EventID": 403,"PlayerID": 120,"Seeding": 98},{"EventID": 403,"PlayerID": 151,"Seeding": 99},{"EventID": 403,"PlayerID": 269,"Seeding": 100},{"EventID": 403,"PlayerID": 448,"Seeding": 101},{"EventID": 403,"PlayerID": 521,"Seeding": 102},{"EventID": 403,"PlayerID": 523,"Seeding": 103},{"EventID": 403,"PlayerID": 552,"Seeding": 104},{"EventID": 403,"PlayerID": 620,"Seeding": 105},{"EventID": 403,"PlayerID": 621,"Seeding": 106},{"EventID": 403,"PlayerID": 898,"Seeding": 107},{"EventID": 403,"PlayerID": 917,"Seeding": 108}]
\ No newline at end of file
diff --git a/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.ser b/src/test/resources/org/hedgecode/snooker/json/JsonSeedingsTest.ser
new file mode 100644
index 0000000000000000000000000000000000000000..cf561604af20177d403950c1ed9a2d4c509a06e4
GIT binary patch
literal 3813
zcmajhOH5o<7zgk(cNk`PKg%1+qr71TD9=(JEsrvEpu8y*S}rrU!@y-`oEeZVY}6)d
z)P;#QCMKFLTv+WwcdiVLo5qFFm>BJ<ao>e2jZKXI3q=3lMrLty^8L>F&U5ZPkDe<>
zJf`X+v7md)2m}p(Bw)DX;Yei1h`G1pk+6Fbk9orggu=o2lZA)FwYIfgO{s&J@|@CY
zBx0I|KM{(A$HIwF;!g9I-}m&SH@Gxq^C_2M#X?3rp|X72`o8YjON30%lpgIrh+;^E
zR?Kb1+`dqF#|TX5@hxcQ;q+RzdH4cJR#lqr_Z#u}wOGK2VL&<mwK=Kna6WzfZNbKm
zcBPH0R5PLn#&v%p67#B*#8%9RZ$-?&L3C(XS--=VT}s)kl8FHvCo}bM(CrN;jGz(A
z{q4c0f4uf)FS_<B$G&dv8R#_osMDi*(|fy{M(mA8_si2hc=nF9NKquSAz9riOLelq
z>d&`+m|6PkV@)}{%4zIljl2P`az#!3juEqp&iL_G_>|*_6ROIG+@60o&vUYQ9z7cJ
zj9D4_eJc4lK|)pkPvx1TPWmyW(~g5TaJ-?zKR5I}(0-~pnW^o4%(lXsaWoo#N!?XW
zl(nN$DuR~gSP@dY&}UFPX_C;7ph=_-p*qw-nk+OOnoQ~xnhkZ5x`ciPb&;kB9fYQk
zrV9NIno61`^f@$*G+k&CG@Ud<sC7;=NHc|EM^q+hme4PtS)|!QJE7U6IYP6bIi$Hl
z*Pywic|u2_d8GM5pFs0T&j>Aoo*^v|S^zB|Efo3+w2-t&XeqRav{+~hw3xI+=n%Ao
zv{a}ET1r|b^b=?qX}QoQXgO(xQ2d`%1?gE<tr~ikw31cjK`TkCgr-2NNUMdGL90n?
zgnk9BAw4H_0D6wJR_H#omb6Z26||1DUT7V(p0q(|8?=G6QRq6fk+ex@7qp4AS*QVR
zCT$Vg4Q(N975Xc*mDDZtbEuotBeWRmA#D@70c|5~7ivP=Njq5akyNUK^gOFtgq|nu
z6#6x^le9}{J+zCoTj)2?ZqgoBo7J|5w3k(@h4zy6v8q?0eWVwJ)<7?i_6xN#_mf@}
zipzq!NID=i4jmvJ6xsnDBpqV4y?_pp4znsBbeQy#(0kBJq?d)ZLNAk!u-e~-j*yPB
zYBSJL(lJ)`6goyaE_4|>PI^V?Ec6QLgwTi32~sbs?RTh`bdpuILnleE3bo#oS4n-W
z_PbCY=@hF<hE9=AvnIU<ohH4;s#c)aNN0pLLT5;4SvBjfGD|uq)H;)Mr1Pxm7wA0c
zg3uA@0_h^FX5GFPNtak{e?yl@ms#!aLYGOev#L4hb<!19&3Zqtkgl?-66h-F4c4T5
z=nc{}R?WIItdXv>s>jfE(wjo<(3_;Ugl0l-k!}brgl>@PLMx#<>88*F=q9OO=!Z~0
zX@J$10S%BELJy$^>1|fcx)t0e4GK+z21&PsHbA#XLqe_ZQHXR~=q_}dbcfacI&_EB
M6nY<OMxzJnA56IEDF6Tf

literal 0
HcmV?d00001

-- 
2.10.0