LANG-1279: Update Java requirement from Java 6 to 7 replace usage of deprecated ObjectUtils#toString with Objects#toString
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/9b481a97 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/9b481a97 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/9b481a97 Branch: refs/heads/master Commit: 9b481a97010a19e375cf423ffe25dda1b40e0e47 Parents: 61bc7f2 Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Fri Oct 28 18:27:55 2016 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Fri Oct 28 18:27:55 2016 +0200 ---------------------------------------------------------------------- src/main/java/org/apache/commons/lang3/StringUtils.java | 11 ++++------- .../java/org/apache/commons/lang3/text/StrBuilder.java | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/9b481a97/src/main/java/org/apache/commons/lang3/StringUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index dba1a3a..f143177 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.Objects; import java.util.regex.Pattern; /** @@ -4520,9 +4521,7 @@ public class StringUtils { } final Object first = iterator.next(); if (!iterator.hasNext()) { - @SuppressWarnings( "deprecation" ) // ObjectUtils.toString(Object) has been deprecated in 3.2 - final - String result = ObjectUtils.toString(first); + final String result = Objects.toString(first, ""); return result; } @@ -4567,8 +4566,7 @@ public class StringUtils { } final Object first = iterator.next(); if (!iterator.hasNext()) { - @SuppressWarnings( "deprecation" ) // ObjectUtils.toString(Object) has been deprecated in 3.2 - final String result = ObjectUtils.toString(first); + final String result = Objects.toString(first, ""); return result; } @@ -4663,8 +4661,7 @@ public class StringUtils { final Iterator<Object> iterator = Arrays.asList(objects).iterator(); while (iterator.hasNext()) { - @SuppressWarnings("deprecation") // o.k. to use as long as we do not require java 7 or greater - final String value = ObjectUtils.toString(iterator.next()); + final String value = Objects.toString(iterator.next(), ""); result.append(value); if (iterator.hasNext()) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/9b481a97/src/main/java/org/apache/commons/lang3/text/StrBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java index 6079101..a18625c 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java +++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java @@ -23,9 +23,9 @@ import java.io.Writer; import java.nio.CharBuffer; import java.util.Iterator; import java.util.List; +import java.util.Objects; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.builder.Builder; @@ -1245,8 +1245,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build */ public StrBuilder appendWithSeparators(final Object[] array, final String separator) { if (array != null && array.length > 0) { - @SuppressWarnings( "deprecation" ) // ObjectUtils.toString(Object) has been deprecated in 3.2 - final String sep = ObjectUtils.toString(separator); + final String sep = Objects.toString(separator, ""); append(array[0]); for (int i = 1; i < array.length; i++) { append(sep); @@ -1268,8 +1267,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build */ public StrBuilder appendWithSeparators(final Iterable<?> iterable, final String separator) { if (iterable != null) { - @SuppressWarnings( "deprecation" ) // ObjectUtils.toString(Object) has been deprecated in 3.2 - final String sep = ObjectUtils.toString(separator); + final String sep = Objects.toString(separator, ""); final Iterator<?> it = iterable.iterator(); while (it.hasNext()) { append(it.next()); @@ -1293,8 +1291,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build */ public StrBuilder appendWithSeparators(final Iterator<?> it, final String separator) { if (it != null) { - @SuppressWarnings( "deprecation" ) // ObjectUtils.toString(Object) has been deprecated in 3.2 - final String sep = ObjectUtils.toString(separator); + final String sep = Objects.toString(separator, ""); while (it.hasNext()) { append(it.next()); if (it.hasNext()) {
