From a0619427399ac9400a8e88f5237df63cf3dd6dee Mon Sep 17 00:00:00 2001
From: io42630 <ivan@olexyn.com>
Date: Sat, 20 Jan 2024 11:25:12 +0100
Subject: [PATCH] springify mirror

---
 mirror/Dockerfile                             |   6 ++--
 mirror/build.sh                               |   0
 mirror/pom.xml                                |  28 +++++++++++++-----
 .../main/java/com/olexyn/misp/mirror/App.java |  13 ++++++++
 .../olexyn/misp/mirror/{ => web}/Mirror.java  |  17 +++++------
 .../src/main/resources/appication.properties  |   0
 mirror/src/main/webapp/WEB-INF/web.xml        |  23 --------------
 mirror/src/main/webapp/images/io42630.png     | Bin 617 -> 0 bytes
 mirror/src/main/webapp/index.jsp              |  20 -------------
 9 files changed, 44 insertions(+), 63 deletions(-)
 mode change 100644 => 100755 mirror/build.sh
 create mode 100644 mirror/src/main/java/com/olexyn/misp/mirror/App.java
 rename mirror/src/main/java/com/olexyn/misp/mirror/{ => web}/Mirror.java (85%)
 create mode 100644 mirror/src/main/resources/appication.properties
 delete mode 100644 mirror/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 mirror/src/main/webapp/images/io42630.png
 delete mode 100644 mirror/src/main/webapp/index.jsp

diff --git a/mirror/Dockerfile b/mirror/Dockerfile
index 45a358d..d56189a 100644
--- a/mirror/Dockerfile
+++ b/mirror/Dockerfile
@@ -1,4 +1,4 @@
 FROM eclipse-temurin:17-alpine
-COPY /target/mirror-0.1.war /usr/local/lib/mirror-0.1.war
-EXPOSE 8090
-ENTRYPOINT ["java","-jar","/usr/local/lib/mirror-0.1.war"]
+COPY /target/mirror-0.1.jar /usr/local/lib/mirror-0.1.jar
+EXPOSE 8080
+ENTRYPOINT ["java","-jar","/usr/local/lib/mirror-0.1.jar"]
diff --git a/mirror/build.sh b/mirror/build.sh
old mode 100644
new mode 100755
diff --git a/mirror/pom.xml b/mirror/pom.xml
index 567add5..0e1faac 100644
--- a/mirror/pom.xml
+++ b/mirror/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.olexyn</groupId>
         <artifactId>zeeroot</artifactId>
-        <version>17.0.1</version>
+        <version>spring-boot-jdk17-0.1</version>
     </parent>
     <groupId>com.olexyn.misp</groupId>
     <artifactId>mirror</artifactId>
     <version>0.1</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>mirror</name>
     <dependencyManagement>
         <dependencies>
@@ -33,16 +33,28 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.orbit</groupId>
-            <artifactId>javax.servlet</artifactId>
-            <version>3.0.0.v201112011016</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <!-- for some godforsaken reason this is required. -->
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/mirror/src/main/java/com/olexyn/misp/mirror/App.java b/mirror/src/main/java/com/olexyn/misp/mirror/App.java
new file mode 100644
index 0000000..05733fd
--- /dev/null
+++ b/mirror/src/main/java/com/olexyn/misp/mirror/App.java
@@ -0,0 +1,13 @@
+package com.olexyn.misp.mirror;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+@SpringBootApplication
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+public class App {
+    public static void main(String... args) {
+        SpringApplication.run(App.class, args);
+    }
+}
diff --git a/mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java b/mirror/src/main/java/com/olexyn/misp/mirror/web/Mirror.java
similarity index 85%
rename from mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java
rename to mirror/src/main/java/com/olexyn/misp/mirror/web/Mirror.java
index db943cd..e9ec4d6 100644
--- a/mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java
+++ b/mirror/src/main/java/com/olexyn/misp/mirror/web/Mirror.java
@@ -1,9 +1,11 @@
-package com.olexyn.misp.mirror;
+package com.olexyn.misp.mirror.web;
 
 import com.olexyn.misp.helper.WebPrint;
 import org.json.JSONObject;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -11,7 +13,8 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Mirror extends HttpServlet {
+@RestController
+public class Mirror {
 
 
     private final List<String> list = new ArrayList<>();
@@ -32,7 +35,7 @@ public class Mirror extends HttpServlet {
     }
 
 
-    @Override
+    @GetMapping("/")
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
         addRequest(request);
@@ -53,13 +56,9 @@ public class Mirror extends HttpServlet {
     }
 
 
-    @Override
+    @PostMapping("/")
     public void doPost(HttpServletRequest request, HttpServletResponse response) { addRequest(request); }
 
-
-    @Override
-    public void doPut(HttpServletRequest request, HttpServletResponse response) { addRequest(request); }
-
 }
 
 
diff --git a/mirror/src/main/resources/appication.properties b/mirror/src/main/resources/appication.properties
new file mode 100644
index 0000000..e69de29
diff --git a/mirror/src/main/webapp/WEB-INF/web.xml b/mirror/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index eeae59d..0000000
--- a/mirror/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-  <display-name>misp-mirror</display-name>
-
-  <servlet>
-    <servlet-name>misp-mirror</servlet-name>
-    <servlet-class>com.olexyn.misp.mirror.Mirror</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>misp-mirror</servlet-name>
-    <url-pattern>/mirror</url-pattern>
-  </servlet-mapping>
-
-</web-app>
diff --git a/mirror/src/main/webapp/images/io42630.png b/mirror/src/main/webapp/images/io42630.png
deleted file mode 100644
index 01d99bf52efa311d32a32001004ab18602c9cd05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 617
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k2}mkgS)OEIU^4J@aSW-L^X5t**C7W1R!8@u
z|JwcL0wS|EM17r~$b7ciPC-FO=#Y{kRf+3&`G3gnuKq4;XJ&jcwcFJxLZxNk3D!A>
zlO_s?aV8Q??AUdA_ifq!GiR>f|9AWUzVwYA9NjG&1{2Xx96_y^TMtY%|Nq+_=9;)I
SZ)q`*!{F)a=d#Wzp$PyZXv%5;

diff --git a/mirror/src/main/webapp/index.jsp b/mirror/src/main/webapp/index.jsp
deleted file mode 100644
index 11324db..0000000
--- a/mirror/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>misp-mirror</title>
-</head>
-<body bgcolor=white>
-
-<table border="0">
-<tr>
-<td align=center>
-<img src="images/io42630.png">
-</td>
-</tr>
-<tr>
-<td>
-<h1>misp-mirror</h1>
-</td>
-</tr>
-</table>
-</body>
-</html>