optimized workflow

ezTxmMC · ezTxmMC · commit 4d54cbc5e1a2 · 2026-01-01T01:49:25.000+01:00
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/ServerManagerNode.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/ServerManagerNode.java
@@ -25,15 +25,15 @@ public void shutdownHook() {
         }));
     }
 
-    public Console getConsole() {
+    public Console console() {
         return this.console;
     }
 
-    public ServerActionRunner getActionRunner() {
+    public ServerActionRunner actionRunner() {
         return this.actionRunner;
     }
 
-    public TemplateManager getTemplateManager() {
+    public TemplateManager templateManager() {
         return templateManager;
     }
 
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/config/JsonConfig.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/config/JsonConfig.java
@@ -77,7 +77,7 @@ public Object get(String key) {
     public void save() {
         File file = new File(this.configFile.toString());
         try (FileWriter fileWriter = new FileWriter(file)) {
-            fileWriter.write(this.jsonObject.toString());
+            fileWriter.write(this.jsonObject.toString(4));
             fileWriter.flush();
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/console/Console.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/console/Console.java
@@ -88,11 +88,11 @@ public void start() {
                             System.out.println("Template " + commandParts[2] + " gelöscht.");
                         }
                         case "list" -> {
-                            if (this.templateManager.getTemplates().isEmpty()) {
+                            if (this.templateManager.templates().isEmpty()) {
                                 System.out.println("Keine Templates gefunden.");
                                 continue;
                             }
-                            this.templateManager.getTemplates().forEach((name, path) -> System.out.printf("- %s -> %s%n", name, path.toString()));
+                            this.templateManager.templates().forEach((name, path) -> System.out.printf("- %s -> %s%n", name, path.toString()));
                         }
                     }
                 }
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/server/MinecraftServerProcess.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/server/MinecraftServerProcess.java
@@ -53,7 +53,7 @@ public void start() {
                 } catch (IOException e) {
                     e.printStackTrace();
                 } finally {
-                    this.node.getActionRunner().getServers().remove(name);
+                    this.node.actionRunner().servers().remove(name);
                     insideConsole = false;
                 }
             });
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/server/ServerActionRunner.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/server/ServerActionRunner.java
@@ -6,10 +6,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Scanner;
+import java.util.*;
+import java.util.stream.Stream;
 
 public class ServerActionRunner {
     private final ServerManagerNode node;
@@ -23,33 +21,31 @@ public ServerActionRunner(ServerManagerNode node, TemplateManager templateManage
     }
 
     public void createServer(Path path, String templateName) {
-        try {
             if (!path.toFile().mkdirs()) {
                 System.out.println("Konnte Pfad nicht erstellen.");
                 return;
             }
-            Path templatePath = this.templateManager.getTemplate(templateName);
+            Path templatePath = this.templateManager.templatePath(templateName);
             if (templatePath == null) {
                 System.out.println("Template Pfad konnte nicht gefunden werden.");
                 return;
             }
             System.out.println("[SERVER] Template-Path: " + templatePath);
-            Files.walk(templatePath).forEach(source -> {
+        try (Stream<Path> files = Files.walk(templatePath)) {
+            files.forEach(source -> {
                 try {
                     Path destination = path.resolve(templatePath.relativize(source));
-
                     if (Files.isDirectory(source)) {
                         Files.createDirectories(destination);
                         return;
                     }
-
                     Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
                 } catch (Exception e) {
                     System.out.println("Fehler beim Erstellen des Servers mit Pfad '" + path + "': " + e.getMessage());
                 }
             });
         } catch (Exception e) {
-            System.out.println("Fehler beim Erstellen des Servers mit Pfad '" + path.toString() + "': " + e.getMessage());
+            System.out.println("Fehler beim Erstellen des Servers mit Pfad '" + path + "': " + e.getMessage());
         }
     }
 
@@ -98,7 +94,7 @@ public void shutdownAllServers() {
         System.out.println("Alle Server gestoppt.");
     }
 
-    public Map<String, MinecraftServerProcess> getServers() {
+    public Map<String, MinecraftServerProcess> servers() {
         return servers;
     }
 }
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/template/TemplateManager.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/template/TemplateManager.java
@@ -10,7 +10,6 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 public class TemplateManager {
     private final String templatesPath;
@@ -36,7 +35,7 @@ public TemplateManager() {
     }
 
     public void createTemplate(String name) {
-        if (this.getTemplate(name) != null) {
+        if (this.templatePath(name) != null) {
             System.out.println("Template " + name + " already exists");
             return;
         }
@@ -64,15 +63,15 @@ public void createTemplate(String name) {
     }
 
     public void renameTemplate(String name, String newName) {
-        if (this.getTemplate(name) == null) {
+        if (this.templatePath(name) == null) {
             System.out.println("Template " + name + " does not exist");
             return;
         }
         try {
             this.createTemplate(newName);
-            System.out.println(this.getTemplate(name).toString());
-            System.out.println(this.getTemplate(newName).toString());
-            Files.move(this.getTemplate(name), this.getTemplate(newName), StandardCopyOption.ATOMIC_MOVE);
+            System.out.println(this.templatePath(name).toString());
+            System.out.println(this.templatePath(newName).toString());
+            Files.move(this.templatePath(name), this.templatePath(newName), StandardCopyOption.ATOMIC_MOVE);
             JSONArray templatesArray = (JSONArray) this.templatesConfig.get("templates");
             for (int i = 0; i < templatesArray.length(); i++) {
                 JSONObject object = templatesArray.getJSONObject(i);
@@ -95,11 +94,11 @@ public void renameTemplate(String name, String newName) {
 
     public void deleteTemplate(String name) {
         try {
-            if (this.getTemplate(name) == null) {
+            if (this.templatePath(name) == null) {
                 System.out.println("Template " + name + " does not exist");
                 return;
             }
-            Files.walkFileTree(this.getTemplate(name), new SimpleFileVisitor<>() {
+            Files.walkFileTree(this.templatePath(name), new SimpleFileVisitor<>() {
                 @Override
                 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                     Files.delete(file);
@@ -131,7 +130,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
         }
     }
 
-    public Path getTemplate(String name) {
+    public Path templatePath(String name) {
         JSONArray templatesArray = (JSONArray) this.templatesConfig.get("templates");
         for (int i = 0; i < templatesArray.length(); i++) {
             JSONObject object = templatesArray.getJSONObject(i);
@@ -142,7 +141,7 @@ public Path getTemplate(String name) {
         return null;
     }
 
-    public Map<String, Path> getTemplates() {
+    public Map<String, Path> templates() {
         return templates;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ public void shutdownHook() {`
`25`	`25`	`}));`
`26`	`26`	`}`
`27`	`27`
`28`		`- public Console getConsole() {`
	`28`	`+ public Console console() {`
`29`	`29`	`return this.console;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public ServerActionRunner getActionRunner() {`
	`32`	`+ public ServerActionRunner actionRunner() {`
`33`	`33`	`return this.actionRunner;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public TemplateManager getTemplateManager() {`
	`36`	`+ public TemplateManager templateManager() {`
`37`	`37`	`return templateManager;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ public void start() {`
`88`	`88`	`System.out.println("Template " + commandParts[2] + " gelöscht.");`
`89`	`89`	`}`
`90`	`90`	`case "list" -> {`
`91`		`- if (this.templateManager.getTemplates().isEmpty()) {`
	`91`	`+ if (this.templateManager.templates().isEmpty()) {`
`92`	`92`	`System.out.println("Keine Templates gefunden.");`
`93`	`93`	`continue;`
`94`	`94`	`}`
`95`		`- this.templateManager.getTemplates().forEach((name, path) -> System.out.printf("- %s -> %s%n", name, path.toString()));`
	`95`	`+ this.templateManager.templates().forEach((name, path) -> System.out.printf("- %s -> %s%n", name, path.toString()));`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void start() {`
`53`	`53`	`} catch (IOException e) {`
`54`	`54`	`e.printStackTrace();`
`55`	`55`	`} finally {`
`56`		`- this.node.getActionRunner().getServers().remove(name);`
	`56`	`+ this.node.actionRunner().servers().remove(name);`
`57`	`57`	`insideConsole = false;`
`58`	`58`	`}`
`59`	`59`	`});`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`	`import java.nio.file.Files;`
`7`	`7`	`import java.nio.file.Path;`
`8`	`8`	`import java.nio.file.StandardCopyOption;`
`9`		`-import java.util.ArrayList;`
`10`		`-import java.util.HashMap;`
`11`		`-import java.util.Map;`
`12`		`-import java.util.Scanner;`
	`9`	`+import java.util.*;`
	`10`	`+import java.util.stream.Stream;`
`13`	`11`
`14`	`12`	`public class ServerActionRunner {`
`15`	`13`	`private final ServerManagerNode node;`
`@@ -23,33 +21,31 @@ public ServerActionRunner(ServerManagerNode node, TemplateManager templateManage`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`public void createServer(Path path, String templateName) {`
`26`		`- try {`
`27`	`24`	`if (!path.toFile().mkdirs()) {`
`28`	`25`	`System.out.println("Konnte Pfad nicht erstellen.");`
`29`	`26`	`return;`
`30`	`27`	`}`
`31`		`- Path templatePath = this.templateManager.getTemplate(templateName);`
	`28`	`+ Path templatePath = this.templateManager.templatePath(templateName);`
`32`	`29`	`if (templatePath == null) {`
`33`	`30`	`System.out.println("Template Pfad konnte nicht gefunden werden.");`
`34`	`31`	`return;`
`35`	`32`	`}`
`36`	`33`	`System.out.println("[SERVER] Template-Path: " + templatePath);`
`37`		`- Files.walk(templatePath).forEach(source -> {`
	`34`	`+ try (Stream<Path> files = Files.walk(templatePath)) {`
	`35`	`+ files.forEach(source -> {`
`38`	`36`	`try {`
`39`	`37`	`Path destination = path.resolve(templatePath.relativize(source));`
`40`		`-`
`41`	`38`	`if (Files.isDirectory(source)) {`
`42`	`39`	`Files.createDirectories(destination);`
`43`	`40`	`return;`
`44`	`41`	`}`
`45`		`-`
`46`	`42`	`Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);`
`47`	`43`	`} catch (Exception e) {`
`48`	`44`	`System.out.println("Fehler beim Erstellen des Servers mit Pfad '" + path + "': " + e.getMessage());`
`49`	`45`	`}`
`50`	`46`	`});`
`51`	`47`	`} catch (Exception e) {`
`52`		`- System.out.println("Fehler beim Erstellen des Servers mit Pfad '" + path.toString() + "': " + e.getMessage());`
	`48`	`+ System.out.println("Fehler beim Erstellen des Servers mit Pfad '" + path + "': " + e.getMessage());`
`53`	`49`	`}`
`54`	`50`	`}`
`55`	`51`
`@@ -98,7 +94,7 @@ public void shutdownAllServers() {`
`98`	`94`	`System.out.println("Alle Server gestoppt.");`
`99`	`95`	`}`
`100`	`96`
`101`		`- public Map<String, MinecraftServerProcess> getServers() {`
	`97`	`+ public Map<String, MinecraftServerProcess> servers() {`
`102`	`98`	`return servers;`
`103`	`99`	`}`
`104`	`100`	`}`