From d7aab2ff7359c42dc5e5f4f24c3c75a36d9e8d72 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 25 May 2019 09:13:41 +0000 Subject: [PATCH] =?UTF-8?q?Improved:=20Remove=20unused=20=E2=80=98StringUt?= =?UTF-8?q?il#append=E2=80=99=20method=20(OFBIZ-11014)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859922 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/ofbiz/base/util/StringUtil.java | 27 ------------------- .../ofbiz/base/util/test/StringUtilTests.java | 13 --------- 2 files changed, 40 deletions(-) diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java index 5bdde82f5da..b658ed9ee6d 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java @@ -627,33 +627,6 @@ public static StringBuilder appendTo(StringBuilder sb, Iterable iterable, String prefix, String suffix, String sep) { - return append(sb, iterable, prefix, suffix, null, sep, null); - } - - public static StringBuilder append(StringBuilder sb, Iterable iterable, String prefix, String suffix, String sepPrefix, String sep, String sepSuffix) { - Iterator it = iterable.iterator(); - while (it.hasNext()) { - if (prefix != null) { - sb.append(prefix); - } - sb.append(it.next()); - if (suffix != null) { - sb.append(suffix); - } - if (it.hasNext() && sep != null) { - if (sepPrefix != null) { - sb.append(sepPrefix); - } - sb.append(sep); - if (sepSuffix != null) { - sb.append(sepSuffix); - } - } - } - return sb; - } - /** * A super-lightweight object to wrap a String object. Mainly used with FTL templates * to avoid the general HTML auto-encoding that is now done through the Screen Widget. diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java index a83498aae56..bbc0df89bf8 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java @@ -307,17 +307,4 @@ public void testAppendTo() { assertEquals("11101", "[1][2]", StringUtil.appendTo(new StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), "[", "]", "<", null, ">").toString()); assertEquals("11110", "[1]<,[2]", StringUtil.appendTo(new StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), "[", "]", "<", ",", null).toString()); } - - public void testAppend() { - assertEquals("111", "[1],[2]", StringUtil.append(new StringBuilder(), list("1", "2"), "[", "]", ",").toString()); - assertEquals("011", "1],2]", StringUtil.append(new StringBuilder(), list("1", "2"), null, "]", ",").toString()); - assertEquals("101", "[1,[2", StringUtil.append(new StringBuilder(), list("1", "2"), "[", null, ",").toString()); - assertEquals("110", "[1][2]", StringUtil.append(new StringBuilder(), list("1", "2"), "[", "]", null).toString()); - assertEquals("11111", "[1]<,>[2]", StringUtil.append(new StringBuilder(), list("1", "2"), "[", "]", "<", ",", ">").toString()); - assertEquals("01111", "1]<,>2]", StringUtil.append(new StringBuilder(), list("1", "2"), null, "]", "<", ",", ">").toString()); - assertEquals("10111", "[1<,>[2", StringUtil.append(new StringBuilder(), list("1", "2"), "[", null, "<", ",", ">").toString()); - assertEquals("11011", "[1],>[2]", StringUtil.append(new StringBuilder(), list("1", "2"), "[", "]", null, ",", ">").toString()); - assertEquals("11101", "[1][2]", StringUtil.append(new StringBuilder(), list("1", "2"), "[", "]", "<", null, ">").toString()); - assertEquals("11110", "[1]<,[2]", StringUtil.append(new StringBuilder(), list("1", "2"), "[", "]", "<", ",", null).toString()); - } }