Author: mthl
Date: Sat May 25 09:28:36 2019
New Revision: 1859934
URL: http://svn.apache.org/viewvc?rev=1859934&view=rev
Log:
Improved: Remove unused ‘StringUtil#appendTo’ methods
(OFBIZ-11014)
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java?rev=1859934&r1=1859933&r2=1859934&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
Sat May 25 09:28:36 2019
@@ -23,7 +23,6 @@ import java.net.URLDecoder;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -36,7 +35,6 @@ import java.util.stream.Collectors;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
-import org.apache.ofbiz.base.lang.Appender;
/**
* Misc String Utility Functions
@@ -438,33 +436,6 @@ public class StringUtil {
return new StringWrapper(theString);
}
- public static StringBuilder appendTo(StringBuilder sb, Iterable<? extends
Appender<StringBuilder>> iterable, String prefix, String suffix, String sep) {
- return appendTo(sb, iterable, prefix, suffix, null, sep, null);
- }
-
- public static StringBuilder appendTo(StringBuilder sb, Iterable<? extends
Appender<StringBuilder>> iterable, String prefix, String suffix, String
sepPrefix, String sep, String sepSuffix) {
- Iterator<? extends Appender<StringBuilder>> it = iterable.iterator();
- while (it.hasNext()) {
- if (prefix != null) {
- sb.append(prefix);
- }
- it.next().appendTo(sb);
- 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.
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java?rev=1859934&r1=1859933&r2=1859934&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
Sat May 25 09:28:36 2019
@@ -243,17 +243,4 @@ public class StringUtilTests extends Gen
return sb.append(s);
}
}
-
- public void testAppendTo() {
- assertEquals("111", "[1],[2]", StringUtil.appendTo(new
StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), "[", "]",
",").toString());
- assertEquals("011", "1],2]", StringUtil.appendTo(new StringBuilder(),
list(new TestAppender("1"), new TestAppender("2")), null, "]", ",").toString());
- assertEquals("101", "[1,[2", StringUtil.appendTo(new StringBuilder(),
list(new TestAppender("1"), new TestAppender("2")), "[", null, ",").toString());
- assertEquals("110", "[1][2]", StringUtil.appendTo(new StringBuilder(),
list(new TestAppender("1"), new TestAppender("2")), "[", "]", null).toString());
- assertEquals("11111", "[1]<,>[2]", StringUtil.appendTo(new
StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), "[", "]",
"<", ",", ">").toString());
- assertEquals("01111", "1]<,>2]", StringUtil.appendTo(new
StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), null, "]",
"<", ",", ">").toString());
- assertEquals("10111", "[1<,>[2", StringUtil.appendTo(new
StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), "[", null,
"<", ",", ">").toString());
- assertEquals("11011", "[1],>[2]", StringUtil.appendTo(new
StringBuilder(), list(new TestAppender("1"), new TestAppender("2")), "[", "]",
null, ",", ">").toString());
- 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());
- }
}
