Skip to content

Commit 944f063

Browse files
authored
fix issues detected using Spotbugs and similar tooling (#274)
* fix autodetected issues * add spacing before and after assignment operator
1 parent d007ec0 commit 944f063

17 files changed

+14
-59
lines changed

src/main/java/net/javadiscord/javabot/data/h2db/message_cache/dao/MessageCacheRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.javadiscord.javabot.data.h2db.message_cache.dao;
22

33
import lombok.RequiredArgsConstructor;
4-
import lombok.extern.slf4j.Slf4j;
54
import net.javadiscord.javabot.data.h2db.message_cache.model.CachedMessage;
65

76
import java.sql.*;
@@ -11,7 +10,6 @@
1110
/**
1211
* Dao class that represents the QOTW_POINTS SQL Table.
1312
*/
14-
@Slf4j
1513
@RequiredArgsConstructor
1614
public class MessageCacheRepository {
1715
private final Connection con;

src/main/java/net/javadiscord/javabot/listener/GitHubLinkListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
3131
Matcher matcher = GITHUB_LINK_PATTERN.matcher(event.getMessage().getContentRaw());
3232
if (matcher.find()) {
3333
Pair<String, String> content = this.parseGithubUrl(matcher.group());
34-
if (!content.first().isBlank() && !content.first().isBlank()) {
34+
if (!content.first().isBlank() && !content.second().isBlank()) {
3535
event.getMessage().reply(String.format("```%s\n%s\n```", content.second(), StringUtils.standardSanitizer().compute(content.first())))
3636
.allowedMentions(List.of())
3737
.setActionRow(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"), Button.link(matcher.group(), "View on GitHub"))

src/main/java/net/javadiscord/javabot/listener/InteractionListener.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.javadiscord.javabot.listener;
22

3-
import lombok.extern.slf4j.Slf4j;
43
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
54
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
65
import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
@@ -18,7 +17,6 @@
1817
/**
1918
* Listens for Interaction Events and handles them.
2019
*/
21-
@Slf4j
2220
public class InteractionListener extends ListenerAdapter {
2321

2422
/**

src/main/java/net/javadiscord/javabot/listener/JobChannelVoteListener.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.javadiscord.javabot.listener;
22

3-
import lombok.extern.slf4j.Slf4j;
43
import net.dv8tion.jda.api.entities.MessageReaction;
54
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
65
import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -11,7 +10,6 @@
1110
* Listens for reactions in #looking-for-programmer.
1211
* Automatically deletes messages below a certain score.
1312
*/
14-
@Slf4j
1513
public class JobChannelVoteListener extends ListenerAdapter {
1614
@Override
1715
public void onMessageReactionAdd(@NotNull MessageReactionAddEvent event) {

src/main/java/net/javadiscord/javabot/systems/commands/ProfileCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private MessageEmbed buildProfileEmbed(Member member, Connection con) throws SQL
6363
.addField("QOTW-Points", String.format("`%s point%s (#%s)`",
6464
points,
6565
points == 1 ? "" : "s",
66-
new LeaderboardCommand().getQOTWRank(member, member.getGuild())), true)
66+
LeaderboardCommand.getQOTWRank(member, member.getGuild())), true)
6767
.addField("Total Help XP", String.format("`%.2f XP`", helpXP), true)
6868
.addField("Server joined", String.format("<t:%s:R>", member.getTimeJoined().toEpochSecond()), true)
6969
.addField("Account created", String.format("<t:%s:R>", member.getUser().getTimeCreated().toEpochSecond()), true);

src/main/java/net/javadiscord/javabot/systems/commands/SearchCommand.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import net.javadiscord.javabot.command.Responses;
1111
import net.javadiscord.javabot.command.interfaces.SlashCommand;
1212

13-
import javax.net.ssl.HttpsURLConnection;
1413
import java.io.IOException;
15-
import java.io.InputStream;
14+
import java.net.HttpURLConnection;
1615
import java.net.URL;
1716
import java.net.URLEncoder;
1817
import java.nio.charset.StandardCharsets;
@@ -34,12 +33,14 @@ private SearchResults searchWeb(String searchQuery) throws IOException {
3433
URL url = new URL(HOST + PATH + "?q=" + URLEncoder.encode(searchQuery, StandardCharsets.UTF_8.toString()) + "&mkt=" + "en-US" + "&safeSearch=Strict");
3534

3635
// Open the connection.
37-
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
36+
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
3837
connection.setRequestProperty("Ocp-Apim-Subscription-Key", Bot.config.getSystems().azureSubscriptionKey);
3938

4039
// Receive the JSON response body.
41-
InputStream stream = connection.getInputStream();
42-
String response = new Scanner(stream).useDelimiter("\\A").next();
40+
String response;
41+
try(Scanner scan = new Scanner(connection.getInputStream()).useDelimiter("\\A")){
42+
response = scan.next();
43+
}
4344

4445
// Construct the result object.
4546
SearchResults results = new SearchResults(new HashMap<>(), response);
@@ -52,7 +53,6 @@ private SearchResults searchWeb(String searchQuery) throws IOException {
5253
results.relevantHeaders.put(header, headers.get(header).get(0));
5354
}
5455
}
55-
stream.close();
5656
return results;
5757
}
5858

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelListener.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ public class HelpChannelListener extends ListenerAdapter {
2525
/**
2626
* A static Map that holds all messages that was sent in a specific reserved channel.
2727
*/
28-
public static Map<Long, List<Message>> reservationMessages;
29-
30-
public HelpChannelListener() {
31-
HelpChannelListener.reservationMessages = new HashMap<>();
32-
}
28+
public static Map<Long, List<Message>> reservationMessages = new HashMap<>();
3329

3430
@Override
3531
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
@@ -62,10 +58,10 @@ public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
6258
reservationOptional.ifPresent(reservation -> {
6359
List<Message> messages = new ArrayList<>();
6460
messages.add(event.getMessage());
65-
if (HelpChannelListener.reservationMessages.containsKey(reservation.getId())) {
66-
messages.addAll(HelpChannelListener.reservationMessages.get(reservation.getId()));
61+
if (reservationMessages.containsKey(reservation.getId())) {
62+
messages.addAll(reservationMessages.get(reservation.getId()));
6763
}
68-
HelpChannelListener.reservationMessages.put(reservation.getId(), messages);
64+
reservationMessages.put(reservation.getId(), messages);
6965
});
7066
} else if (config.getDormantChannelCategory().equals(channel.getParentCategory())) {
7167
// Prevent anyone from sending messages in dormant channels.

src/main/java/net/javadiscord/javabot/systems/moderation/AutoMod.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
import net.javadiscord.javabot.systems.notification.GuildNotificationService;
1414

1515
import javax.annotation.Nonnull;
16-
import javax.net.ssl.HttpsURLConnection;
1716
import java.io.IOException;
18-
import java.io.InputStream;
1917
import java.net.URI;
2018
import java.net.URISyntaxException;
2119
import java.net.URL;
@@ -45,11 +43,8 @@ public class AutoMod extends ListenerAdapter {
4543
* Constructor of the class, that creates a list of strings with potential spam/scam urls.
4644
*/
4745
public AutoMod() {
48-
try {
49-
URL url = new URL("https://raw.githubusercontent.com/DevSpen/scam-links/master/src/links.txt");
50-
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
51-
InputStream stream = connection.getInputStream();
52-
String response = new Scanner(stream).useDelimiter("\\A").next();
46+
try(Scanner scan = new Scanner(new URL("https://raw.githubusercontent.com/DevSpen/scam-links/master/src/links.txt").openStream()).useDelimiter("\\A")) {
47+
String response = scan.next();
5348
spamUrls = List.of(response.split("\n"));
5449
} catch (IOException e) {
5550
e.printStackTrace();

src/main/java/net/javadiscord/javabot/systems/notification/GuildNotificationService.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,4 @@ public void sendMessageLogChannelNotification(MessageEmbed embed) {
5959
}
6060
this.sendMessageChannelNotification(config.getMessageCache().getMessageCacheLogChannel(), embed);
6161
}
62-
63-
/**
64-
* Sends a simple Message to the Guild's message log channel.
65-
*
66-
* @param string The message that should be sent.
67-
* @param args Optional args for formatting.
68-
*/
69-
private void sendMessageLogChannelNotification(String string, Object... args) {
70-
if (config.getMessageCache().getMessageCacheLogChannel() == null) {
71-
log.warn("Could not find Message Log Channel for Guild {}", guild.getName());
72-
return;
73-
}
74-
this.sendMessageChannelNotification(config.getMessageCache().getMessageCacheLogChannel(), string, args);
75-
}
7662
}

src/main/java/net/javadiscord/javabot/systems/qotw/QOTWCloseSubmissionsJob.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.javadiscord.javabot.systems.qotw;
22

3-
import lombok.extern.slf4j.Slf4j;
43
import net.dv8tion.jda.api.JDA;
54
import net.dv8tion.jda.api.Permission;
65
import net.dv8tion.jda.api.entities.Message;
@@ -21,7 +20,6 @@
2120
/**
2221
* Job which disables the Submission button.
2322
*/
24-
@Slf4j
2523
public class QOTWCloseSubmissionsJob extends DiscordApiJob {
2624
@Override
2725
protected void execute(JobExecutionContext context, JDA jda) throws JobExecutionException {

0 commit comments

Comments
 (0)