This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 937532dbe591516aee8f7fe7718bdb1697e4a99f Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Sun Nov 17 11:38:28 2019 +0700 [Refactoring] Replace StringUtils::arrayToString by Arrays::toString --- .../java/org/apache/mailet/base/GenericMailet.java | 4 +-- .../java/org/apache/mailet/base/StringUtils.java | 18 ++---------- .../org/apache/mailet/base/StringUtilsTest.java | 32 +--------------------- 3 files changed, 5 insertions(+), 49 deletions(-) diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java index 6dce7c5..70488b0 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java @@ -21,6 +21,7 @@ package org.apache.mailet.base; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -313,8 +314,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { } if (bad.size() > 0) { - throw new MessagingException("Unexpected init parameters found: " - + org.apache.mailet.base.StringUtils.arrayToString(bad.toArray())); + throw new MessagingException("Unexpected init parameters found: " + Arrays.toString(bad.toArray())); } } diff --git a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java index 0ba3c5a..ff535e7 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java @@ -20,9 +20,9 @@ package org.apache.mailet.base; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import com.google.common.base.Joiner; import com.google.common.collect.Iterables; /** @@ -65,22 +65,8 @@ public final class StringUtils { } return list.toArray(new String[list.size()]); } - - /** - * Utility method for obtaining a string representation of an array of Objects. - */ - public static String arrayToString(Object[] array) { - if (array == null) { - return "null"; - } - StringBuilder sb = new StringBuilder(1024); - sb.append("["); - sb.append(Joiner.on(",").join(array)); - sb.append("]"); - return sb.toString(); - } public static String listToString(List<String> strings) { - return arrayToString(Iterables.toArray(strings, String.class)); + return Arrays.toString(Iterables.toArray(strings, String.class)); } } diff --git a/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java b/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java index ff88b4d..01636ae 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java @@ -32,36 +32,6 @@ public class StringUtilsTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void arrayToStringShouldReturnNullWhenArrayIsNull() { - String arrayToString = StringUtils.arrayToString(null); - assertThat(arrayToString).isEqualTo("null"); - } - - @Test - public void arrayToStringShouldReturnOnlyBracketsWhenArrayIsEmpty() { - String arrayToString = StringUtils.arrayToString(new String[] {}); - assertThat(arrayToString).isEqualTo("[]"); - } - - @Test - public void arrayToStringShouldReturnOneElementWhenArrayContainsOneElement() { - String arrayToString = StringUtils.arrayToString(new String[] { "first" }); - assertThat(arrayToString).isEqualTo("[first]"); - } - - @Test - public void arrayToStringShouldReturnSeparatedElementsWhenArrayContainsMultipleElements() { - String arrayToString = StringUtils.arrayToString(new String[] { "first", "second", "fourth" }); - assertThat(arrayToString).isEqualTo("[first,second,fourth]"); - } - - @Test - public void arrayToStringShouldThrowWhenArrayContainsANullElement() { - expectedException.expect(NullPointerException.class); - StringUtils.arrayToString(new String[] { "first", null, "fourth" }); - } - - @Test public void listToStringShouldThrowWhenListIsNull() { expectedException.expect(NullPointerException.class); StringUtils.listToString(null); @@ -82,7 +52,7 @@ public class StringUtilsTest { @Test public void listToStringShouldReturnSeparatedElementsWhenListContainsMultipleElements() { String listToString = StringUtils.listToString(ImmutableList.of("first", "second", "fourth")); - assertThat(listToString).isEqualTo("[first,second,fourth]"); + assertThat(listToString).isEqualTo("[first, second, fourth]"); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org