From a4e23dc03f5b804485ebddc9240fa007c327e649 Mon Sep 17 00:00:00 2001 From: Paldiu Date: Tue, 29 Dec 2020 22:14:57 -0600 Subject: [PATCH] Codacy Complacency Part 2 --- .../totalfreedommod/TotalFreedomMod.java | 22 +++++++++------ .../httpd/module/Module_logs.java | 1 - .../httpd/module/Module_players.java | 1 - .../httpd/module/Module_punishments.java | 1 - .../httpd/module/Module_schematic.java | 27 +++++++++++++------ 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java index d60bcff4..d60be15a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java @@ -1,6 +1,5 @@ package me.totalfreedom.totalfreedommod; -import com.sun.org.apache.xml.internal.security.Init; import java.io.File; import java.io.InputStream; import java.util.Properties; @@ -288,8 +287,10 @@ public class TotalFreedomMod extends JavaPlugin /** * This class is provided to please Codacy. */ - private final class Initializer { - public Initializer() { + private final class Initializer + { + public Initializer() + { initServices(); initAdminUtils(); initBridges(); @@ -297,7 +298,8 @@ public class TotalFreedomMod extends JavaPlugin initHTTPD(); } - private void initServices() { + private void initServices() + { // Start services si = new ServerInterface(); sf = new SavedFlags(); @@ -335,7 +337,8 @@ public class TotalFreedomMod extends JavaPlugin ptero = new Pterodactyl(); } - private void initAdminUtils() { + private void initAdminUtils() + { // Single admin utils cs = new CommandSpy(); ca = new Cager(); @@ -350,7 +353,8 @@ public class TotalFreedomMod extends JavaPlugin mo = new Monitors(); } - private void initBridges() { + private void initBridges() + { // Start bridges btb = new BukkitTelnetBridge(); cpb = new CoreProtectBridge(); @@ -361,7 +365,8 @@ public class TotalFreedomMod extends JavaPlugin wgb = new WorldGuardBridge(); } - private void initFun() { + private void initFun() + { // Fun cul = new CurseListener(); it = new ItemFun(); @@ -371,7 +376,8 @@ public class TotalFreedomMod extends JavaPlugin tr = new Trailer(); } - private void initHTTPD() { + private void initHTTPD() + { // HTTPD hd = new HTTPDaemon(); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logs.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logs.java index e40d191e..d9925ca3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logs.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_logs.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.httpd.module; import java.io.File; -import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; import me.totalfreedom.totalfreedommod.util.FLog; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java index 64217059..3ae3fbbe 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java @@ -1,6 +1,5 @@ package me.totalfreedom.totalfreedommod.httpd.module; -import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java index 88ecd9eb..09adca04 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_punishments.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.httpd.module; import java.io.File; -import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon; import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java index d9614745..808467c5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java @@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.httpd.module; import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat; import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats; -import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -181,6 +180,7 @@ public class Module_schematic extends HTTPDModule return out.toString(); } + //Reduced NPath Complexity. private void uploadSchematic(String remoteAddress) throws SchematicTransferException { Map files = getFiles(); @@ -203,6 +203,21 @@ public class Module_schematic extends HTTPDModule throw new SchematicTransferException("Can't resolve original file name."); } + func1(tempFile, origFileName); + + final File targetFile = new File(SCHEMATIC_FOLDER.getPath(), origFileName); + + if (targetFile.exists()) + { + throw new SchematicTransferException("Schematic already exists on the server."); + } + + func2(tempFile, targetFile, remoteAddress); + + } + + private void func1(File tempFile, String origFileName) throws SchematicTransferException + { if (tempFile.length() > FileUtils.ONE_MB) { throw new SchematicTransferException("Schematic is too big (1mb max)."); @@ -217,13 +232,10 @@ public class Module_schematic extends HTTPDModule { throw new SchematicTransferException("File name must be alphanumeric, between 1 and 30 characters long (inclusive), and have a \".schematic\" extension."); } + } - final File targetFile = new File(SCHEMATIC_FOLDER.getPath(), origFileName); - if (targetFile.exists()) - { - throw new SchematicTransferException("Schematic already exists on the server."); - } - + private void func2(File tempFile, File targetFile, String remoteAddress) throws SchematicTransferException + { try { FileUtils.copyFile(tempFile, targetFile); @@ -251,7 +263,6 @@ public class Module_schematic extends HTTPDModule FLog.severe(ex); throw new SchematicTransferException(); } - } private Response downloadSchematic(String schematicName) throws SchematicTransferException