From 47f8c5cbc32cdf10579d03c4d128211ba9c834e8 Mon Sep 17 00:00:00 2001 From: szymon Date: Wed, 7 Jul 2021 14:23:54 +0200 Subject: [PATCH] Style correction, removed unnecessary constructors from records --- .../textile_backup/core/create/BackupContext.java | 12 +++--------- .../textile_backup/core/create/BackupHelper.java | 5 ++--- .../core/create/compressors/AbstractCompressor.java | 11 ++++++----- .../core/restore/RestoreBackupRunnable.java | 3 +-- .../textile_backup/core/restore/RestoreContext.java | 10 ++-------- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java b/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java index d8e6812..3455c4d 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/BackupContext.java @@ -24,17 +24,11 @@ import net.minecraft.server.command.ServerCommandSource; import net.szum123321.textile_backup.core.ActionInitiator; import org.jetbrains.annotations.NotNull; -public record BackupContext(MinecraftServer server, +public record BackupContext(@NotNull MinecraftServer server, ServerCommandSource commandSource, - ActionInitiator initiator, boolean save, + ActionInitiator initiator, + boolean save, String comment) { - public BackupContext(@NotNull MinecraftServer server, ServerCommandSource commandSource, @NotNull ActionInitiator initiator, boolean save, String comment) { - this.server = server; - this.commandSource = commandSource; - this.initiator = initiator; - this.save = save; - this.comment = comment; - } public MinecraftServer getServer() { return server; diff --git a/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java b/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java index 7d643e6..d06ac61 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/BackupHelper.java @@ -52,11 +52,10 @@ public class BackupHelper { builder.append(ctx.getInitiator().getPrefix()); - if(ctx.startedByPlayer()) { + if(ctx.startedByPlayer()) builder.append(ctx.getCommandSource().getDisplayName().getString()); - } else { + else builder.append(ctx.getInitiator().getName()); - } builder.append(" on: "); builder.append(Utilities.getDateTimeFormatter().format(LocalDateTime.now())); diff --git a/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java b/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java index 105a317..63498ed 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java @@ -60,11 +60,12 @@ public abstract class AbstractCompressor { finish(arc); } catch(NoSpaceLeftOnDeviceException e) { - log.error("CRITICAL ERROR OCCURRED!"); - log.error("The backup is corrupted."); - log.error("Don't panic! This is a known issue!"); - log.error("For help see: https://github.com/Szum123321/textile_backup/wiki/ZIP-Problems"); - log.error("In case this isn't it here's also the exception itself!", e); + log.error(""" + CRITICAL ERROR OCCURRED! + The backup is corrupted.; + Don't panic! This is a known issue! + For help see: https://github.com/Szum123321/textile_backup/wiki/ZIP-Problems + In case this isn't it here's also the exception itself!""", e); if(ctx.getInitiator() == ActionInitiator.Player) { log.sendError(ctx, "Backup failed. The file is corrupt."); diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java index 33ab6d2..171bb55 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java @@ -82,8 +82,7 @@ public class RestoreBackupRunnable implements Runnable { if(config.get().deleteOldBackupAfterRestore) { log.info("Deleting old backup"); - if(!ctx.getFile().getFile().delete()) - log.info("Something went wrong while deleting old backup"); + if(!ctx.getFile().getFile().delete()) log.info("Something went wrong while deleting old backup"); } //in case we're playing on client diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java index a94236d..6ccc998 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java @@ -26,16 +26,10 @@ import net.szum123321.textile_backup.core.ActionInitiator; import javax.annotation.Nullable; public record RestoreContext(RestoreHelper.RestoreableFile file, - MinecraftServer server, @Nullable String comment, + MinecraftServer server, + @Nullable String comment, ActionInitiator initiator, ServerCommandSource commandSource) { - public RestoreContext(RestoreHelper.RestoreableFile file, MinecraftServer server, @Nullable String comment, ActionInitiator initiator, ServerCommandSource commandSource) { - this.file = file; - this.server = server; - this.comment = comment; - this.initiator = initiator; - this.commandSource = commandSource; - } public RestoreHelper.RestoreableFile getFile() { return file;