From 4f5c9752dc5ea0ebc4a0d8b9a0d57e27b6826938 Mon Sep 17 00:00:00 2001
From: ajh123 <ajh123@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:31:23 +0100
Subject: [PATCH] =?UTF-8?q?=C2=A3Json=20endpoint=20and=20begin=20loading?=
 =?UTF-8?q?=20as=20standalone?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SubServers.Web/pom.xml                        | 11 +++++++---
 .../ME1312/SubServers/Web/ExternalMain.java   |  8 +++++++
 .../ME1312/SubServers/Web/JettyServer.java    |  4 ++--
 .../Web/endpoints/BlockingServlet.java        | 16 --------------
 .../Web/endpoints/StatusServlet.java          | 22 +++++++++++++++++++
 5 files changed, 40 insertions(+), 21 deletions(-)
 create mode 100644 SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java
 delete mode 100644 SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java
 create mode 100644 SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java

diff --git a/SubServers.Web/pom.xml b/SubServers.Web/pom.xml
index 9541da89..5c351648 100644
--- a/SubServers.Web/pom.xml
+++ b/SubServers.Web/pom.xml
@@ -42,12 +42,17 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.4.3.v20170317</version>
+            <version>11.0.11</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>9.4.3.v20170317</version>
+            <version>11.0.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.1</version>
         </dependency>
     </dependencies>
 
@@ -112,7 +117,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2-beta-5</version>
                 <configuration>
-                    <finalName>SubServers.Console</finalName>
+                    <finalName>SubServers.Web</finalName>
                     <outputDirectory>../Artifacts/Plugins</outputDirectory>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java b/SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java
new file mode 100644
index 00000000..0d42c4ad
--- /dev/null
+++ b/SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java
@@ -0,0 +1,8 @@
+package net.ME1312.SubServers.Web;
+
+public class ExternalMain {
+	public static void main(String[] args) throws Exception {
+		JettyServer server = new JettyServer();
+		server.start();
+	}
+}
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java b/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
index c213c035..68b89b4b 100644
--- a/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
+++ b/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
@@ -1,6 +1,6 @@
 package net.ME1312.SubServers.Web;
 
-import net.ME1312.SubServers.Web.endpoints.BlockingServlet;
+import net.ME1312.SubServers.Web.endpoints.StatusServlet;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -17,7 +17,7 @@ public class JettyServer {
 
 		ServletHandler handler = new ServletHandler();
 		server.setHandler(handler);
-		handler.addServletWithMapping(BlockingServlet.class, "/status");
+		handler.addServletWithMapping(StatusServlet.class, "/status");
 		server.start();
 	}
 }
\ No newline at end of file
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java b/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java
deleted file mode 100644
index 54694311..00000000
--- a/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.ME1312.SubServers.Web.endpoints;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class BlockingServlet extends HttpServlet {
-
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		response.setContentType("application/json");
-		response.setStatus(HttpServletResponse.SC_OK);
-		response.getWriter().println("{ \"status\": \"ok\"}");
-	}
-}
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java b/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java
new file mode 100644
index 00000000..3cbf55c2
--- /dev/null
+++ b/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java
@@ -0,0 +1,22 @@
+package net.ME1312.SubServers.Web.endpoints;
+
+import com.google.gson.Gson;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class StatusServlet extends HttpServlet {
+
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+		response.setContentType("application/json");
+		response.setStatus(HttpServletResponse.SC_OK);
+
+		Map<String, Object> map = new HashMap<>();
+		map.put("status", "ok");
+
+		response.getWriter().println(new Gson().toJson(map));
+	}
+}