diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java index 1ff35f7..b32f261 100644 --- a/src/main/java/net/thauvin/erik/mobibot/Utils.java +++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java @@ -247,12 +247,12 @@ public final class Utils { * @return The unescaped string. */ public static String unescapeXml(final String str) { - return str.replaceAll("&", "&") - .replaceAll("<", "<") - .replaceAll(">", ">") - .replaceAll(""", "\"") - .replaceAll("'", "'") - .replaceAll("'", "'"); + return str.replace("&", "&") + .replace("<", "<") + .replace(">", ">") + .replace(""", "\"") + .replace("'", "'") + .replace("'", "'"); } /** 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 63e8561..636fbe4 100644 --- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java +++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java @@ -115,6 +115,6 @@ public final class EntriesUtils { * @return The entry's tags. */ public static String buildTags(final int entryIndex, final EntryLink entry) { - return (Commands.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replaceAll(",", ", ")); + return (Commands.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replace(",", ", ")); } } diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java index 485bbd5..62fdfa9 100644 --- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java +++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java @@ -297,7 +297,7 @@ public class EntryLink implements Serializable { @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops") public final void setTags(final String tags) { if (tags != null) { - final String[] parts = tags.replaceAll(", ", " ").replaceAll(",", " ").split(" "); + final String[] parts = tags.replace(", ", " ").replace(",", " ").split(" "); SyndCategoryImpl tag; String part; diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java index b68cc4d..77dafa1 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java @@ -71,7 +71,7 @@ public class Calc extends AbstractModule { try { final Expression calc = new ExpressionBuilder(query).build(); - return query.replaceAll(" ", "") + " = " + decimalFormat.format(calc.evaluate()); + return query.replace(" ", "") + " = " + decimalFormat.format(calc.evaluate()); } catch (Exception e) { return "No idea. This is the kind of math I don't get."; } 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 a50c464..3baa613 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java @@ -175,7 +175,7 @@ public final class CurrencyConverter extends ThreadedModule { return new ErrorMessage("You're kidding, right?"); } else { try { - final double amt = Double.parseDouble(cmds[0].replaceAll(",", "")); + final double amt = Double.parseDouble(cmds[0].replace(",", "")); final double from = Double.parseDouble(EXCHANGE_RATES.get(cmds[1] .toUpperCase(Constants.LOCALE))); final double to = Double.parseDouble(EXCHANGE_RATES.get(cmds[3].toUpperCase(Constants.LOCALE))); diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java index cfd5dad..b1b826a 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java @@ -89,8 +89,8 @@ public final class Joke extends ThreadedModule { //noinspection RegExpRedundantEscape return new PublicMessage( - json.getJSONObject("value").get("joke").toString().replaceAll("\\'", "'") - .replaceAll("\\\"", "\"")); + json.getJSONObject("value").get("joke").toString().replace("\\'", "'") + .replace("\\\"", "\"")); } } catch (Exception e) { throw new ModuleException("randomJoke()", "An error has occurred retrieving a random joke.", e); diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java b/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java index 0cd1082..900b7b9 100644 --- a/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java +++ b/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java @@ -65,7 +65,7 @@ class LocalProperties { } private static String keyToEnv(final String key) { - return key.replaceAll("-", "_").toUpperCase(Constants.LOCALE); + return key.replace("-", "_").toUpperCase(Constants.LOCALE); } @BeforeSuite(alwaysRun = true)