Clean code

src/main/java/com/severalcircles/flames/conversations/SparkConversation.java

@@ -22,10 +22,10 @@ public class SparkConversation extends Conversation {
     private final List<String> alreadyVoted = new LinkedList<>();
     private final Map<Message, Integer> messageList;
     private final String question;
-    Timer t = new Timer();
-    Timer t2 = new Timer();
+    final Timer t = new Timer();
+    final Timer t2 = new Timer();
     int votes = 0;
-    MessageChannelUnion channel;
+    final MessageChannelUnion channel;
     public SparkConversation(MessageChannelUnion channel, String question, int minutes) {
         super((GuildMessageChannel) channel);
         this.channel = channel;

src/main/java/com/severalcircles/flames/data/user/UserConfig.java

@@ -10,7 +10,12 @@
 import java.util.Properties;
 
 public class UserConfig implements FlamesData {
-    private Locale locale = Locale.getDefault();
+    private Locale locale;
+
+    {
+        Locale.getDefault();
+    }
+
     private boolean qotdAllowed;
     private boolean favQuoteAllowed;
 

src/main/java/com/severalcircles/flames/data/user/UserEntities.java

@@ -41,7 +41,7 @@ public List<UserEntity> getTopAndBottom() {
             topAndBottom.add(lowCandidates.get(2));
         return topAndBottom;
     }
-    private Map<String, UserEntity> entities = new HashMap<>();
+    private Map<String, UserEntity> entities;
 
     public Map<String, UserEntity> getEntities() {
         return entities;

src/main/java/com/severalcircles/flames/events/MessageContextEvent.java

@@ -8,7 +8,6 @@
 import com.severalcircles.flames.frontend.conversations.SparkVoteMessageContext;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;

src/main/java/com/severalcircles/flames/events/MessageEvent.java

@@ -39,7 +39,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         // Bots don't get processed by Flames, simply because it's easier on everyone.
         if (user.isBot()) return;
         if (user.getName().toUpperCase(Locale.ROOT).contains("GOLDLEWIS")) event.getMessage().reply("https://media.discordapp.net/attachments/543162982536970240/943936840015159336/SpottedGoldlewis.gif").complete();
-        String nick = "";
+        String nick;
         try {
             nick = Objects.requireNonNull(event.getGuild().getMemberById(Flames.api.getSelfUser().getId())).getNickname();
         } catch (NullPointerException e) {nick = "";}

src/main/java/com/severalcircles/flames/exception/FlamesHandlerEmbed.java

@@ -24,7 +24,7 @@ public class FlamesHandlerEmbed implements FlamesEmbed {
     private final String causedByImage;
     final ResourceBundle rsc;
     final String causedBy;
-    Color color;
+    final Color color;
     public FlamesHandlerEmbed(FlamesException e) {
         StackTraceElement[] st = Thread.currentThread().getStackTrace();
         String className = st[3].getClassName();

src/main/java/com/severalcircles/flames/exception/handle/FlamesExceptionHandler.java

@@ -9,7 +9,7 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 
 public class FlamesExceptionHandler extends ThrowableHandler {
-    FlamesException e;
+    final FlamesException e;
     public FlamesExceptionHandler(FlamesException e) {
         this.e = e;
     }

src/main/java/com/severalcircles/flames/exception/handle/FlamesRuntimeExceptionHandler.java

@@ -10,8 +10,8 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 
 public class FlamesRuntimeExceptionHandler extends ThrowableHandler {
-    FlamesRuntimeException e;
-    String cause;
+    final FlamesRuntimeException e;
+    final String cause;
     public FlamesRuntimeExceptionHandler(FlamesRuntimeException e, Class cls) {
         this.e = e;
         if (Flames.runningDebug) this.cause = cls.getName() + "(" + e.getStackTrace()[0].getLineNumber() + ")";

src/main/java/com/severalcircles/flames/external/ImageSearch.java

@@ -19,7 +19,7 @@ public static String searchImage(String q) throws IOException {
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
         con.setRequestMethod("GET");
         con.setRequestProperty("Authorization", "Authorization: Client-ID 5BgyDJn2wiCT7SNM8kVyKeFFCWsnBvXM8F1jCEti-t8");
-        StringBuffer content = new StringBuffer();
+        StringBuffer content;
         try {
             BufferedReader in = new BufferedReader(
                     new InputStreamReader(con.getInputStream()));

src/main/java/com/severalcircles/flames/frontend/FlamesEmbed.java

@@ -7,5 +7,5 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 
 public interface FlamesEmbed {
-    public MessageEmbed get();
+    MessageEmbed get();
 }

src/main/java/com/severalcircles/flames/frontend/FlamesMessageContext.java

@@ -7,5 +7,5 @@
 import net.dv8tion.jda.api.interactions.commands.context.MessageContextInteraction;
 
 public interface FlamesMessageContext {
-    public void execute(MessageContextInteraction event);
+    void execute(MessageContextInteraction event);
 }

src/main/java/com/severalcircles/flames/frontend/conversations/SparkCommand.java

@@ -15,7 +15,7 @@
 
 public class SparkCommand implements FlamesCommand {
     @Override
-    public void execute(SlashCommandInteractionEvent event, FlamesUser sender) throws ConsentException, IOException {
+    public void execute(SlashCommandInteractionEvent event, FlamesUser sender) {
         if (!SparkConversation.sparkConversations.isEmpty()) {
             event.reply("There is already a Spark conversation in progress!").setEphemeral(true).complete();
             return;

src/main/java/com/severalcircles/flames/frontend/conversations/SparkResultsEmbed.java

@@ -15,18 +15,18 @@
 import java.util.ResourceBundle;
 
 public class SparkResultsEmbed implements FlamesEmbed {
-    String question;
-    String answer;
-    int votes;
+    final String question;
+    final String answer;
+    final int votes;
 public SparkResultsEmbed(String question, String answer, int votes) {
         this.question = question;
         this.answer = answer;
         this.votes = votes;
     }
-    ResourceBundle local = Flames.local();
+    final ResourceBundle local = Flames.local();
     @Override
     public MessageEmbed get() {
-        MessageEmbed embed = null;
+        MessageEmbed embed;
         try {
             embed = new EmbedBuilder()
                     .setTitle(question)

src/main/java/com/severalcircles/flames/frontend/conversations/SparkStartEmbed.java

@@ -19,26 +19,27 @@
 import java.util.ResourceBundle;
 
 public class SparkStartEmbed implements FlamesEmbed {
-    ResourceBundle local;
-    FlamesUser fluser;
-    User user;
-    String question;
-    int minutes;
+    final ResourceBundle local;
+    final FlamesUser fluser;
+    final User user;
+    final String question;
+    final int minutes;
     public SparkStartEmbed(FlamesUser fluser, User user, String question, int minutes) {
         local = Flames.local();
         this.fluser = fluser;
         this.user = user;
         this.question = question;
         this.minutes = minutes;
-        if (minutes > 5) minutes = 5;
+        if (minutes > 5) {
+        }
     }
 
     @Override
     public MessageEmbed get() {
         String eS = "<t:" + (Instant.now().plus(minutes, ChronoUnit.MINUTES).toEpochMilli() / 1000) + ":R>";
         eS = eS.replace(" ", "");
         System.out.println(eS);
-        MessageEmbed embed = null;
+        MessageEmbed embed;
         try {
             embed = new EmbedBuilder()
                     .setColor(Color.CYAN)

src/main/java/com/severalcircles/flames/frontend/conversations/SparkVoteMessageContext.java

@@ -10,7 +10,6 @@
 import net.dv8tion.jda.api.interactions.commands.context.MessageContextInteraction;
 
 import java.util.Objects;
-import java.util.ResourceBundle;
 
 public class SparkVoteMessageContext implements FlamesMessageContext {
     @Override

src/main/java/com/severalcircles/flames/frontend/data/other/GlobalDataEmbed.java

@@ -7,7 +7,6 @@
 import com.severalcircles.flames.Flames;
 import com.severalcircles.flames.data.global.GlobalData;
 import com.severalcircles.flames.data.user.FlamesUser;
-import com.severalcircles.flames.util.Ranking;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;

src/main/java/com/severalcircles/flames/frontend/data/user/embed/UserDataEmbed.java

@@ -12,14 +12,12 @@
 import com.severalcircles.flames.data.user.UserFunFacts;
 import com.severalcircles.flames.external.FlamesAssets;
 import com.severalcircles.flames.frontend.FlamesEmbed;
-import com.severalcircles.flames.util.Emotion;
 import com.severalcircles.flames.util.Ranking;
 import com.severalcircles.flames.util.StringUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;
 
-import java.awt.*;
 import java.util.List;
 import java.util.ResourceBundle;
 

src/main/java/com/severalcircles/flames/frontend/data/user/embed/WelcomeBackEmbed.java

@@ -7,7 +7,6 @@
 import com.severalcircles.flames.Flames;
 import com.severalcircles.flames.data.user.FlamesUser;
 import com.severalcircles.flames.frontend.FlamesEmbed;
-import com.severalcircles.flames.frontend.today.Today;
 import com.severalcircles.flames.util.StringUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;

src/main/java/com/severalcircles/flames/frontend/thanks/ThanksContext.java

@@ -30,7 +30,7 @@ public void execute(UserContextInteractionEvent event) {
         FlamesUser flt;
         try {
             flt = FlamesDataManager.readUser(thanked);
-            sender = FlamesDataManager.readUser(event.getUser());
+            FlamesDataManager.readUser(event.getUser());
         } catch (IOException e) {
             e.printStackTrace();
             event.replyEmbeds(new ExceptionHandler(e).handleThenGetFrontend()).complete();

src/main/java/com/severalcircles/flames/util/Ranking.java

@@ -4,10 +4,6 @@
 
 package com.severalcircles.flames.util;
 
-import com.severalcircles.flames.data.global.GlobalData;
-
-import java.io.IOException;
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.ResourceBundle;
 

src/main/java/org/json/Cookie.java

@@ -96,7 +96,7 @@ public static JSONObject toJSONObject(String string) {
 
         name = unescape(x.nextTo('=').trim());
         //per RFC6265, if the name is blank, the cookie should be ignored.
-        if("".equals(name)) {
+        if(name.isEmpty()) {
             throw new JSONException("Cookies must have a 'name'");
         }
         jo.put("name", name);
@@ -124,7 +124,7 @@ public static JSONObject toJSONObject(String string) {
                 x.next();
             }
             // only store non-blank attributes
-            if(!"".equals(name) && !"".equals(value)) {
+            if(!name.isEmpty() && !"".equals(value)) {
                 jo.put(name, value);
             }
         }
@@ -160,7 +160,7 @@ public static String toString(JSONObject jo) throws JSONException {
             }
         }
 
-        if(name == null || "".equals(name.trim())) {
+        if(name == null || name.trim().isEmpty()) {
             throw new JSONException("Cookie does not have a name");
         }
         if(value == null) {

src/main/java/org/json/JSONPointer.java

@@ -160,7 +160,7 @@ public JSONPointer(final String pointer) {
         }
         this.refTokens = new ArrayList<String>();
         int slashIdx = -1;
-        int prevSlashIdx = 0;
+        int prevSlashIdx;
         do {
             prevSlashIdx = slashIdx + 1;
             slashIdx = refs.indexOf('/', prevSlashIdx);

src/main/java/org/json/JSONTokener.java

@@ -453,7 +453,7 @@ public Object nextValue() throws JSONException {
         }
 
         string = sb.toString().trim();
-        if ("".equals(string)) {
+        if (string.isEmpty()) {
             throw this.syntaxError("Missing value");
         }
         return JSONObject.stringToValue(string);

src/main/java/org/json/JSONWriter.java

@@ -89,7 +89,7 @@ public class JSONWriter {
     /**
      * The writer that will receive the output.
      */
-    protected Appendable writer;
+    protected final Appendable writer;
 
     /**
      * Make a fresh JSONWriter. It can be used to build one JSON text.

src/main/java/org/json/XML.java

@@ -24,9 +24,10 @@ of this software and associated documentation files (the "Software"), to deal
 SOFTWARE.
 */
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.Reader;
 import java.io.StringReader;
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Iterator;
@@ -89,6 +90,7 @@ public class XML {
      */
     private static Iterable<Integer> codePointIterator(final String string) {
         return new Iterable<Integer>() {
+            @NotNull
             @Override
             public Iterator<Integer> iterator() {
                 return new Iterator<Integer>() {
@@ -256,7 +258,7 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, XMLP
             throws JSONException {
         char c;
         int i;
-        JSONObject jsonObject = null;
+        JSONObject jsonObject;
         String string;
         String tagName;
         Object token;

src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider

@@ -1,6 +1,3 @@
 #
 # Copyright (c) 2022 Several Circles.
-#
-
-io.grpc.internal.PickFirstLoadBalancerProvider
-io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider
+#