Some fixes

loldevs · Jan 25, 2015 · 4d356b8 · 4d356b8
1 parent e35a45d
commit 4d356b8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/rest/src/main/java/net/boreeas/riotapi/rest/ApiHandler.java b/rest/src/main/java/net/boreeas/riotapi/rest/ApiHandler.java
@@ -1049,7 +1049,7 @@ public ShardStatus getShardStatus(Shard shard) {
      * @return The match details.
      * @see <a href="https://developer.riotgames.com/api/methods#!/806/2848">Official API Documentation</a>
      */
-    public Match getMatch(long matchId) {
+    public MatchDetail getMatch(long matchId) {
         return getMatch(matchId, true);
     }
 
@@ -1061,7 +1061,7 @@ public Match getMatch(long matchId) {
      * @return The match details.
      * @see <a href="https://developer.riotgames.com/api/methods#!/806/2848">Official API Documentation</a>
      */
-    public Match getMatch(long matchId, boolean includeTimeline) {
+    public MatchDetail getMatch(long matchId, boolean includeTimeline) {
         WebTarget tgt = matchInfoTarget.path("" + matchId).queryParam("includeTimeline", includeTimeline);
         return gson.fromJson($(tgt), MatchDetail.class);
     }

diff --git a/rest/src/main/java/net/boreeas/riotapi/rest/Match.java b/rest/src/main/java/net/boreeas/riotapi/rest/Match.java
@@ -20,7 +20,6 @@
 import net.boreeas.riotapi.com.riotgames.platform.game.GameMode;
 import net.boreeas.riotapi.com.riotgames.platform.game.GameType;
 import net.boreeas.riotapi.com.riotgames.platform.game.QueueType;
-import net.boreeas.riotapi.com.riotgames.team.dto.Team;
 import net.boreeas.riotapi.constants.Season;
 
 import java.util.ArrayList;
@@ -44,7 +43,5 @@ public class Match {
     private GameType matchType;
     private QueueType queueType;
     private String platformId;
-    private List<Team> teams = new ArrayList<>();
-    private MatchTimeline timeline;
     private Season season;
 }
diff --git a/rest/src/main/java/net/boreeas/riotapi/rest/MatchSummary.java b/rest/src/main/java/net/boreeas/riotapi/rest/MatchSummary.java
@@ -17,13 +17,11 @@
 package net.boreeas.riotapi.rest;
 
 import lombok.Getter;
-import net.boreeas.riotapi.constants.Season;
 
 /**
  * This class is no longer needed, but for compatibility reasons can't be removed
  * @author Malte Schütze
  */
 @Getter
 public class MatchSummary extends Match {
-    private Season season;
 }
diff --git a/rest/src/main/java/net/boreeas/riotapi/rest/ThrottledApiHandler.java b/rest/src/main/java/net/boreeas/riotapi/rest/ThrottledApiHandler.java
@@ -903,7 +903,7 @@ public Future<ShardStatus> getShardStatus(Shard shard) {
      * @return The match details.
      * @see <a href="https://developer.riotgames.com/api/methods#!/806/2848">Official API Documentation</a>
      */
-    public Future<Match> getMatch(long matchId) {
+    public Future<MatchDetail> getMatch(long matchId) {
         return new ApiFuture<>(() -> handler.getMatch(matchId));
     }
 
@@ -914,7 +914,7 @@ public Future<Match> getMatch(long matchId) {
      * @return The match details.
      * @see <a href="https://developer.riotgames.com/api/methods#!/806/2848">Official API Documentation</a>
      */
-    public Future<Match> getMatch(long matchId, boolean includeTimeline) {
+    public Future<MatchDetail> getMatch(long matchId, boolean includeTimeline) {
         return new ApiFuture<>(() -> handler.getMatch(matchId, includeTimeline));
     }
     // </editor-fold>