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 cf9d3f70d..0b3ef4ff1 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 @@ -10,8 +10,8 @@ import java.util.Collections; import java.util.Map; public class RootUriRequestHandler implements UriRequestHandler { - private String _serverContextPath ="/gemp-lotr-server/"; - private String _webContextPath="/gemp-lotr/"; + private String _serverContextPath = "/gemp-lotr-server/"; + private String _webContextPath = "/gemp-lotr/"; private HallRequestHandler _hallRequestHandler; private WebRequestHandler _webRequestHandler; private LoginRequestHandler _loginRequestHandler; @@ -31,6 +31,7 @@ public class RootUriRequestHandler implements UriRequestHandler { private PlayerStatsRequestHandler _playerStatsRequestHandler; private TournamentRequestHandler _tournamentRequestHandler; private MtgCardsRequestHandler _mtgCardsRequestHandler; + private SoloDraftRequestHandler _soloDraftRequestHandler; public RootUriRequestHandler(Map context) { _webRequestHandler = new WebRequestHandler(ApplicationConfiguration.getProperty("web.path")); @@ -52,6 +53,7 @@ public class RootUriRequestHandler implements UriRequestHandler { _playerStatsRequestHandler = new PlayerStatsRequestHandler(context); _tournamentRequestHandler = new TournamentRequestHandler(context); _mtgCardsRequestHandler = new MtgCardsRequestHandler(context); + _soloDraftRequestHandler = new SoloDraftRequestHandler(context); } @Override @@ -62,38 +64,40 @@ public class RootUriRequestHandler implements UriRequestHandler { _mtgCardsRequestHandler.handleRequest(uri, request, context, responseWriter, e); } else if (uri.equals("/gemp-lotr")) { responseWriter.writeError(301, Collections.singletonMap("Location", "/gemp-lotr/")); - } else if (uri.startsWith(_serverContextPath +"hall")) { - _hallRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+4), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "hall")) { + _hallRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 4), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "deck")) { - _deckRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+4), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"login")) { - _loginRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+5), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"register")) { - _registerRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+8), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"replay")) { - _replayRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+6), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"gameHistory")) { - _gameHistoryRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+11), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"stats")) { - _serverStatsRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+5), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"playerStats")) { - _playerStatsRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+11), request, context, responseWriter, e); - } else if (uri.startsWith(_serverContextPath+"admin")) { - _adminRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+5), request, context, responseWriter, e); + _deckRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 4), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "login")) { + _loginRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 5), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "register")) { + _registerRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 8), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "replay")) { + _replayRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 6), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "gameHistory")) { + _gameHistoryRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 11), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "stats")) { + _serverStatsRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 5), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "playerStats")) { + _playerStatsRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 11), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "admin")) { + _adminRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 5), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "chat")) { - _chatRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+4), request, context, responseWriter, e); + _chatRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 4), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "collection")) { - _collectionRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+10), request, context, responseWriter, e); + _collectionRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 10), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "delivery")) { - _deliveryRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+8), request, context, responseWriter, e); + _deliveryRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 8), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "game")) { - _gameRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+4), request, context, responseWriter, e); + _gameRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 4), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "league")) { - _leagueRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+6), request, context, responseWriter, e); + _leagueRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 6), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "merchant")) { - _merchantRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+8), request, context, responseWriter, e); + _merchantRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 8), request, context, responseWriter, e); } else if (uri.startsWith(_serverContextPath + "tournament")) { - _tournamentRequestHandler.handleRequest(uri.substring(_serverContextPath.length()+10), request, context, responseWriter, e); + _tournamentRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 10), request, context, responseWriter, e); + } else if (uri.startsWith(_serverContextPath + "soloDraft")) { + _soloDraftRequestHandler.handleRequest(uri.substring(_serverContextPath.length() + 9), request, context, responseWriter, e); } else if (uri.equals(_serverContextPath)) { _statusRequestHandler.handleRequest(uri.substring(_serverContextPath.length()), request, context, responseWriter, e); } else { diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DraftRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java similarity index 98% rename from gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DraftRequestHandler.java rename to gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java index d42e23230..cb7731932 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DraftRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java @@ -26,13 +26,13 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; -public class DraftRequestHandler extends LotroServerRequestHandler implements UriRequestHandler { +public class SoloDraftRequestHandler extends LotroServerRequestHandler implements UriRequestHandler { private CollectionsManager _collectionsManager; private SoloDraftDefinitions _soloDraftDefinitions; private CardSets _cardSets; private LeagueService _leagueService; - public DraftRequestHandler(Map context) { + public SoloDraftRequestHandler(Map context) { super(context); _leagueService = extractObject(context, LeagueService.class); _cardSets = extractObject(context, CardSets.class);