Add bulk request execution and tweaked exception handling.

jonathanedgecombe · Dec 11, 2015 · 981eca1 · 981eca1
1 parent 1aa4ece
commit 981eca1
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 27 deletions.
diff --git a/readme.md b/readme.md
@@ -20,13 +20,16 @@ future.await();
 if (future.getResult().isPresent()) {
 	future.getResult().get().cache(2, TimeUnit.HOURS);
 
-	for (Summoner summoner : future.getResult().get().getValue().values()) {
-		connection.execute(new CurrentGameRequest(
+	CurrentGameRequest[] requests = future.get().values().stream()
+		.map(summoner -> new CurrentGameRequest(
 				Region.EUW, 
 				result -> System.out.println(result), 
-				error -> error.printStackTrace(), 
-				summoner.getId()));
-	}
+				error -> System.out.println(error), 
+				summoner.getId()))
+		.collect(Collectors.toList()).toArray(new CurrentGameRequest[0]);
+
+	FutureList<CurrentGameInfo> futures = connection.execute(requests);
+	futures.await();
 } else {
 	future.getException().get().printStackTrace();
 }

diff --git a/src/main/java/at/lolst/api/APIConnection.java b/src/main/java/at/lolst/api/APIConnection.java
@@ -60,6 +60,17 @@ public <T> Future<T> execute(Request<T> request) throws InterruptedException {
 		return execute(request, true);
 	}
 
+	@SafeVarargs
+	public final <T> FutureList<T> execute(Request<T>... requests) throws InterruptedException {
+		FutureList<T> list = new FutureList<>();
+
+		for (Request<T> request : requests) {
+			list.add(execute(request));
+		}
+
+		return list;
+	}
+
 	public void close() {
 		dispatcher.close();
 	}

diff --git a/src/main/java/at/lolst/api/Future.java b/src/main/java/at/lolst/api/Future.java
@@ -51,4 +51,12 @@ public Optional<RequestException> getException() {
 		if (exceptions.isEmpty()) return Optional.empty();
 		return Optional.of(exceptions.values().iterator().next());
 	}
+
+	public T get() {
+		Optional<Result<T>> result = getResult();
+		if (result.isPresent())
+			return result.get().get();
+
+		return null;
+	}
 }
diff --git a/src/main/java/at/lolst/api/FutureList.java b/src/main/java/at/lolst/api/FutureList.java
@@ -0,0 +1,44 @@
+package at.lolst.api;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
+import at.lolst.api.request.Result;
+
+public final class FutureList<T> extends Future<T> {
+	private final List<Future<T>> futures = new ArrayList<>();
+
+	public FutureList() throws InterruptedException {
+		super();
+	}
+
+	public void add(Future<T> future) {
+		futures.add(future);
+	}
+
+	@Override
+	public void await() throws InterruptedException {
+		for (Future<T> future : futures) {
+			future.await();
+		}
+	}
+
+	@Override
+	public Optional<Result<T>> getResult() {
+		throw new AssertionError("Not implemented");
+	}
+
+	@Override
+	public Map<Request<T>, RequestException> getExceptions() {
+		throw new AssertionError("Not implemented");
+	}
+
+	@Override
+	public Optional<RequestException> getException() {
+		throw new AssertionError("Not implemented");
+	}
+}
diff --git a/src/main/java/at/lolst/api/request/Request.java b/src/main/java/at/lolst/api/request/Request.java
@@ -11,9 +11,9 @@
 public abstract class Request<T> {
 	protected final Region region;
 	protected final Consumer<Result<T>> onCompletion;
-	protected final Consumer<Exception> onError;
+	protected final Consumer<RequestException> onError;
 
-	public Request(Region region, Consumer<Result<T>> onCompletion, Consumer<Exception> onError) {
+	public Request(Region region, Consumer<Result<T>> onCompletion, Consumer<RequestException> onError) {
 		this.region = region;
 		this.onCompletion = onCompletion;
 		this.onError = onError;
@@ -39,11 +39,11 @@ public void accept(Result<T> result) {
 		if (onCompletion != null) onCompletion.accept(result);
 	}
 
-	public Consumer<Exception> getOnError() {
+	public Consumer<RequestException> getOnError() {
 		return onError;
 	}
 
-	public void accept(Exception error) {
+	public void accept(RequestException error) {
 		if (onError != null) onError.accept(error);
 	}
 

diff --git a/src/main/java/at/lolst/api/request/RequestDispatcher.java b/src/main/java/at/lolst/api/request/RequestDispatcher.java
@@ -61,9 +61,9 @@ public Response onCompleted(Response response) throws InterruptedException {
 
 						future.unlock(result);
 					} catch (Exception ex) {
-						request.accept(ex);
-
-						future.unlock(request, new RequestException(500));
+						RequestException re = new RequestException(RequestException.DESERIALIZE_EXCEPTION);
+						request.accept(re);
+						future.unlock(request, re);
 					}
 				} else {
 					RequestException ex = new RequestException(response.getStatusCode());
@@ -77,10 +77,11 @@ public Response onCompleted(Response response) throws InterruptedException {
 
 			@Override
 			public void onThrowable(Throwable error) {
-				request.accept(new Exception(error));
+				RequestException re = new RequestException(RequestException.CONNECTION_EXCEPTION);
+				request.accept(re);
 
 				try {
-					future.unlock(request, new RequestException(500));
+					future.unlock(request, re);
 				} catch (InterruptedException ex) {
 					ex.printStackTrace();
 				}

diff --git a/src/main/java/at/lolst/api/request/RequestException.java b/src/main/java/at/lolst/api/request/RequestException.java
@@ -3,6 +3,9 @@
 public final class RequestException extends Exception {
 	private static final long serialVersionUID = -8978885202197593153L;
 
+	public final static int CONNECTION_EXCEPTION = 600;
+	public final static int DESERIALIZE_EXCEPTION = 601;
+
 	private final int code;
 
 	public RequestException(int code) {

diff --git a/src/main/java/at/lolst/api/request/Result.java b/src/main/java/at/lolst/api/request/Result.java
@@ -19,7 +19,7 @@ public String getJson() {
 		return json;
 	}
 
-	public T getValue() {
+	public T get() {
 		return value;
 	}
 

diff --git a/src/main/java/at/lolst/api/request/champion/ChampionListRequest.java b/src/main/java/at/lolst/api/request/champion/ChampionListRequest.java
@@ -8,6 +8,7 @@
 import at.lolst.api.model.Region;
 import at.lolst.api.model.data.champion.ChampionList;
 import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class ChampionListRequest extends Request<ChampionList> {
@@ -19,7 +20,7 @@ public ChampionListRequest(Region region, boolean freeToPlay) {
 		this(region, null, null, freeToPlay);
 	}
 
-	public ChampionListRequest(Region region, Consumer<Result<ChampionList>> onCompletion, Consumer<Exception> onError, boolean freeToPlay) {
+	public ChampionListRequest(Region region, Consumer<Result<ChampionList>> onCompletion, Consumer<RequestException> onError, boolean freeToPlay) {
 		super(region, onCompletion, onError);
 		this.freeToPlay = freeToPlay;
 	}

diff --git a/src/main/java/at/lolst/api/request/game/CurrentGameRequest.java b/src/main/java/at/lolst/api/request/game/CurrentGameRequest.java
@@ -8,6 +8,7 @@
 import at.lolst.api.model.Region;
 import at.lolst.api.model.currentgame.CurrentGameInfo;
 import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class CurrentGameRequest extends Request<CurrentGameInfo> {
@@ -19,7 +20,7 @@ public CurrentGameRequest(Region region, long summonerId) {
 		this(region, null, null, summonerId);
 	}
 
-	public CurrentGameRequest(Region region, Consumer<Result<CurrentGameInfo>> onCompletion, Consumer<Exception> onError, long summonerId) {
+	public CurrentGameRequest(Region region, Consumer<Result<CurrentGameInfo>> onCompletion, Consumer<RequestException> onError, long summonerId) {
 		super(region, onCompletion, onError);
 		this.summonerId = summonerId;
 	}

diff --git a/src/main/java/at/lolst/api/request/game/RecentGamesRequest.java b/src/main/java/at/lolst/api/request/game/RecentGamesRequest.java
@@ -8,6 +8,7 @@
 import at.lolst.api.model.Region;
 import at.lolst.api.model.game.RecentGames;
 import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class RecentGamesRequest extends Request<RecentGames> {
@@ -19,7 +20,7 @@ public RecentGamesRequest(Region region, long summonerId) {
 		this(region, null, null, summonerId);
 	}
 
-	public RecentGamesRequest(Region region, Consumer<Result<RecentGames>> onCompletion, Consumer<Exception> onError, long summonerId) {
+	public RecentGamesRequest(Region region, Consumer<Result<RecentGames>> onCompletion, Consumer<RequestException> onError, long summonerId) {
 		super(region, onCompletion, onError);
 		this.summonerId = summonerId;
 	}

diff --git a/src/main/java/at/lolst/api/request/match/MatchHistoryRequest.java b/src/main/java/at/lolst/api/request/match/MatchHistoryRequest.java
@@ -8,6 +8,7 @@
 import at.lolst.api.model.Region;
 import at.lolst.api.model.match.history.MatchHistory;
 import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class MatchHistoryRequest extends Request<MatchHistory> {
@@ -20,7 +21,7 @@ public MatchHistoryRequest(Region region, long summonerId, int beginIndex, int e
 		this(region, null, null, summonerId, beginIndex, endIndex);
 	}
 
-	public MatchHistoryRequest(Region region, Consumer<Result<MatchHistory>> onCompletion, Consumer<Exception> onError, long summonerId, int beginIndex, int endIndex) {
+	public MatchHistoryRequest(Region region, Consumer<Result<MatchHistory>> onCompletion, Consumer<RequestException> onError, long summonerId, int beginIndex, int endIndex) {
 		super(region, onCompletion, onError);
 		this.summonerId = summonerId;
 		this.beginIndex = beginIndex;

diff --git a/src/main/java/at/lolst/api/request/match/MatchListRequest.java b/src/main/java/at/lolst/api/request/match/MatchListRequest.java
@@ -8,6 +8,7 @@
 import at.lolst.api.model.Region;
 import at.lolst.api.model.match.history.MatchList;
 import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class MatchListRequest extends Request<MatchList> {
@@ -20,7 +21,7 @@ public MatchListRequest(Region region, long summonerId, long beginTime) {
 		this(region, null, null, summonerId, beginTime);
 	}
 
-	public MatchListRequest(Region region, Consumer<Result<MatchList>> onCompletion, Consumer<Exception> onError, long summonerId, long beginTime) {
+	public MatchListRequest(Region region, Consumer<Result<MatchList>> onCompletion, Consumer<RequestException> onError, long summonerId, long beginTime) {
 		super(region, onCompletion, onError);
 		this.summonerId = summonerId;
 		this.beginTime = beginTime;

diff --git a/src/main/java/at/lolst/api/request/match/MatchRequest.java b/src/main/java/at/lolst/api/request/match/MatchRequest.java
@@ -8,6 +8,7 @@
 import at.lolst.api.model.Region;
 import at.lolst.api.model.match.Match;
 import at.lolst.api.request.Request;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class MatchRequest extends Request<Match> {
@@ -20,7 +21,7 @@ public MatchRequest(Region region, long matchId, boolean includeTimeline) {
 		this(region, null, null, matchId, includeTimeline);
 	}
 
-	public MatchRequest(Region region, Consumer<Result<Match>> onCompletion, Consumer<Exception> onError, long matchId, boolean includeTimeline) {
+	public MatchRequest(Region region, Consumer<Result<Match>> onCompletion, Consumer<RequestException> onError, long matchId, boolean includeTimeline) {
 		super(region, onCompletion, onError);
 		this.matchId = matchId;
 		this.includeTimeline = includeTimeline;

diff --git a/src/main/java/at/lolst/api/request/summoner/SummonerByNameRequest.java b/src/main/java/at/lolst/api/request/summoner/SummonerByNameRequest.java
@@ -15,6 +15,7 @@
 import at.lolst.api.model.summoner.Summoner;
 import at.lolst.api.request.Request;
 import at.lolst.api.request.RequestAggregator;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class SummonerByNameRequest extends Request<Map<String, Summoner>> {
@@ -26,7 +27,7 @@ public SummonerByNameRequest(Region region, String... summonerNames) {
 		this(region, null, null, summonerNames);
 	}
 
-	public SummonerByNameRequest(Region region, Consumer<Result<Map<String, Summoner>>> onCompletion, Consumer<Exception> onError, String... summonerNames) {
+	public SummonerByNameRequest(Region region, Consumer<Result<Map<String, Summoner>>> onCompletion, Consumer<RequestException> onError, String... summonerNames) {
 		super(region, onCompletion, onError);
 		this.summonerNames = Arrays.asList(summonerNames);
 	}

diff --git a/src/main/java/at/lolst/api/request/summoner/SummonerByNameRequestAggregator.java b/src/main/java/at/lolst/api/request/summoner/SummonerByNameRequestAggregator.java
@@ -59,7 +59,7 @@ public Optional<Result<Map<String, Summoner>>> getResult() {
 				for (Future<Map<String, Summoner>> future : futures) {
 					Optional<Result<Map<String, Summoner>>> result = future.getResult();
 					if (result.isPresent()) {
-						map.putAll(result.get().getValue());
+						map.putAll(result.get().get());
 					}
 				}
 
@@ -86,7 +86,7 @@ public void cache(Request<Map<String, Summoner>> request, final Result<Map<Strin
 
 			String key = summonerName.toLowerCase().replace(" ", "");
 			Map<String, Summoner> map = new HashMap<>();
-			map.put(key, result.getValue().get(key));
+			map.put(key, result.get().get(key));
 			Result<Map<String, Summoner>> newResult = new Result<>(result.getJson(), map, request, cache);
 			cache.cache(r, newResult, false, timeout);
 		});

diff --git a/src/main/java/at/lolst/api/request/summoner/SummonerRequest.java b/src/main/java/at/lolst/api/request/summoner/SummonerRequest.java
@@ -15,6 +15,7 @@
 import at.lolst.api.model.summoner.Summoner;
 import at.lolst.api.request.Request;
 import at.lolst.api.request.RequestAggregator;
+import at.lolst.api.request.RequestException;
 import at.lolst.api.request.Result;
 
 public final class SummonerRequest extends Request<Map<String, Summoner>> {
@@ -26,7 +27,7 @@ public SummonerRequest(Region region, Long... summonerIds) {
 		this(region, null, null, summonerIds);
 	}
 
-	public SummonerRequest(Region region, Consumer<Result<Map<String, Summoner>>> onCompletion, Consumer<Exception> onError, Long... summonerIds) {
+	public SummonerRequest(Region region, Consumer<Result<Map<String, Summoner>>> onCompletion, Consumer<RequestException> onError, Long... summonerIds) {
 		super(region, onCompletion, onError);
 		this.summonerIds = Arrays.asList(summonerIds);
 	}

diff --git a/src/main/java/at/lolst/api/request/summoner/SummonerRequestAggregator.java b/src/main/java/at/lolst/api/request/summoner/SummonerRequestAggregator.java
@@ -59,7 +59,7 @@ public Optional<Result<Map<String, Summoner>>> getResult() {
 				for (Future<Map<String, Summoner>> future : futures) {
 					Optional<Result<Map<String, Summoner>>> result = future.getResult();
 					if (result.isPresent()) {
-						map.putAll(result.get().getValue());
+						map.putAll(result.get().get());
 					}
 				}
 
@@ -86,7 +86,7 @@ public void cache(Request<Map<String, Summoner>> request, final Result<Map<Strin
 
 			String key = Long.toString(summonerId);
 			Map<String, Summoner> map = new HashMap<>();
-			map.put(key, result.getValue().get(key));
+			map.put(key, result.get().get(key));
 			Result<Map<String, Summoner>> newResult = new Result<>(result.getJson(), map, request, cache);
 			cache.cache(r, newResult, false, timeout);
 		});