diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java index 2f5d6164b..1a2ff61e5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java @@ -74,7 +74,7 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler { } public void printLog(int statusCode, long finishedTime) { - _accesslog.debug(remoteIp+","+statusCode+","+uri+","+(finishedTime-requestTime)); + _accesslog.debug(remoteIp + "," + statusCode + "," + uri + "," + (finishedTime - requestTime)); } } @@ -138,8 +138,9 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler { try { String ipAddress = ((InetSocketAddress) e.getRemoteAddress()).getAddress().getHostAddress(); if (isBanned(ipAddress)) - throw new HttpProcessingException(404); - _uriRequestHandler.handleRequest(uri, request, _objects, responseWriter, e); + responseWriter.writeError(404); + else + _uriRequestHandler.handleRequest(uri, request, _objects, responseWriter, e); } catch (HttpProcessingException exp) { responseWriter.writeError(exp.getStatus()); } catch (Exception exp) { diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java index e5d9c608c..35d1a9a98 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java @@ -97,7 +97,7 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur } else if (uri.equals("/findMultipleAccounts") && request.getMethod() == HttpMethod.POST) { findMultipleAccounts(request, responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java index 80dae8e55..4fb1d2618 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java @@ -44,7 +44,7 @@ public class ChatRequestHandler extends LotroServerRequestHandler implements Uri } else if (uri.startsWith("/") && request.getMethod() == HttpMethod.POST) { postMessages(request, URLDecoder.decode(uri.substring(1)), responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/CollectionRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/CollectionRequestHandler.java index e6657e258..8c950c171 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/CollectionRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/CollectionRequestHandler.java @@ -65,7 +65,7 @@ public class CollectionRequestHandler extends LotroServerRequestHandler implemen } else if (uri.startsWith("/") && request.getMethod() == HttpMethod.GET) { getCollection(request, uri.substring(1), responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java index 5c8d0547b..cfad0fc99 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java @@ -56,7 +56,7 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri } else if (uri.equals("/stats") && request.getMethod() == HttpMethod.POST) { getDeckStats(request, responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeliveryRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeliveryRequestHandler.java index e77df04a3..6a7219841 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeliveryRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeliveryRequestHandler.java @@ -29,7 +29,7 @@ public class DeliveryRequestHandler extends LotroServerRequestHandler implements if (uri.equals("") && request.getMethod() == HttpMethod.GET) { getDelivery(request, responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameHistoryRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameHistoryRequestHandler.java index be4ada624..b47c490f1 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameHistoryRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameHistoryRequestHandler.java @@ -81,7 +81,7 @@ public class GameHistoryRequestHandler extends LotroServerRequestHandler impleme responseWriter.writeXmlResponse(doc); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java index 321aa1226..5e2371dd7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java @@ -60,7 +60,7 @@ public class GameRequestHandler extends LotroServerRequestHandler implements Uri } else if (uri.startsWith("/") && request.getMethod() == HttpMethod.POST) { updateGameState(request, uri.substring(1), responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } @@ -90,11 +90,11 @@ public class GameRequestHandler extends LotroServerRequestHandler implements Uri GameUpdateLongPollingResource pollingResource = new GameUpdateLongPollingResource(pollableResource, channelNumber, gameMediator, resourceOwner, responseWriter); _longPollingSystem.processLongPollingResource(pollingResource, pollableResource); } catch (SubscriptionConflictException exp) { - responseWriter.writeError(409); + throw new HttpProcessingException(409); } catch (PrivateInformationException e) { - responseWriter.writeError(403); + throw new HttpProcessingException(403); } catch (SubscriptionExpiredException e) { - responseWriter.writeError(410); + throw new HttpProcessingException(410); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LeagueRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LeagueRequestHandler.java index d4105f335..b9f41b319 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LeagueRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LeagueRequestHandler.java @@ -54,7 +54,7 @@ public class LeagueRequestHandler extends LotroServerRequestHandler implements U } else if (uri.startsWith("/") && request.getMethod() == HttpMethod.POST) { joinLeague(request, uri.substring(1), responseWriter, e); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } @@ -94,13 +94,15 @@ public class LeagueRequestHandler extends LotroServerRequestHandler implements U final List series = leagueData.getSeries(); int end = series.get(series.size() - 1).getEnd(); + int start = series.get(0).getStart(); + int currentDate = DateUtils.getCurrentDate(); Element leagueElem = doc.createElement("league"); boolean inLeague = _leagueService.isPlayerInLeague(league, resourceOwner); leagueElem.setAttribute("member", String.valueOf(inLeague)); - leagueElem.setAttribute("joinable", String.valueOf(!inLeague && end >= DateUtils.getCurrentDate())); - leagueElem.setAttribute("draftable", String.valueOf(inLeague && leagueData.isSoloDraftLeague())); + leagueElem.setAttribute("joinable", String.valueOf(!inLeague && end >= currentDate)); + leagueElem.setAttribute("draftable", String.valueOf(inLeague && leagueData.isSoloDraftLeague() && start >= currentDate)); leagueElem.setAttribute("type", league.getType()); leagueElem.setAttribute("name", league.getName()); leagueElem.setAttribute("cost", String.valueOf(league.getCost())); diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java index 698c226ac..e65255ad7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.lotro.game.Player; import org.jboss.netty.channel.MessageEvent; @@ -28,18 +29,17 @@ public class LoginRequestHandler extends LotroServerRequestHandler implements Ur if (player.getType().contains("u")) { final Date bannedUntil = player.getBannedUntil(); if (bannedUntil != null && bannedUntil.after(new Date())) - responseWriter.writeError(409); + throw new HttpProcessingException(409); else responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login)); } else { - responseWriter.writeError(403); + throw new HttpProcessingException(403); } } else { - responseWriter.writeError(401); + throw new HttpProcessingException(401); } - } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java index b83188c5c..0afd61c51 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.cards.packs.SetDefinition; @@ -55,7 +56,7 @@ public class MerchantRequestHandler extends LotroServerRequestHandler implements } else if (uri.equals("/tradeFoil") && request.getMethod() == HttpMethod.POST) { tradeInFoil(request, responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MtgCardsRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MtgCardsRequestHandler.java index a31ad10fe..1a8e7e2e1 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MtgCardsRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MtgCardsRequestHandler.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.mtg.MtgCardServer; import com.gempukku.mtg.ProviderNotFoundException; @@ -44,16 +45,13 @@ public class MtgCardsRequestHandler implements UriRequestHandler { responseWriter.writeByteResponse(dataProvidersResponse, headers); } - private void processCardListRequest(ResponseWriter responseWriter, String provider, String updateMarker) { + private void processCardListRequest(ResponseWriter responseWriter, String provider, String updateMarker) throws Exception { try { MtgCardServer.CardDatabaseHolder cardDatabaseHolder = _mtgCardServer.getCardDatabaseHolder(provider); - if (cardDatabaseHolder == null) { - responseWriter.writeError(204); - return; - } else if (updateMarker != null && updateMarker.equals(String.valueOf(cardDatabaseHolder.getUpdateDate()))) { - responseWriter.writeError(304); - return; - } + if (cardDatabaseHolder == null) + throw new HttpProcessingException(204); + else if (updateMarker != null && updateMarker.equals(String.valueOf(cardDatabaseHolder.getUpdateDate()))) + throw new HttpProcessingException(304); Map headers = new HashMap(); headers.put(CONTENT_TYPE, "application/json; charset=UTF-8"); @@ -61,7 +59,7 @@ public class MtgCardsRequestHandler implements UriRequestHandler { responseWriter.writeByteResponse(cardDatabaseHolder.getBytes(), headers); } catch (ProviderNotFoundException exp) { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/PlayerStatsRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/PlayerStatsRequestHandler.java index efc414d1a..e8aeb2016 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/PlayerStatsRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/PlayerStatsRequestHandler.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.lotro.db.PlayerStatistic; import com.gempukku.lotro.game.GameHistoryService; @@ -56,7 +57,7 @@ public class PlayerStatsRequestHandler extends LotroServerRequestHandler impleme responseWriter.writeXmlResponse(doc); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java index cf012f1d2..d37e7b843 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java @@ -34,7 +34,7 @@ public class RegisterRequestHandler extends LotroServerRequestHandler implements } } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ReplayRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ReplayRequestHandler.java index 8da6eb424..c90ebba4b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ReplayRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ReplayRequestHandler.java @@ -57,7 +57,7 @@ public class ReplayRequestHandler extends LotroServerRequestHandler implements U responseWriter.writeByteResponse(baos.toByteArray(), headers); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java index 0b3ef4ff1..bced81344 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.lotro.common.ApplicationConfiguration; import org.jboss.netty.channel.MessageEvent; @@ -101,7 +102,7 @@ public class RootUriRequestHandler implements UriRequestHandler { } else if (uri.equals(_serverContextPath)) { _statusRequestHandler.handleRequest(uri.substring(_serverContextPath.length()), request, context, responseWriter, e); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ServerStatsRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ServerStatsRequestHandler.java index a12917243..1d95b8dbb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ServerStatsRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ServerStatsRequestHandler.java @@ -86,7 +86,7 @@ public class ServerStatsRequestHandler extends LotroServerRequestHandler impleme throw new HttpProcessingException(400); } } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java index 5a5704499..a0656b386 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java @@ -1,5 +1,7 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.DateUtils; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.collection.CollectionsManager; @@ -48,7 +50,7 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement } else if (uri.startsWith("/") && request.getMethod() == HttpMethod.GET) { getAvailablePicks(request, uri.substring(1), responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } @@ -59,11 +61,13 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement League league = findLeagueByType(leagueType); if (league == null) - responseWriter.writeError(404); + throw new HttpProcessingException(404); LeagueData leagueData = league.getLeagueData(_cardSets, _soloDraftDefinitions); - if (!leagueData.isSoloDraftLeague()) - responseWriter.writeError(404); + int leagueStart = leagueData.getSeries().get(0).getStart(); + + if (!leagueData.isSoloDraftLeague() || DateUtils.getCurrentDate() < leagueStart) + throw new HttpProcessingException(404); SoloDraftLeagueData soloDraftLeagueData = (SoloDraftLeagueData) leagueData; CollectionType collectionType = soloDraftLeagueData.getCollectionType(); @@ -113,11 +117,13 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement League league = findLeagueByType(leagueType); if (league == null) - responseWriter.writeError(404); + throw new HttpProcessingException(404); LeagueData leagueData = league.getLeagueData(_cardSets, _soloDraftDefinitions); - if (!leagueData.isSoloDraftLeague()) - responseWriter.writeError(404); + int leagueStart = leagueData.getSeries().get(0).getStart(); + + if (!leagueData.isSoloDraftLeague() || DateUtils.getCurrentDate() < leagueStart) + throw new HttpProcessingException(404); SoloDraftLeagueData soloDraftLeagueData = (SoloDraftLeagueData) leagueData; CollectionType collectionType = soloDraftLeagueData.getCollectionType(); @@ -127,7 +133,7 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement CardCollection collection = _collectionsManager.getPlayerCollection(resourceOwner, collectionType.getCode()); boolean finished = (Boolean) collection.getExtraInformation().get("finished"); if (finished) - responseWriter.writeError(404); + throw new HttpProcessingException(404); int stage = ((Number) collection.getExtraInformation().get("stage")).intValue(); long playerSeed = ((Number) collection.getExtraInformation().get("seed")).longValue(); @@ -137,12 +143,12 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement SoloDraft.DraftChoice draftChoice = getSelectedDraftChoice(selectedChoiceId, possibleChoices); if (draftChoice == null) - responseWriter.writeError(400); + throw new HttpProcessingException(400); CardCollection selectedCards = soloDraft.getCardsForChoiceId(selectedChoiceId, playerSeed, stage); Map extraInformationChanges = new HashMap(); boolean hasNextStage = soloDraft.hasNextStage(playerSeed, stage); - extraInformationChanges.put("stage", stage+1); + extraInformationChanges.put("stage", stage + 1); if (!hasNextStage) extraInformationChanges.put("finished", true); @@ -164,7 +170,7 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement } if (hasNextStage) { - Iterable availableChoices = soloDraft.getAvailableChoices(playerSeed, stage+1); + Iterable availableChoices = soloDraft.getAvailableChoices(playerSeed, stage + 1); appendAvailablePics(doc, pickResultElem, availableChoices); } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/StatusRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/StatusRequestHandler.java index 6c6830298..8e4fecaad 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/StatusRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/StatusRequestHandler.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import com.gempukku.lotro.chat.ChatServer; import com.gempukku.lotro.game.GameHistoryService; @@ -36,7 +37,7 @@ public class StatusRequestHandler extends LotroServerRequestHandler implements U responseWriter.writeHtmlResponse(sb.toString()); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java index 517157d95..5c4d0f16b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java @@ -52,7 +52,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen } else if (uri.startsWith("/") && request.getMethod() == HttpMethod.GET) { getTournamentInfo(request, uri.substring(1), responseWriter); } else { - responseWriter.writeError(404); + throw new HttpProcessingException(404); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java index 973faae46..9ee7b956c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java @@ -1,9 +1,12 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.handler.codec.http.HttpHeaders; + import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.IF_NONE_MATCH; + import org.jboss.netty.handler.codec.http.HttpRequest; import java.io.File; @@ -22,10 +25,8 @@ public class WebRequestHandler implements UriRequestHandler { @Override public void handleRequest(String uri, HttpRequest request, Map context, ResponseWriter responseWriter, MessageEvent e) throws Exception { - if (clientHasCurrentVersion(request)) { - responseWriter.writeError(304); - return; - } + if (clientHasCurrentVersion(request)) + throw new HttpProcessingException(304); if (uri.equals("")) uri = "index.html"; @@ -34,16 +35,14 @@ public class WebRequestHandler implements UriRequestHandler { if ((uri.contains("..")) || uri.contains(File.separator + ".") - || uri.startsWith(".") || uri.endsWith(".")) { - responseWriter.writeError(403); - } else { - File file = new File(_root + uri); - if (!file.getCanonicalPath().startsWith(_root)) - responseWriter.writeError(403); - else { - responseWriter.writeFile(file, Collections.singletonMap(HttpHeaders.Names.ETAG, _uniqueEtag)); - } - } + || uri.startsWith(".") || uri.endsWith(".")) + throw new HttpProcessingException(403); + + File file = new File(_root + uri); + if (!file.getCanonicalPath().startsWith(_root)) + throw new HttpProcessingException(403); + + responseWriter.writeFile(file, Collections.singletonMap(HttpHeaders.Names.ETAG, _uniqueEtag)); } private boolean clientHasCurrentVersion(HttpRequest request) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java index 861833e89..660b04460 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.competitive.PlayerStanding; import com.gempukku.lotro.db.vo.CollectionType; +import com.gempukku.lotro.draft2.SoloDraft; import com.gempukku.lotro.draft2.SoloDraftDefinitions; import com.gempukku.lotro.game.CardCollection; import com.gempukku.lotro.game.Player; @@ -47,6 +48,11 @@ public class ConstructedLeagueData implements LeagueData { return false; } + @Override + public SoloDraft getSoloDraft() { + return null; + } + @Override public List getSeries() { return _series; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueData.java index c7ab7f91c..7bbfd4b26 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueData.java @@ -2,17 +2,20 @@ package com.gempukku.lotro.league; import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.competitive.PlayerStanding; +import com.gempukku.lotro.draft2.SoloDraft; import com.gempukku.lotro.game.CardCollection; import com.gempukku.lotro.game.Player; import java.util.List; public interface LeagueData { - public boolean isSoloDraftLeague(); + boolean isSoloDraftLeague(); - public List getSeries(); + List getSeries(); - public CardCollection joinLeague(CollectionsManager collecionsManager, Player player, int currentTime); + SoloDraft getSoloDraft(); - public int process(CollectionsManager collectionsManager, List leagueStandings, int oldStatus, int currentTime); + CardCollection joinLeague(CollectionsManager collecionsManager, Player player, int currentTime); + + int process(CollectionsManager collectionsManager, List leagueStandings, int oldStatus, int currentTime); } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java index 1da001142..5940cc436 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.competitive.PlayerStanding; import com.gempukku.lotro.db.vo.CollectionType; +import com.gempukku.lotro.draft2.SoloDraft; import com.gempukku.lotro.draft2.SoloDraftDefinitions; import com.gempukku.lotro.game.CardCollection; import com.gempukku.lotro.game.Player; @@ -50,6 +51,11 @@ public class NewConstructedLeagueData implements LeagueData { return false; } + @Override + public SoloDraft getSoloDraft() { + return null; + } + @Override public List getSeries() { return Collections.unmodifiableList(_series); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java index 534df97f1..da441ff02 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.competitive.PlayerStanding; import com.gempukku.lotro.db.vo.CollectionType; +import com.gempukku.lotro.draft2.SoloDraft; import com.gempukku.lotro.draft2.SoloDraftDefinitions; import com.gempukku.lotro.game.CardCollection; import com.gempukku.lotro.game.DefaultCardCollection; @@ -51,6 +52,11 @@ public class NewSealedLeagueData implements LeagueData { return false; } + @Override + public SoloDraft getSoloDraft() { + return null; + } + @Override public List getSeries() { return Collections.unmodifiableList(_series); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java index 968a6798b..d018d26f1 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java @@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.competitive.PlayerStanding; import com.gempukku.lotro.db.vo.CollectionType; +import com.gempukku.lotro.draft2.SoloDraft; import com.gempukku.lotro.draft2.SoloDraftDefinitions; import com.gempukku.lotro.game.CardCollection; import com.gempukku.lotro.game.DefaultCardCollection; @@ -51,6 +52,11 @@ public class SealedLeagueData implements LeagueData { return false; } + @Override + public SoloDraft getSoloDraft() { + return null; + } + @Override public List getSeries() { return Collections.unmodifiableList(_series); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java index e4f8029f1..3f46f317b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java @@ -42,6 +42,7 @@ public class SoloDraftLeagueData implements LeagueData { return _collectionType; } + @Override public SoloDraft getSoloDraft() { return _draft; } @@ -64,11 +65,12 @@ public class SoloDraftLeagueData implements LeagueData { public CardCollection joinLeague(CollectionsManager collectionsManager, Player player, int currentTime) { MutableCardCollection startingCollection = new DefaultCardCollection(); long seed = getSeed(player); + if (currentTime >= _serie.getStart()) { + CardCollection leagueProduct = _draft.initializeNewCollection(seed); - CardCollection leagueProduct = _draft.initializeNewCollection(seed); - - for (Map.Entry serieCollectionItem : leagueProduct.getAll().entrySet()) - startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount()); + for (Map.Entry serieCollectionItem : leagueProduct.getAll().entrySet()) + startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount()); + } startingCollection.setExtraInformation(createExtraInformation(seed)); collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection); @@ -86,17 +88,21 @@ public class SoloDraftLeagueData implements LeagueData { @Override public int process(CollectionsManager collectionsManager, List leagueStandings, int oldStatus, int currentTime) { int status = oldStatus; - + if (status == 0) { - Map map = collectionsManager.getPlayersCollection(_collectionType.getCode()); - for (Map.Entry playerCardCollectionEntry : map.entrySet()) { - Player player = playerCardCollectionEntry.getKey(); - CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player)); - collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values()); + if (currentTime >= _serie.getStart()) { + Map map = collectionsManager.getPlayersCollection(_collectionType.getCode()); + for (Map.Entry playerCardCollectionEntry : map.entrySet()) { + + Player player = playerCardCollectionEntry.getKey(); + CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player)); + + collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values()); + } + status = 1; } - status = 1; } - + int maxGamesTotal = _serie.getMaxMatches(); if (status == 1) {