refactor DTOs

burdoto · burdoto · commit 849e31b94406 · 2024-03-20T16:59:35.000+01:00
diff --git a/src/agent/main/java/org/comroid/mcsd/agent/Program.java b/src/agent/main/java/org/comroid/mcsd/agent/Program.java
@@ -11,8 +11,8 @@
 import org.comroid.api.os.OS;
 import org.comroid.mcsd.agent.config.WebSocketConfig;
 import org.comroid.mcsd.agent.controller.ApiController;
-import org.comroid.mcsd.api.dto.AgentInfo;
-import org.comroid.mcsd.api.dto.McsdConfig;
+import org.comroid.mcsd.api.dto.config.AgentInfo;
+import org.comroid.mcsd.api.dto.config.McsdConfig;
 import org.comroid.mcsd.core.MCSD;
 import org.comroid.mcsd.core.ServerManager;
 import org.comroid.mcsd.core.entity.server.Server;
@@ -27,7 +27,6 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.*;
-import org.springframework.http.HttpStatus;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/src/agent/main/java/org/comroid/mcsd/agent/config/SecurityConfig.java b/src/agent/main/java/org/comroid/mcsd/agent/config/SecurityConfig.java
@@ -1,6 +1,6 @@
 package org.comroid.mcsd.agent.config;
 
-import org.comroid.mcsd.api.dto.McsdConfig;
+import org.comroid.mcsd.api.dto.config.McsdConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/Handshake.java b/src/api/main/java/org/comroid/mcsd/api/dto/Handshake.java
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/comm/ConsoleData.java b/src/api/main/java/org/comroid/mcsd/api/dto/comm/ConsoleData.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.core.dto;
+package org.comroid.mcsd.api.dto.comm;
 
 import lombok.Value;
 import org.comroid.api.attr.Named;
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/comm/PlayerEvent.java b/src/api/main/java/org/comroid/mcsd/api/dto/comm/PlayerEvent.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.comm;
 
 import lombok.Value;
 import org.comroid.api.data.seri.DataNode;
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/comm/StatusMessage.java b/src/api/main/java/org/comroid/mcsd/api/dto/comm/StatusMessage.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.comm;
 
 import lombok.*;
 import org.comroid.mcsd.api.model.Status;
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/config/AgentInfo.java b/src/api/main/java/org/comroid/mcsd/api/dto/config/AgentInfo.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/config/DBInfo.java b/src/api/main/java/org/comroid/mcsd/api/dto/config/DBInfo.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.config;
 
 import lombok.Value;
 
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/config/McsdConfig.java b/src/api/main/java/org/comroid/mcsd/api/dto/config/McsdConfig.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.config;
 
 import lombok.Value;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/config/OAuth2Info.java b/src/api/main/java/org/comroid/mcsd/api/dto/config/OAuth2Info.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.config;
 
 import lombok.Value;
 
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/mc/OpListEntry.java b/src/api/main/java/org/comroid/mcsd/api/dto/mc/OpListEntry.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.mc;
 
 import lombok.Data;
 
diff --git a/src/api/main/java/org/comroid/mcsd/api/dto/mc/WhitelistEntry.java b/src/api/main/java/org/comroid/mcsd/api/dto/mc/WhitelistEntry.java
@@ -1,4 +1,4 @@
-package org.comroid.mcsd.api.dto;
+package org.comroid.mcsd.api.dto.mc;
 
 import lombok.Data;
 
diff --git a/src/core/main/java/org/comroid/mcsd/core/MCSD.java b/src/core/main/java/org/comroid/mcsd/core/MCSD.java
@@ -17,7 +17,7 @@
 import org.comroid.api.net.REST;
 import org.comroid.api.net.Rabbit;
 import org.comroid.api.os.OS;
-import org.comroid.mcsd.api.dto.McsdConfig;
+import org.comroid.mcsd.api.dto.config.McsdConfig;
 import org.comroid.mcsd.core.entity.AbstractEntity;
 import org.comroid.mcsd.core.entity.module.ModulePrototype;
 import org.comroid.mcsd.core.entity.module.console.McsdCommandModulePrototype;
diff --git a/src/core/main/java/org/comroid/mcsd/core/entity/server/Server.java b/src/core/main/java/org/comroid/mcsd/core/entity/server/Server.java
@@ -26,7 +26,7 @@
 import org.comroid.api.func.util.Streams;
 import org.comroid.api.info.Maintenance;
 import org.comroid.api.net.Token;
-import org.comroid.mcsd.api.dto.StatusMessage;
+import org.comroid.mcsd.api.dto.comm.StatusMessage;
 import org.comroid.mcsd.api.model.Status;
 import org.comroid.mcsd.core.util.Util;
 import org.comroid.mcsd.core.MCSD;
diff --git a/src/core/main/java/org/comroid/mcsd/core/module/internal/side/agent/RabbitLinkModule.java b/src/core/main/java/org/comroid/mcsd/core/module/internal/side/agent/RabbitLinkModule.java
@@ -2,9 +2,9 @@
 
 import lombok.extern.java.Log;
 import org.comroid.api.net.Rabbit;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 import org.comroid.mcsd.core.ServerManager;
-import org.comroid.mcsd.core.dto.ConsoleData;
+import org.comroid.mcsd.api.dto.comm.ConsoleData;
 import org.comroid.mcsd.core.module.InternalModule;
 import org.comroid.mcsd.core.module.console.ConsoleModule;
 import org.comroid.mcsd.core.module.player.PlayerEventModule;
diff --git a/src/core/main/java/org/comroid/mcsd/core/module/internal/side/hub/ConsoleFromRabbitModule.java b/src/core/main/java/org/comroid/mcsd/core/module/internal/side/hub/ConsoleFromRabbitModule.java
@@ -2,15 +2,15 @@
 
 import org.comroid.api.net.Rabbit;
 import org.comroid.mcsd.core.ServerManager;
-import org.comroid.mcsd.core.dto.ConsoleData;
+import org.comroid.mcsd.api.dto.comm.ConsoleData;
 import org.comroid.mcsd.core.entity.module.console.ConsoleModulePrototype;
 import org.comroid.mcsd.core.module.console.ConsoleModule;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 
-import static org.comroid.mcsd.core.dto.ConsoleData.input;
+import static org.comroid.mcsd.api.dto.comm.ConsoleData.input;
 import static org.comroid.mcsd.core.util.ApplicationContextProvider.bean;
 
 /** inits console bus with rabbitmq connection and sends commands through rabbitmq */
diff --git a/src/core/main/java/org/comroid/mcsd/core/module/internal/side/hub/EventsFromRabbitModule.java b/src/core/main/java/org/comroid/mcsd/core/module/internal/side/hub/EventsFromRabbitModule.java
@@ -2,7 +2,7 @@
 
 import org.comroid.api.func.util.Event;
 import org.comroid.api.net.Rabbit;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 import org.comroid.mcsd.core.ServerManager;
 import org.comroid.mcsd.core.entity.module.player.PlayerEventModulePrototype;
 import org.comroid.mcsd.core.module.player.PlayerEventModule;
diff --git a/src/core/main/java/org/comroid/mcsd/core/module/player/ConsolePlayerEventModule.java b/src/core/main/java/org/comroid/mcsd/core/module/player/ConsolePlayerEventModule.java
@@ -8,8 +8,7 @@
 import org.comroid.api.func.util.Event;
 import org.comroid.api.func.util.Streams;
 import org.comroid.api.java.Switch;
-import org.comroid.api.tree.Component;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 import org.comroid.mcsd.core.entity.module.player.ConsolePlayerEventModulePrototype;
 import org.comroid.mcsd.core.entity.server.Server;
 import org.comroid.mcsd.core.module.console.ConsoleModule;
diff --git a/src/core/main/java/org/comroid/mcsd/core/module/player/PlayerEventModule.java b/src/core/main/java/org/comroid/mcsd/core/module/player/PlayerEventModule.java
@@ -9,7 +9,7 @@
 import lombok.extern.java.Log;
 import org.comroid.api.func.util.Event;
 import org.comroid.api.func.util.Streams;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 import org.comroid.mcsd.core.entity.module.player.PlayerEventModulePrototype;
 import org.comroid.mcsd.core.entity.server.Server;
 import org.comroid.mcsd.core.module.ServerModule;
diff --git a/src/core/main/java/org/comroid/mcsd/core/module/player/PlayerListModule.java b/src/core/main/java/org/comroid/mcsd/core/module/player/PlayerListModule.java
@@ -1,7 +1,6 @@
 package org.comroid.mcsd.core.module.player;
 
-import org.comroid.api.tree.Component;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 import org.comroid.mcsd.core.entity.module.player.PlayerListModulePrototype;
 import org.comroid.mcsd.core.entity.server.Server;
 import org.comroid.mcsd.core.entity.system.User;
diff --git a/src/hub/main/java/org/comroid/mcsd/hub/Program.java b/src/hub/main/java/org/comroid/mcsd/hub/Program.java
@@ -3,7 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.common.aliasing.qual.Unique;
 import org.comroid.api.func.util.Streams;
-import org.comroid.mcsd.api.dto.McsdConfig;
+import org.comroid.mcsd.api.dto.config.McsdConfig;
 import org.comroid.mcsd.core.ServerManager;
 import org.comroid.mcsd.core.entity.server.Server;
 import org.comroid.mcsd.core.model.ModuleType;
diff --git a/src/hub/main/java/org/comroid/mcsd/hub/config/SecurityConfig.java b/src/hub/main/java/org/comroid/mcsd/hub/config/SecurityConfig.java
@@ -1,6 +1,6 @@
 package org.comroid.mcsd.hub.config;
 
-import org.comroid.mcsd.api.dto.McsdConfig;
+import org.comroid.mcsd.api.dto.config.McsdConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/hub/main/java/org/comroid/mcsd/hub/controller/ApiController.java b/src/hub/main/java/org/comroid/mcsd/hub/controller/ApiController.java
@@ -7,9 +7,9 @@
 import org.comroid.api.func.util.Bitmask;
 import org.comroid.api.func.util.Streams;
 import org.comroid.api.info.Constraint;
-import org.comroid.mcsd.api.dto.McsdConfig;
-import org.comroid.mcsd.api.dto.PlayerEvent;
-import org.comroid.mcsd.api.dto.StatusMessage;
+import org.comroid.mcsd.api.dto.config.McsdConfig;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.StatusMessage;
 import org.comroid.mcsd.core.MCSD;
 import org.comroid.mcsd.core.ServerManager;
 import org.comroid.mcsd.core.entity.AbstractEntity;
diff --git a/src/spigot/main/java/org/comroid/mcsd/spigot/EventManager.java b/src/spigot/main/java/org/comroid/mcsd/spigot/EventManager.java
@@ -9,7 +9,7 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.comroid.api.tree.Component;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 
 @Value
 public class EventManager extends Component.Base implements Listener {
diff --git a/src/spigot/main/java/org/comroid/mcsd/spigot/MCSD_Spigot.java b/src/spigot/main/java/org/comroid/mcsd/spigot/MCSD_Spigot.java
@@ -4,7 +4,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.comroid.api.Polyfill;
 import org.comroid.api.net.REST;
-import org.comroid.mcsd.api.dto.PlayerEvent;
+import org.comroid.mcsd.api.dto.comm.PlayerEvent;
 import org.comroid.util.PathUtil;
 import org.jetbrains.annotations.Nullable;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.comroid.mcsd.core.dto;`
	`1`	`+package org.comroid.mcsd.api.dto.comm;`
`2`	`2`
`3`	`3`	`import lombok.Value;`
`4`	`4`	`import org.comroid.api.attr.Named;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.comroid.mcsd.api.dto;`
	`1`	`+package org.comroid.mcsd.api.dto.comm;`
`2`	`2`
`3`	`3`	`import lombok.Value;`
`4`	`4`	`import org.comroid.api.data.seri.DataNode;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.comroid.mcsd.api.dto;`
	`1`	`+package org.comroid.mcsd.api.dto.config;`
`2`	`2`
`3`	`3`	`import lombok.AllArgsConstructor;`
`4`	`4`	`import lombok.Builder;`