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 2021/12/06 20:04:06 UTC

[wicket] branch master updated (3200a7c -> 9e0e424)

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git.


    from 3200a7c  WICKET-6904 Make Apache Wicket fully supporting Java9+ module system
     new 53e0518  Fix typos in javadoc
     new 9e0e424  Update JUnit to 5.8.2

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                                              | 2 +-
 .../src/main/java/org/apache/wicket/ajax/json/JSONFunction.java      | 2 +-
 .../org/apache/wicket/core/request/handler/IPageRequestHandler.java  | 2 +-
 .../src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java | 2 +-
 .../java/org/apache/wicket/csp/ContentSecurityPolicySettings.java    | 5 ++---
 .../java/org/apache/wicket/markup/head/AbstractCspHeaderItem.java    | 2 +-
 .../org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java    | 3 +--
 .../ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java  | 4 ++--
 .../ajax/markup/html/autocomplete/AutoCompleteTextField.java         | 2 +-
 .../ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java    | 2 +-
 10 files changed, 12 insertions(+), 14 deletions(-)

[wicket] 01/02: Fix typos in javadoc

Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 53e0518504cd9870cd035de42af2e76558ea02b4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Dec 6 21:59:45 2021 +0200

    Fix typos in javadoc
    
    Non-functional changes!
    
    Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
 .../src/main/java/org/apache/wicket/ajax/json/JSONFunction.java      | 2 +-
 .../org/apache/wicket/core/request/handler/IPageRequestHandler.java  | 2 +-
 .../src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java | 2 +-
 .../java/org/apache/wicket/csp/ContentSecurityPolicySettings.java    | 5 ++---
 .../java/org/apache/wicket/markup/head/AbstractCspHeaderItem.java    | 2 +-
 .../org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java    | 3 +--
 .../ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java  | 4 ++--
 .../ajax/markup/html/autocomplete/AutoCompleteTextField.java         | 2 +-
 .../ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java    | 2 +-
 9 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
index 525e16e..7cc7acd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
@@ -21,7 +21,7 @@ import org.apache.wicket.util.io.IClusterable;
 import org.apache.wicket.util.lang.Args;
 
 /**
- * Represents a Json function. When written out these values are not escaped so its possible to write out raw
+ * Represents a Json function. When written out these values are not escaped, so it's possible to write out raw
  * JavaScript.
  */
 public class JSONFunction implements JSONString, CharSequence, IClusterable
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPageRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPageRequestHandler.java
index 626c314..b5f1349 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPageRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/IPageRequestHandler.java
@@ -64,7 +64,7 @@ public interface IPageRequestHandler extends IPageClassRequestHandler
 	 * @param handler The request handler
 	 * @return page or {@code null} if none
 	 */
-	public static Page getPage(IRequestHandler handler)
+	static Page getPage(IRequestHandler handler)
 	{
 		while (handler instanceof IRequestHandlerDelegate)
 		{
diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java b/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java
index ba92fd1..77853a9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java
@@ -70,7 +70,7 @@ public class CSPRequestCycleListener implements IRequestCycleListener
 	 * 
 	 * @param handler
 	 *            handler
-	 * @return <code>true</code> if must protected
+	 * @return <code>true</code> if must be protected
 	 * @see ContentSecurityPolicySettings#mustProtectRequest(IRequestHandler)
 	 */
 	protected boolean mustProtect(IRequestHandler handler)
diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java b/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
index c6f550e..65b510b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
@@ -77,9 +77,8 @@ public class ContentSecurityPolicySettings
 	{
 		Args.notNull(application, "application");
 		
-		nonceCreator = () -> {
-				return application.getSecuritySettings().getRandomSupplier().getRandomBase64(NONCE_LENGTH);
-			};
+		nonceCreator = () ->
+				application.getSecuritySettings().getRandomSupplier().getRandomBase64(NONCE_LENGTH);
 	}
 
 	public CSPHeaderConfiguration blocking()
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/AbstractCspHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/AbstractCspHeaderItem.java
index d754c86..4586565 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/AbstractCspHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/AbstractCspHeaderItem.java
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.head;
 
 /**
  * Abstract base class for all {@link HeaderItem}s that have a <em>nonce</em> to
- * allow the browser to check <em>Content Security Policye</em> (CSP) .
+ * allow the browser to check <em>Content Security Policy</em> (CSP) .
  * 
  * @author svenmeier
  */
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
index 87fa149..eb959bf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
@@ -76,8 +76,7 @@ public class AutoCompletePage extends BasePage
 			{
 				if (Strings.isEmpty(input))
 				{
-					List<String> emptyList = Collections.emptyList();
-					return emptyList.iterator();
+					return Collections.emptyIterator();
 				}
 
 				List<String> choices = new ArrayList<>(10);
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java
index d6d3bef..ea182f6 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteRenderer.java
@@ -20,8 +20,8 @@ import org.apache.wicket.request.Response;
 import org.apache.wicket.util.string.Strings;
 
 /**
- * A renderer that abstracts autoassist specific details and allows subclasses to only render the
- * visual part of the assist instead of having to also render the necessary autoassist javascript
+ * A renderer that abstracts auto-assist specific details and allows subclasses to only render the
+ * visual part of the assist instead of having to also render the necessary auto-assist javascript
  * hooks.
  * 
  * @param <T>
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java
index 70536e4..d64c770 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java
@@ -225,7 +225,7 @@ public abstract class AutoCompleteTextField<T> extends TextField<T>
 	protected AutoCompleteBehavior<T> newAutoCompleteBehavior(
 		final IAutoCompleteRenderer<T> renderer, final AutoCompleteSettings settings)
 	{
-		return new AutoCompleteBehavior<T>(renderer, settings)
+		return new AutoCompleteBehavior<>(renderer, settings)
 		{
 			private static final long serialVersionUID = 1L;
 
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
index 5d886d1..29a8d8d 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
@@ -17,7 +17,7 @@
 package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
 
 /**
- * An renderer that calls object.toString() to get the text value. Great for quickly generating a
+ * A renderer that calls object.toString() to get the text value. Great for quickly generating a
  * list of assists.
  * 
  * @since 1.2

[wicket] 02/02: Update JUnit to 5.8.2

Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 9e0e4249f6cbf4bc706547f217cd3b1ea3ba9458
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Dec 6 22:00:56 2021 +0200

    Update JUnit to 5.8.2
    
    Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d9fc79..f185567 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
 		<japicmp.skip>true</japicmp.skip> <!-- TODO Wicket 10 Remove this once 10.0.0 is released -->
 		<jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version>
 		<jetty.version>11.0.7</jetty.version>
-		<junit.version>5.8.1</junit.version>
+		<junit.version>5.8.2</junit.version>
 		<jsr305.version>3.0.2</jsr305.version>
 		<logback.version>1.2.7</logback.version>
 		<hamcrest.version>2.2</hamcrest.version>