From 5b3f08f870ac0e30f6ba634cf1801afd3c6357a4 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 31 Aug 2019 11:46:11 +0300 Subject: [PATCH] Fixed /server returning 500 --- .../webserver/response/ResponseFactory.java | 4 +- .../response/pages/NetworkPageResponse.java | 33 ------------- .../response/pages/PageResponse.java | 3 +- .../response/pages/PlayerPageResponse.java | 48 ------------------- 4 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/NetworkPageResponse.java delete mode 100644 Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PlayerPageResponse.java diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/ResponseFactory.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/ResponseFactory.java index 8150f82cd..59638ea18 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/ResponseFactory.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/ResponseFactory.java @@ -100,7 +100,7 @@ public class ResponseFactory { public Response networkPageResponse() { try { - return new NetworkPageResponse(pageFactory.networkPage()); + return new PageResponse(pageFactory.networkPage()); } catch (ParseException e) { return internalErrorResponse(e, "Failed to parse network page"); } @@ -201,7 +201,7 @@ public class ResponseFactory { public Response playerPageResponse(UUID playerUUID) { try { - return new PlayerPageResponse(playerUUID, pageFactory.playerPage(playerUUID).toHtml()); + return new PageResponse(pageFactory.playerPage(playerUUID)); } catch (IllegalStateException e) { return playerNotFound404(); } catch (ParseException e) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/NetworkPageResponse.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/NetworkPageResponse.java deleted file mode 100644 index ed0133c22..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/NetworkPageResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.delivery.webserver.response.pages; - -import com.djrapitops.plan.delivery.rendering.pages.NetworkPage; -import com.djrapitops.plan.exceptions.ParseException; - -/** - * Response for /network page. - * - * @author Rsl1122 - */ -public class NetworkPageResponse extends PageResponse { - - public NetworkPageResponse(NetworkPage networkPage) throws ParseException { - setHeader("HTTP/1.1 200 OK"); - setContent(networkPage.toHtml()); - } -} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PageResponse.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PageResponse.java index 024166e9a..a855a243f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PageResponse.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PageResponse.java @@ -40,7 +40,8 @@ public class PageResponse extends Response { } public PageResponse(Page page) throws ParseException { - super(ResponseType.HTML); + this(ResponseType.HTML); + super.setHeader("HTTP/1.1 200 OK"); setContent(page.toHtml()); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PlayerPageResponse.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PlayerPageResponse.java deleted file mode 100644 index 900c862d3..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/pages/PlayerPageResponse.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.delivery.webserver.response.pages; - -import java.util.Objects; -import java.util.UUID; - -/** - * @author Rsl1122 - */ -public class PlayerPageResponse extends PageResponse { - - private final UUID uuid; - - public PlayerPageResponse(UUID uuid, String html) { - super.setHeader("HTTP/1.1 200 OK"); - super.setContent(html); - this.uuid = uuid; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof PlayerPageResponse)) return false; - if (!super.equals(o)) return false; - PlayerPageResponse that = (PlayerPageResponse) o; - return Objects.equals(uuid, that.uuid); - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode(), uuid); - } -}