(cxf) 03/03: [CXF-9105] add synchronized to the principal iteration. Fix DefaultLogEventMapperTest for JDK-23 and above

[reta]

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

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit eb3b85326e018291c6ef98404ccea4c65abeab0f
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Sat Feb 1 10:53:46 2025 -0500

    [CXF-9105] add synchronized to the principal iteration. Fix 
DefaultLogEventMapperTest for JDK-23 and above
    
    (cherry picked from commit 9b2ad3e96cd723cebb66d08b7bbd534148c3a999)
---
 .../cxf/ext/logging/DefaultLogEventMapperTest.java | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git 
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
 
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index f7c2a765c1..f502d8e8de 100644
--- 
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++ 
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -43,7 +43,13 @@ import org.apache.cxf.message.MessageImpl;
 import org.junit.Test;
 
 import static 
org.apache.cxf.ext.logging.event.DefaultLogEventMapper.MASKED_HEADER_VALUE;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeThat;
 
 public class DefaultLogEventMapperTest {
 
@@ -156,6 +162,9 @@ public class DefaultLogEventMapperTest {
 
     @Test
     public void testMultiplePrincipalsReturnedByAccessControllerContext() {
+        assumeThat("Subject::getSubject is not supported in JDK-23 and above",
+            Runtime.version().feature(), lessThanOrEqualTo(22));
+        
         DefaultLogEventMapper mapper = new DefaultLogEventMapper();
         Message message = new MessageImpl();
         message.put(Message.HTTP_REQUEST_METHOD, "GET");
@@ -176,4 +185,25 @@ public class DefaultLogEventMapperTest {
         assertEquals(expected, 
Arrays.stream(splitPrincipals).collect(Collectors.toSet()));
     }
 
+    @Test
+    public void testNoSubjectReturned() {
+        assumeThat("Subject::getSubject is not supported in JDK-23 and above",
+            Runtime.version().feature(), greaterThanOrEqualTo(23));
+        
+        DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+        Message message = new MessageImpl();
+        message.put(Message.HTTP_REQUEST_METHOD, "GET");
+        message.put(Message.REQUEST_URI, "test");
+        Exchange exchange = new ExchangeImpl();
+        message.setExchange(exchange);
+
+        Set<Principal> principals = IntStream.range(0, 3)
+                .mapToObj(i -> new SimplePrincipal("principal-" + i))
+                .collect(Collectors.toSet());
+
+        Subject subject = new Subject(false, principals, Set.of(), Set.of());
+
+        LogEvent event = Subject.doAs(subject, (PrivilegedAction<LogEvent>) () 
-> mapper.map(message));
+        assertThat(event.getPrincipal(), is(nullValue()));
+    }
 }