[wicket] branch master updated: WICKET-6730: Minor code-style improvements

[papegaaij]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e44f720  WICKET-6730: Minor code-style improvements
e44f720 is described below

commit e44f720fed4f55e393129a23ea89b0ae99870efc
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Fri Jan 17 09:22:56 2020 +0100

    WICKET-6730: Minor code-style improvements
---
 .../apache/wicket/core/random/ISecureRandomSupplier.java    |  4 ++--
 .../java/org/apache/wicket/settings/SecuritySettings.java   |  4 ++--
 .../org/apache/wicket/pageStore/CryptingPageStoreTest.java  | 13 ++++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
 
b/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
index 9b9fe14..ed8d131 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/core/random/ISecureRandomSupplier.java
@@ -48,8 +48,8 @@ public interface ISecureRandomSupplier
        }
        
        /**
-        * Returns a base64 encoded string with random content, base on {@code 
length} bytes. The length
-        * of the returned string will be {@code length/3*4}.
+        * Returns a url-base64 encoded string with random content, base on 
{@code length} bytes. The
+        * length of the returned string will be {@code length/3*4}.
         * 
         * @param length
         *            The number of random bytes to use as input.
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java 
b/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java
index 94e2390..6e225a4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/SecuritySettings.java
@@ -125,7 +125,7 @@ public class SecuritySettings
         * 
         * @return The {@link ISecureRandomSupplier} to use for secure random 
data.
         */
-       public ISecureRandomSupplier getRandomSupplier()
+       public synchronized ISecureRandomSupplier getRandomSupplier()
        {
                if (randomSupplier == null)
                {
@@ -193,7 +193,7 @@ public class SecuritySettings
         *            The new supplier, must not be null.
         * @return {@code this} object for chaining
         */
-       public SecuritySettings setRandomSupplier(ISecureRandomSupplier 
randomSupplier)
+       public synchronized SecuritySettings 
setRandomSupplier(ISecureRandomSupplier randomSupplier)
        {
                Args.notNull(randomSupplier, "randomSupplier");
                this.randomSupplier = randomSupplier;
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
index 48e3def..970f9fe 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/pageStore/CryptingPageStoreTest.java
@@ -26,6 +26,7 @@ import org.apache.wicket.MockPage;
 import org.apache.wicket.mock.MockPageContext;
 import org.apache.wicket.mock.MockPageStore;
 import org.apache.wicket.serialize.java.JavaSerializer;
+import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.jupiter.api.Test;
 
@@ -34,13 +35,14 @@ import org.junit.jupiter.api.Test;
  * 
  * @author svenmeier
  */
-public class CryptingPageStoreTest extends WicketTester
+public class CryptingPageStoreTest extends WicketTestCase
 {
 
        @Test
        void test()
        {
-               CryptingPageStore store = new CryptingPageStore(new 
MockPageStore(), getApplication());
+               CryptingPageStore store =
+                       new CryptingPageStore(new MockPageStore(), 
tester.getApplication());
                JavaSerializer serializer = new JavaSerializer("test");
 
                IPageContext context = new MockPageContext();
@@ -51,8 +53,8 @@ public class CryptingPageStoreTest extends WicketTester
                        SerializedPage serializedAdd = new SerializedPage(p, 
"foo", serializer.serialize(add));
                        store.addPage(context, serializedAdd);
 
-                       SerializedPage serializedGot = 
(SerializedPage)store.getPage(context, p);
-                       MockPage got = 
(MockPage)serializer.deserialize(serializedGot.getData());
+                       SerializedPage serializedGot = (SerializedPage) 
store.getPage(context, p);
+                       MockPage got = (MockPage) 
serializer.deserialize(serializedGot.getData());
                        assertEquals(p, got.getPageId());
                }
        }
@@ -60,7 +62,8 @@ public class CryptingPageStoreTest extends WicketTester
        @Test
        void testFail()
        {
-               CryptingPageStore store = new CryptingPageStore(new 
MockPageStore(), getApplication());
+               CryptingPageStore store =
+                       new CryptingPageStore(new MockPageStore(), 
tester.getApplication());
                JavaSerializer serializer = new JavaSerializer("test");
 
                MockPageContext context = new MockPageContext();