Repository: wicket Updated Branches: refs/heads/master 97fe0d62f -> 132899461
Remove a TODO for replacing Strings#join() with String#join() - they do not behave exactly the same. Wicket's impl ignores empty strings while the JDK impl appends two separators in this case. Simplify few usages of this method. The conversion from Iterable to array/varargs is done internally Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/13289946 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/13289946 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/13289946 Branch: refs/heads/master Commit: 132899461f47a4f4f4f1908a249396730764a773 Parents: 1771397 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Apr 19 23:27:17 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Apr 19 23:29:27 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/protocol/http/RequestUtils.java | 2 +- .../spring/injection/annot/AnnotProxyFieldValueFactory.java | 2 +- .../src/main/java/org/apache/wicket/util/string/Strings.java | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/13289946/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java index ab3c808..49e4fd9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java @@ -115,7 +115,7 @@ public final class RequestUtils } } } - String newpath = Strings.join("/", newcomponents.toArray(new String[newcomponents.size()])); + String newpath = Strings.join("/", newcomponents); if (path.endsWith("/")) { return newpath + "/"; http://git-wip-us.apache.org/repos/asf/wicket/blob/13289946/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java index 2054121..877a877 100644 --- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java +++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java @@ -293,7 +293,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory msg.append("] found, you have to specify the name of the bean "); msg.append("(@SpringBean(name=\"foo\")) or (@Named(\"foo\") if using @javax.inject classes) in order to resolve this conflict. "); msg.append("Matched beans: "); - msg.append(Strings.join(",", names.toArray(new String[names.size()]))); + msg.append(Strings.join(",", names)); throw new IllegalStateException(msg.toString()); } else if(!names.isEmpty()) http://git-wip-us.apache.org/repos/asf/wicket/blob/13289946/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java index 01240a6..3821750 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java @@ -633,9 +633,6 @@ public final class Strings * @param fragments * @return combined fragments */ - // TODO Wicket 8: consider to deprecate methods {@code join} in Wicket 7 and replace it with standard - // Java 8 methods {@code String#join(CharSequence delimiter, CharSequence... elements)} - // and {@code String#join(CharSequence delimiter, Iterable<? extends CharSequence> elements)} public static String join(final String separator, final List<String> fragments) { if (fragments == null) @@ -652,9 +649,6 @@ public final class Strings * @param fragments * @return combined fragments */ - // TODO Wicket 8: consider to deprecate methods {@code join} in Wicket 7 and replace it with standard - // Java 8 methods {@code String#join(CharSequence delimiter, CharSequence... elements)} - // and {@code String#join(CharSequence delimiter, Iterable<? extends CharSequence> elements)} public static String join(final String separator, final String... fragments) { if ((fragments == null) || (fragments.length < 1))
