diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LoggedUserHolder.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LoggedUserHolder.java index b0960384a..009e5b61b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LoggedUserHolder.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LoggedUserHolder.java @@ -36,7 +36,6 @@ public class LoggedUserHolder { if (value != null) { String loggedUser = _users.get(value); if (loggedUser != null) { - System.out.println("Update last access"); _lastAccess.put(value, System.currentTimeMillis()); return loggedUser; } 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 c0276ad9d..387f0a045 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 @@ -17,8 +17,6 @@ import org.jboss.netty.handler.codec.http.multipart.HttpPostRequestDecoder; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -71,7 +69,7 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri LotroDeck deck = _lotroServer.createDeckWithValidate("tempDeck", contents); if (deck == null) - throw new WebApplicationException(Response.Status.BAD_REQUEST); + throw new HttpProcessingException(400); int fpCount = 0; int shadowCount = 0; @@ -161,7 +159,7 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri LotroDeck deck = _deckDao.getDeckForPlayer(resourceOwner, deckName); if (deck == null) - throw new WebApplicationException(Response.Status.NOT_FOUND); + throw new HttpProcessingException(404); StringBuilder result = new StringBuilder(); result.append(""); 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 33cd50379..d73bae792 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 @@ -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.collection.TransferDAO; import com.gempukku.lotro.game.CardCollection; @@ -10,8 +11,6 @@ import org.jboss.netty.handler.codec.http.HttpRequest; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.lang.reflect.Type; @@ -38,7 +37,7 @@ public class DeliveryRequestHandler extends LotroServerRequestHandler implements Player resourceOwner = getResourceOwnerSafely(request, null); Map delivery = _transferDAO.consumeUndeliveredPackages(resourceOwner.getName()); if (delivery == null) - throw new WebApplicationException(Response.Status.NOT_FOUND); + throw new HttpProcessingException(404); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); 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 a99b9a94d..c71a1efde 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 @@ -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.vo.GameHistoryEntry; import com.gempukku.lotro.game.GameHistoryService; @@ -11,8 +12,6 @@ import org.jboss.netty.handler.codec.http.QueryStringDecoder; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.lang.reflect.Type; @@ -37,7 +36,7 @@ public class GameHistoryRequestHandler extends LotroServerRequestHandler impleme int count = Integer.parseInt(getQueryParameterSafely(queryDecoder, "count")); if (start < 0 || count < 1 || count > 100) - throw new WebApplicationException(Response.Status.BAD_REQUEST); + throw new HttpProcessingException(400); Player resourceOwner = getResourceOwnerSafely(request, participantId); 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 20ebcae79..a62c0109b 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 @@ -21,8 +21,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.lang.reflect.Type; @@ -154,7 +152,7 @@ public class GameRequestHandler extends LotroServerRequestHandler implements Uri LotroGameMediator gameMediator = _lotroServer.getGameById(gameId); if (gameMediator == null) - throw new WebApplicationException(Response.Status.NOT_FOUND); + throw new HttpProcessingException(404); gameMediator.cancel(resourceOwner); 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 a5ba66923..3d6fbc4aa 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 @@ -19,8 +19,6 @@ import org.jboss.netty.handler.codec.http.multipart.HttpPostRequestDecoder; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.lang.reflect.Type; @@ -83,7 +81,7 @@ public class LeagueRequestHandler extends LotroServerRequestHandler implements U League league = getLeagueByType(leagueType); if (league == null) - throw new WebApplicationException(Response.Status.NOT_FOUND); + throw new HttpProcessingException(404); final LeagueData leagueData = league.getLeagueData(); final List series = leagueData.getSeries(); 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 ca7ca7ef8..266ce9c92 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 @@ -12,8 +12,6 @@ import org.jboss.netty.handler.codec.http.QueryStringDecoder; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.lang.reflect.Type; @@ -55,7 +53,7 @@ public class ServerStatsRequestHandler extends LotroServerRequestHandler impleme else if (length.equals("day")) to.setDate(to.getDate() + 1); else - throw new WebApplicationException(Response.Status.BAD_REQUEST); + throw new HttpProcessingException(400); long duration = to.getTime() - from; int activePlayers = _gameHistoryService.getActivePlayersCount(from, duration); 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 9d7c8c550..fafc1abf6 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 @@ -19,8 +19,6 @@ import org.jboss.netty.handler.codec.http.HttpRequest; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.lang.reflect.Type; @@ -66,7 +64,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen Tournament tournament = _tournamentService.getTournamentById(tournamentId); if (tournament == null) - throw new WebApplicationException(Response.Status.NOT_FOUND); + throw new HttpProcessingException(404); Element tournamentElem = doc.createElement("tournament");