From 8cc96cb30ee2fbd2dfff251f8c54e7b3550e71da Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 28 Feb 2022 16:04:02 +0000 Subject: [PATCH] Added StringUtils#toNiceString --- .../java/com/willfp/eco/util/StringUtils.java | 16 +++++++++++++++- .../kotlin/com/willfp/eco/util/StringUtils.kt | 6 ++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java index 1551dfe9..3239cb62 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java @@ -427,9 +427,23 @@ public final class StringUtils { * * @param object The object to convert to string. * @return The object stringified. + * @deprecated Poorly named method. Use {@link StringUtils#toNiceString(Object)} instead. */ @NotNull + @Deprecated(since = "6.26.0", forRemoval = true) public static String internalToString(@Nullable final Object object) { + return toNiceString(object); + } + + /** + * Internal implementation of {@link String#valueOf}. + * Formats collections and doubles better. + * + * @param object The object to convert to string. + * @return The object stringified. + */ + @NotNull + public static String toNiceString(@Nullable final Object object) { if (object == null) { return "null"; } @@ -441,7 +455,7 @@ public final class StringUtils { } else if (object instanceof Double) { return NumberUtils.format((Double) object); } else if (object instanceof Collection c) { - return c.stream().map(StringUtils::internalToString).collect(Collectors.joining(", ")); + return c.stream().map(StringUtils::toNiceString).collect(Collectors.joining(", ")); } else { return String.valueOf(object); } diff --git a/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt index 3dab8508..615f2dff 100644 --- a/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt +++ b/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt @@ -46,3 +46,9 @@ fun List.formatEco( */ fun String.splitAround(separator: String): Array = StringUtils.splitAround(this, separator) + +/** + * @see StringUtils.toNiceString + */ +fun Any?.toNiceString(): String = + StringUtils.toNiceString(this)