(wicket) 02/03: Simplified test.

[pedro]

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

pedrosans pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 803ac04ad89f01a639f6b5465c97ca65796a25b9
Author: Schäfer, H.H. (Hans Hosea) <hanshosea.schae...@ing.de>
AuthorDate: Tue Sep 8 21:18:19 2026 +0200

    Simplified test.
    
    (cherry picked from commit fedc172255b5dbd9c87c7d1ca26bed4f3b6012f3)
---
 .../java/org/apache/wicket/csp/CSPHeaderWriterTest.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git 
a/wicket-core/src/test/java/org/apache/wicket/csp/CSPHeaderWriterTest.java 
b/wicket-core/src/test/java/org/apache/wicket/csp/CSPHeaderWriterTest.java
index 1d850e7627..cf144bebb3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/csp/CSPHeaderWriterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/csp/CSPHeaderWriterTest.java
@@ -60,6 +60,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
+import java.util.Optional;
+
 class CSPHeaderWriterTest extends WicketTestCase
 {
 
@@ -126,7 +128,7 @@ class CSPHeaderWriterTest extends WicketTestCase
        }
 
        @Test
-       void 
addCspDirectiveToStatelessPageEvenIfWrappedInMultipleIRequestHandlerDelegates()
+       void 
addCspDirectiveToPageEvenIfWrappedInMultipleIRequestHandlerDelegates()
        {
                tester.getApplication().mount(new 
MountedMapper("withdelegate/page", NoopMockPage.class)
                {
@@ -134,14 +136,10 @@ class CSPHeaderWriterTest extends WicketTestCase
                        public IRequestHandler mapRequest(final Request request)
                        {
                                final IRequestHandler requestHandler = 
super.mapRequest(request);
-                               final IRequestHandler result;
-                               if (requestHandler instanceof 
RenderPageRequestHandler renderPageRequestHandler && 
NoopMockPage.class.equals(renderPageRequestHandler.getPageClass()))
-                               {
-                                       result = new 
NoopIRequestHandlerDelegate(new 
NoopIRequestHandlerDelegate(renderPageRequestHandler));
-                               } else {
-                                       result = requestHandler;
-                               }
-                               return result;
+                               return Optional.ofNullable(requestHandler)
+                                 .map(NoopIRequestHandlerDelegate::new)
+                                 .map(NoopIRequestHandlerDelegate::new) // 
wrap twice
+                                 .orElse(null);
                        }
                });
                tester.startPage(NoopMockPage.class);