Automatically organize imports with spotless (#606)

* Remove unused imports with spotless

* Fix files not ending with a new line with spotless

* Add TODO

so our crimes cannot be forgotten

* Fix import order with spotless

Order imports automatically in this order: external dependecies, internal org.togetherjava classes, java and static imports. Since that's the ordering we have been using so far.

Author: marko-radosavljevic

application/src/main/java/org/togetherjava/tjbot/Application.java

@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Features;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.commands.system.BotCore;

application/src/main/java/org/togetherjava/tjbot/CommandReloading.java

@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.BotCommand;
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.system.CommandProvider;

application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import org.jetbrains.annotations.Contract;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;

application/src/main/java/org/togetherjava/tjbot/commands/Features.java

@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.commands;
 
 import net.dv8tion.jda.api.JDA;
+
 import org.togetherjava.tjbot.commands.basic.PingCommand;
 import org.togetherjava.tjbot.commands.basic.RoleSelectCommand;
 import org.togetherjava.tjbot.commands.basic.SuggestionsUpDownVoter;

application/src/main/java/org/togetherjava/tjbot/commands/MessageContextCommand.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import java.util.List;

application/src/main/java/org/togetherjava/tjbot/commands/SlashCommand.java

@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import java.util.List;

application/src/main/java/org/togetherjava/tjbot/commands/UserContextCommand.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import java.util.List;

application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java

@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;

application/src/main/java/org/togetherjava/tjbot/commands/basic/PingCommand.java

@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.commands.basic;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 

application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java

@@ -16,13 +16,14 @@
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
 import java.awt.*;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java

@@ -9,6 +9,7 @@
 import net.dv8tion.jda.api.requests.ErrorResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.SuggestionsConfig;

application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java

@@ -15,10 +15,12 @@
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
 import javax.annotation.Nullable;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;

application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdGenerator.java

@@ -4,6 +4,7 @@
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 
 /**

application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdStore.java

@@ -8,6 +8,7 @@
 import org.jooq.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.ComponentIds;

application/src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java

@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 

application/src/main/java/org/togetherjava/tjbot/commands/help/AskCommand.java

@@ -16,6 +16,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;

application/src/main/java/org/togetherjava/tjbot/commands/help/AutoPruneHelperRoutine.java

@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;

application/src/main/java/org/togetherjava/tjbot/commands/help/BotMessageCleanup.java

@@ -9,6 +9,7 @@
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.HelpSystemConfig;

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java

@@ -16,13 +16,15 @@
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.HelpSystemConfig;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.HelpThreads;
 import org.togetherjava.tjbot.db.generated.tables.records.HelpThreadsRecord;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.io.InputStream;
 import java.util.List;

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadActivityUpdater.java

@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 
 import java.util.List;

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadAutoArchiver.java

@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.utils.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 
 import java.time.Duration;

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadCommand.java

@@ -16,6 +16,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadMetadataPurger.java

@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.JDA;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.HelpThreads;

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java

@@ -15,11 +15,13 @@
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.config.Config;
 
 import javax.annotation.Nullable;
+
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

application/src/main/java/org/togetherjava/tjbot/commands/help/ImplicitAskListener.java

@@ -15,6 +15,7 @@
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 

application/src/main/java/org/togetherjava/tjbot/commands/help/OnGuildLeaveCloseThreadListener.java

@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.EventReceiver;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.HelpThreads;

application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommand.java

@@ -12,10 +12,12 @@
 import org.scilab.forge.jlatexmath.TeXFormula;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
 import javax.imageio.ImageIO;
+
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.image.BufferedImage;

application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaCommand.java

@@ -4,8 +4,9 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.callbacks.IDeferrableCallback;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
-import org.togetherjava.tjbot.commands.CommandVisibility;
 import net.dv8tion.jda.api.utils.FileUpload;
+
+import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 

application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaHandler.java

@@ -7,8 +7,9 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.Error;
+
 import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.*;
+import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.Error;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;

application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaImages.java

@@ -4,6 +4,7 @@
 import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.WolframAlphaImage;
 
 import javax.imageio.ImageIO;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;

application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/api/RelatedExamples.java

@@ -6,9 +6,9 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * See the Wolfram Alpha API.

application/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java

@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 

application/src/main/java/org/togetherjava/tjbot/commands/moderation/ActionRecord.java

@@ -3,6 +3,7 @@
 import org.togetherjava.tjbot.db.generated.tables.records.ModerationActionsRecord;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 
 /**

application/src/main/java/org/togetherjava/tjbot/commands/moderation/AuditCommand.java

@@ -18,10 +18,12 @@
 import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageRequest;
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.util.*;

application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java

@@ -16,11 +16,13 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Objects;

application/src/main/java/org/togetherjava/tjbot/commands/moderation/KickCommand.java

@@ -14,11 +14,13 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**

application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationActionsStore.java

@@ -1,11 +1,13 @@
 package org.togetherjava.tjbot.commands.moderation;
 
 import org.jooq.Condition;
+
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.ModerationActions;
 import org.togetherjava.tjbot.db.generated.tables.records.ModerationActionsRecord;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Objects;

application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationUtils.java

@@ -6,9 +6,11 @@
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.config.Config;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java

@@ -11,12 +11,14 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Objects;