diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml index e2ac6d0..3d88834 100644 --- a/config/spotbugs/excludeFilter.xml +++ b/config/spotbugs/excludeFilter.xml @@ -27,4 +27,10 @@ + + + + + + diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java index c6d0ab9..8ce289e 100644 --- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java +++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java @@ -241,7 +241,7 @@ public class Mobibot extends PircBot { today = EntriesMgr.loadEntries(logsDir + EntriesMgr.CURRENT_XML, ircChannel, entries); if (logger.isDebugEnabled()) { - logger.debug("Last feed: " + today); + logger.debug("Last feed: {}", today); } if (!Utils.today().equals(today)) { @@ -831,7 +831,7 @@ public class Mobibot extends PircBot { } } - send(sender, "The following nicks are ignored: " + ignoredNicks.toString()); + send(sender, "The following nicks are ignored: " + ignoredNicks); } } @@ -971,7 +971,7 @@ public class Mobibot extends PircBot { final String hostname, final String message) { if (logger.isDebugEnabled()) { - logger.debug(">>> " + sender + ": " + message); + logger.debug(">>> {} : {}", sender, message); } boolean isCommand = false; @@ -1276,7 +1276,7 @@ public class Mobibot extends PircBot { final String hostname, final String message) { if (logger.isDebugEnabled()) { - logger.debug(">>> " + sender + ": " + message); + logger.debug(">>> {} : {}", sender, message); } final String[] cmds = message.split(" ", 2); @@ -1443,13 +1443,13 @@ public class Mobibot extends PircBot { if (Utils.isValidString(message) && Utils.isValidString(sender)) { if (isPrivate) { if (logger.isDebugEnabled()) { - logger.debug("Sending message to " + sender + ": " + message); + logger.debug("Sending message to {} : {}", sender, message); } sendMessage(sender, message); } else { if (logger.isDebugEnabled()) { - logger.debug("Sending notice to " + sender + ": " + message); + logger.debug("Sending notice to {} : {}", sender, message); } sendNotice(sender, message); diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java index 3a3920f..453e56a 100644 --- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java +++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java @@ -189,7 +189,7 @@ public final class EntriesMgr { * @param history The history array. * @param isDayBackup Set the true if the daily backup file should also be created. */ - @SuppressFBWarnings(value = "CE_CLASS_ENVY", justification = "Yes, it does.") + @SuppressFBWarnings(value = {"CE_CLASS_ENVY", "CC_CYCLOMATIC_COMPLEXITY"}, justification = "Yes, it does.") public static void saveEntries(final Mobibot bot, final List entries, final List history, @@ -221,9 +221,15 @@ public final class EntriesMgr { for (int i = (entries.size() - 1); i >= 0; --i) { entry = entries.get(i); - buff = new StringBuilder( - "Posted by " + entry.getNick() + " on " + entry.getChannel() + ""); + buff = new StringBuilder() + .append("Posted by ") + .append(entry.getNick()) + .append(" on ") + .append(entry.getChannel()) + .append(""); if (entry.getCommentsCount() > 0) { buff.append("

"); diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java index 27526d3..8e7f9ba 100644 --- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java +++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java @@ -87,7 +87,7 @@ public final class EntriesUtils { */ @SuppressFBWarnings(value = "CE_CLASS_ENVY", justification = "Yes, it does.") public static String buildLink(final int index, final EntryLink entry, final boolean isView) { - final StringBuilder buff = new StringBuilder(Commands.LINK_CMD + (index + 1) + ": "); + final StringBuilder buff = new StringBuilder().append(Commands.LINK_CMD).append(index + 1).append(": "); buff.append('[').append(entry.getNick()).append(']'); diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java index c23ddd1..d1a3900 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java @@ -150,12 +150,12 @@ public final class CurrencyConverter extends ThreadedModule { + cmds[3].toUpperCase()); } catch (Exception e) { throw new ModuleException("convertCurrency(" + query + ')', - "The supported currencies are: " + EXCHANGE_RATES.keySet().toString(), e); + "The supported currencies are: " + EXCHANGE_RATES.keySet(), e); } } } else if (CURRENCY_RATES_KEYWORD.equals(query)) { - final StringBuilder buff = new StringBuilder('[' + pubDate + "]: "); + final StringBuilder buff = new StringBuilder().append('[').append(pubDate).append("]: "); int i = 0; for (final Map.Entry rate : EXCHANGE_RATES.entrySet()) { @@ -169,7 +169,7 @@ public final class CurrencyConverter extends ThreadedModule { return new NoticeMessage(buff.toString()); } } - return new ErrorMessage("The supported currencies are: " + EXCHANGE_RATES.keySet().toString()); + return new ErrorMessage("The supported currencies are: " + EXCHANGE_RATES.keySet()); } /** diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java index e9c0729..506ffd5 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java @@ -194,7 +194,7 @@ public final class WorldTime extends AbstractModule { + tz.substring(tz.indexOf('/') + 1).replace('_', ' '); } } else { - return new ErrorMessage("The supported countries/zones are: " + COUNTRIES_MAP.keySet().toString()); + return new ErrorMessage("The supported countries/zones are: " + COUNTRIES_MAP.keySet()); } return new PublicMessage(response);