Started adding a new API system, as a way to see what the bot has been doing...

Useful for debugging purposes...

Author: RealMangorage

src/main/java/module-info.java

@@ -6,9 +6,14 @@
     requires com.google.gson;
     requires org.eclipse.jetty.servlet;
     requires org.jetbrains.annotations;
+    requires net.minecraftforge.eventbus;
+    requires net.dv8tion.jda;
 
     exports org.mangorage.mangobotsite;
     exports org.mangorage.mangobotsite.website.file;
+    exports org.mangorage.mangobotsite.website.servlet.entity;
+
+
 
     exports org.mangorage.mangobotsite.website.filters to org.eclipse.jetty.server;
     exports org.mangorage.mangobotsite.website.servlet to org.eclipse.jetty.server;
@@ -17,7 +22,12 @@
     exports org.mangorage.mangobotsite.website.impl to freemarker;
     exports org.mangorage.mangobotsite.website.util to freemarker;
 
-    opens org.mangorage.mangobotsite.website.servlet to freemarker;
+    exports org.mangorage.mangobotsite.website.servlet.entity.discord to com.google.gson;
+
+
+    opens org.mangorage.mangobotsite.website.servlet to freemarker, com.google.gson;
+    opens org.mangorage.mangobotsite.website.servlet.entity;
+
 
     provides org.mangorage.mangobotcore.plugin.api.Plugin with org.mangorage.mangobotsite.MangoBotSite;
     uses org.mangorage.mangobotcore.plugin.api.Plugin;

src/main/java/org/mangorage/mangobotsite/MangoBotSite.java

@@ -1,13 +1,13 @@
 package org.mangorage.mangobotsite;
 
-
 import org.mangorage.mangobotcore.plugin.api.MangoBotPlugin;
 import org.mangorage.mangobotcore.plugin.api.Plugin;
 import org.mangorage.mangobotcore.plugin.api.PluginManager;
 import org.mangorage.mangobotplugin.entrypoint.MangoBot;
 import org.mangorage.mangobotsite.website.WebServer;
 import org.mangorage.mangobotsite.website.file.FileUploadManager;
 import org.mangorage.mangobotsite.website.impl.ObjectMap;
+import org.mangorage.mangobotsite.website.servlet.entity.EntityManager;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 
 import java.nio.file.Path;
@@ -17,6 +17,7 @@ public final class MangoBotSite implements Plugin {
     public static final String ID = "mangobotsite";
 
     private final FileUploadManager fileUploadManager = new FileUploadManager(Path.of("webpage-root/uploads"));
+    private final EntityManager entityManager = new EntityManager();
 
     public MangoBotSite() {
 
@@ -26,6 +27,9 @@ public FileUploadManager getFileUploadManager() {
         return fileUploadManager;
     }
 
+    public EntityManager getEntityManager() {
+        return entityManager;
+    }
 
     @Override
     public String getId() {
@@ -40,6 +44,7 @@ public void load() {
         objectMap.put("trickCommand", pl.getCommandManager().getCommand("trick"));
         objectMap.put("jda", pl.getJDA());
         objectMap.put(WebConstants.FILE_MANAGER, fileUploadManager);
+        objectMap.put(WebConstants.ENTITY_MANAGER, getEntityManager());
 
         WebServer.startWebServerSafely(objectMap);
     }

src/main/java/org/mangorage/mangobotsite/website/WebServer.java

@@ -21,6 +21,8 @@
 import org.mangorage.mangobotsite.website.impl.ObjectMap;
 import org.mangorage.mangobotsite.website.servlet.AccountServlet;
 
+import org.mangorage.mangobotsite.website.servlet.EntitiesServlet;
+import org.mangorage.mangobotsite.website.servlet.EntityServlet;
 import org.mangorage.mangobotsite.website.servlet.FileServlet;
 import org.mangorage.mangobotsite.website.servlet.FileUploadServlet;
 import org.mangorage.mangobotsite.website.servlet.HomeServlet;
@@ -116,7 +118,7 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
                     h.setErrorHandler(new DefaultErrorHandler());
                 })
                 .addServlet(DefaultServlet.class, "/*")
-                .addServlet(HomeServlet.class, "/home")
+                .addHttpServlet(HomeServlet.class, "/home")
                 .addHttpServlet(InfoServlet.class, "/info")
                 .addHttpServlet(TricksServlet.class, "/trick")
                 .addHttpServlet(FileServlet.class, "/file")
@@ -128,6 +130,8 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
                             new MultipartConfigElement("/tmp/uploads")
                     );
                 })
+                .addHttpServlet(EntityServlet.class, "/api/entity/*")
+                .addHttpServlet(EntitiesServlet.class, "/api/entities/*")
                 .setAttribute(WebConstants.WEB_OBJECT_ID, objectMap)
                 .addFilter(RequestInterceptorFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST))
                 .configureLoginBuilder(security -> {

src/main/java/org/mangorage/mangobotsite/website/impl/StandardHttpServlet.java

@@ -6,6 +6,8 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.mangorage.mangobotsite.website.util.WebConstants;
+
 import java.io.IOException;
 
 public abstract class StandardHttpServlet extends HttpServlet {
@@ -36,6 +38,10 @@ public String getStyles() {
         return useDefaultStyles() ? "css/styles.css" : "css/%s.css".formatted(getServletInfo());
     }
 
+    public ObjectMap getObjectMap() {
+        return (ObjectMap) getServletConfig().getServletContext().getAttribute(WebConstants.WEB_OBJECT_ID);
+    }
+
     @Override
     public String getServletInfo() {
         return getClass().getSimpleName();

src/main/java/org/mangorage/mangobotsite/website/servlet/EntitiesServlet.java

@@ -0,0 +1,42 @@
+package org.mangorage.mangobotsite.website.servlet;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
+import org.mangorage.mangobotsite.website.servlet.entity.EntityManager;
+import org.mangorage.mangobotsite.website.util.WebConstants;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public final class EntitiesServlet extends StandardHttpServlet {
+    private static final Gson GSON = new GsonBuilder()
+            .setPrettyPrinting()
+            .create();
+
+    public record Entity(String id, long age) {}
+
+    public record StandardList(ArrayList<Entity> entities) {}
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        final var entityId = req.getRequestURI().replaceFirst("/api/entities/", "");
+        final var entityManager = getObjectMap().get(WebConstants.ENTITY_MANAGER, EntityManager.class);
+
+        final var list = entityManager.findAllByType(entityId)
+                .stream()
+                .map(e -> new Entity(e.getId(), e.getAge()))
+                .toList();
+
+        if (list.isEmpty()) {
+            resp.getWriter().write("No entities found!");
+        } else {
+            resp.getWriter().write(
+                    GSON.toJson(new StandardList(new ArrayList<>(list)))
+            );
+        }
+    }
+}

src/main/java/org/mangorage/mangobotsite/website/servlet/EntityServlet.java

@@ -0,0 +1,25 @@
+package org.mangorage.mangobotsite.website.servlet;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
+import org.mangorage.mangobotsite.website.servlet.entity.EntityManager;
+import org.mangorage.mangobotsite.website.util.WebConstants;
+
+import java.io.IOException;
+
+public class EntityServlet extends StandardHttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        final var entityId = req.getRequestURI().replaceFirst("/api/entity/", "");
+        final var entityManager = getObjectMap().get(WebConstants.ENTITY_MANAGER, EntityManager.class);
+
+        final var entity = entityManager.findEntity(entityId);
+        if (entity.isPresent()) {
+            resp.getWriter().write(entity.get().getJson());
+        } else {
+            resp.getWriter().write("Unable to find anything");
+        }
+    }
+}

src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java

@@ -41,7 +41,7 @@ private static long getLong(String value) {
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         // Retrieve shared objects from the servlet context
-        var map = (ObjectMap) getServletConfig().getServletContext().getAttribute(WebConstants.WEB_OBJECT_ID);
+        var map = getObjectMap();
         var command = map.get("trickCommand", TrickCommand.class);
         var jda = map.get("jda", JDA.class);
 

src/main/java/org/mangorage/mangobotsite/website/servlet/entity/DeferredEntity.java

@@ -0,0 +1,36 @@
+package org.mangorage.mangobotsite.website.servlet.entity;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.UUID;
+
+public record DeferredEntity(Object object, String type, UUID id, long age) implements IEntity {
+    private static final Gson GSON = new GsonBuilder()
+            .setPrettyPrinting()
+            .create();
+
+    public DeferredEntity(Object object, String type) {
+        this(object, type, UUID.randomUUID(), System.currentTimeMillis());
+    }
+
+    @Override
+    public long getAge() {
+        return age();
+    }
+
+    @Override
+    public String getId() {
+        return id().toString();
+    }
+
+    @Override
+    public String getType() {
+        return "deferred";
+    }
+
+    @Override
+    public String getJson() {
+        return GSON.toJson(object);
+    }
+}

src/main/java/org/mangorage/mangobotsite/website/servlet/entity/EntityManager.java

@@ -0,0 +1,26 @@
+package org.mangorage.mangobotsite.website.servlet.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public final class EntityManager {
+    private final List<IEntity> entities = new ArrayList<>();
+
+    public Optional<IEntity> findEntity(String id) {
+        return entities.stream()
+                .filter(entity -> entity.getId().equals(id))
+                .findAny();
+    }
+
+    public List<IEntity> findAllByType(String type) {
+        return entities.stream()
+                .filter(entity -> !entity.getType().equals(type))
+                .toList();
+    }
+
+    public void submitEntity(IEntity entity) {
+        entities.add(entity);
+        System.out.println(entity.getId() + " was submitted!");
+    }
+}

src/main/java/org/mangorage/mangobotsite/website/servlet/entity/IEntity.java

@@ -0,0 +1,13 @@
+package org.mangorage.mangobotsite.website.servlet.entity;
+
+
+/**
+ * domain/api/entity/id
+ * domain/api/entities/id
+ */
+public interface IEntity {
+    long getAge();
+    String getId();
+    String getType();
+    String getJson();
+}