You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/04/19 23:29:38 UTC
[1/3] wicket git commit: 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.
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 <mg...@apache.org>
Authored: Tue Apr 19 23:27:17 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
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))
[2/3] wicket git commit: Remove unused method and logger in test
Posted by mg...@apache.org.
Remove unused method and logger in test
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/17713973
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/17713973
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/17713973
Branch: refs/heads/master
Commit: 17713973a67207186ef88457a56655f3da40d39a
Parents: 28f8c4c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 19 23:26:58 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 19 23:29:27 2016 +0200
----------------------------------------------------------------------
.../apache/wicket/util/string/StringsTest.java | 25 --------------------
1 file changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/17713973/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
index 9c495c7..8f82a7a 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java
@@ -23,14 +23,10 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@SuppressWarnings("javadoc")
public class StringsTest
{
- private static final Logger log = LoggerFactory.getLogger(StringsTest.class);
-
@Test
public void stripJSessionId()
{
@@ -445,25 +441,4 @@ public class StringsTest
// empty separator
assertEquals("foobarbaz", Strings.join("", fragments));
}
-
- /**
- * Converts an array of strings to a String. ["a", "b"] becomes: "[a,b]"
- *
- * @param arrayOfStrings
- * the array to convert
- * @return the array as a string.
- */
- private String stringValue(final String[] arrayOfStrings)
- {
- AppendingStringBuffer sb = new AppendingStringBuffer("[");
- String komma = "";
- for (String str : arrayOfStrings)
- {
- sb.append(komma);
- sb.append(str);
- komma = ",";
- }
- sb.append("]");
- return sb.toString();
- }
}
[3/3] wicket git commit: Fix a typo in javadoc
Posted by mg...@apache.org.
Fix a typo in javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/28f8c4c9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/28f8c4c9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/28f8c4c9
Branch: refs/heads/master
Commit: 28f8c4c90e17208491ad832a6963115b03eb5d98
Parents: 97fe0d6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 19 23:26:41 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 19 23:29:27 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/protocol/http/WebApplication.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/28f8c4c9/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index d12c551..56263ed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@ -548,7 +548,7 @@ public abstract class WebApplication extends Application
* {@link #newWebRequest(HttpServletRequest, String)}
*
* @param servletRequest
- * the current HTTP Sservlet request
+ * the current HTTP Servlet request
* @param filterPath
* the filter mapping read from web.xml
* @return a WebRequest object