diff --git a/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java b/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java
index 9d0297980b..680093e4dc 100644
--- a/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java
+++ b/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java
@@ -29,7 +29,7 @@ public class DemoController {
      */
     @GetMapping
     public String demo(final Authentication auth) {
-        return String.format("Hello, %s. You have authorities: %s", auth.getPrincipal(),
+        return "Hello, %s. You have authorities: %s".formatted(auth.getPrincipal(),
                 auth.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(", ")));
     }
 
diff --git a/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter4/src/main/java/waffle/spring/boot/demo/DemoController.java b/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter4/src/main/java/waffle/spring/boot/demo/DemoController.java
index 9d0297980b..680093e4dc 100644
--- a/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter4/src/main/java/waffle/spring/boot/demo/DemoController.java
+++ b/Source/JNA/waffle-demo-jakarta/waffle-demo-spring-boot-filter4/src/main/java/waffle/spring/boot/demo/DemoController.java
@@ -29,7 +29,7 @@ public class DemoController {
      */
     @GetMapping
     public String demo(final Authentication auth) {
-        return String.format("Hello, %s. You have authorities: %s", auth.getPrincipal(),
+        return "Hello, %s. You have authorities: %s".formatted(auth.getPrincipal(),
                 auth.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(", ")));
     }
 
diff --git a/Source/JNA/waffle-shiro-jakarta/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java b/Source/JNA/waffle-shiro-jakarta/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
index 1305717363..879242e839 100644
--- a/Source/JNA/waffle-shiro-jakarta/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
+++ b/Source/JNA/waffle-shiro-jakarta/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
@@ -11,7 +11,7 @@
 import com.sun.jna.platform.win32.Secur32.EXTENDED_NAME_FORMAT;
 import com.sun.jna.platform.win32.Secur32Util;
 
-import java.util.Collections;
+import java.util.Map;
 
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -46,7 +46,7 @@ void setUp() {
         this.windowsAuthProvider = new MockWindowsAuthProvider();
         this.realm = new GroupMappingWaffleRealm();
         this.realm.setProvider(this.windowsAuthProvider);
-        this.realm.setGroupRolesMap(Collections.singletonMap("Users", GroupMappingWaffleRealmTest.ROLE_NAME));
+        this.realm.setGroupRolesMap(Map.of("Users", GroupMappingWaffleRealmTest.ROLE_NAME));
     }
 
     /**
diff --git a/Source/JNA/waffle-shiro/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java b/Source/JNA/waffle-shiro/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
index 1305717363..879242e839 100644
--- a/Source/JNA/waffle-shiro/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
+++ b/Source/JNA/waffle-shiro/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
@@ -11,7 +11,7 @@
 import com.sun.jna.platform.win32.Secur32.EXTENDED_NAME_FORMAT;
 import com.sun.jna.platform.win32.Secur32Util;
 
-import java.util.Collections;
+import java.util.Map;
 
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -46,7 +46,7 @@ void setUp() {
         this.windowsAuthProvider = new MockWindowsAuthProvider();
         this.realm = new GroupMappingWaffleRealm();
         this.realm.setProvider(this.windowsAuthProvider);
-        this.realm.setGroupRolesMap(Collections.singletonMap("Users", GroupMappingWaffleRealmTest.ROLE_NAME));
+        this.realm.setGroupRolesMap(Map.of("Users", GroupMappingWaffleRealmTest.ROLE_NAME));
     }
 
     /**
diff --git a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
index 2273a8fc45..53793c8d1b 100644
--- a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
+++ b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -115,7 +115,7 @@ void testNegotiate() throws IOException, ServletException {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
diff --git a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
index 2dda7d215d..06e8480bb3 100644
--- a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
+++ b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -144,7 +144,7 @@ void testNegotiate() throws IOException, ServletException {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
diff --git a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
index 7ca6e1acd3..949d82d891 100644
--- a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
+++ b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -97,7 +97,7 @@ void testAuthenticate() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
@@ -128,7 +128,7 @@ void testAuthenticateWithCustomGrantedAuthorityFactory() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("Everyone", list.get(0));
         Assertions.assertEquals("Users", list.get(1));
         Assertions.assertTrue(authenticated.getPrincipal() instanceof WindowsPrincipal);
diff --git a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
index d8f06a3cd3..b0eec5ea59 100644
--- a/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
+++ b/Source/JNA/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
@@ -59,7 +59,7 @@ void testWindowsAuthenticationToken() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_GROUP1", list.get(0));
         Assertions.assertEquals("ROLE_GROUP2", list.get(1));
         Assertions.assertEquals("ROLE_USER", list.get(2));
@@ -86,7 +86,7 @@ void testCustomGrantedAuthorityFactory() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("group1", list.get(0));
         Assertions.assertEquals("group2", list.get(1));
         Assertions.assertEquals(this.principal, myToken.getPrincipal());
diff --git a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
index 01e90e736d..5bdf4df15e 100644
--- a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
+++ b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -115,7 +115,7 @@ void testNegotiate() throws IOException, ServletException {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
diff --git a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
index 3c91920e32..98da6555c5 100644
--- a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
+++ b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -144,7 +144,7 @@ void testNegotiate() throws IOException, ServletException {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
diff --git a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
index 7ca6e1acd3..949d82d891 100644
--- a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
+++ b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -97,7 +97,7 @@ void testAuthenticate() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
@@ -128,7 +128,7 @@ void testAuthenticateWithCustomGrantedAuthorityFactory() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("Everyone", list.get(0));
         Assertions.assertEquals("Users", list.get(1));
         Assertions.assertTrue(authenticated.getPrincipal() instanceof WindowsPrincipal);
diff --git a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
index d8f06a3cd3..b0eec5ea59 100644
--- a/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
+++ b/Source/JNA/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
@@ -59,7 +59,7 @@ void testWindowsAuthenticationToken() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_GROUP1", list.get(0));
         Assertions.assertEquals("ROLE_GROUP2", list.get(1));
         Assertions.assertEquals("ROLE_USER", list.get(2));
@@ -86,7 +86,7 @@ void testCustomGrantedAuthorityFactory() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("group1", list.get(0));
         Assertions.assertEquals("group2", list.get(1));
         Assertions.assertEquals(this.principal, myToken.getPrincipal());
diff --git a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
index 01e90e736d..5bdf4df15e 100644
--- a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
+++ b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -115,7 +115,7 @@ void testNegotiate() throws IOException, ServletException {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
diff --git a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
index 3c91920e32..98da6555c5 100644
--- a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
+++ b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -144,7 +144,7 @@ void testNegotiate() throws IOException, ServletException {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
diff --git a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
index 7ca6e1acd3..949d82d891 100644
--- a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
+++ b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -97,7 +97,7 @@ void testAuthenticate() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_EVERYONE", list.get(0));
         Assertions.assertEquals("ROLE_USER", list.get(1));
         Assertions.assertEquals("ROLE_USERS", list.get(2));
@@ -128,7 +128,7 @@ void testAuthenticateWithCustomGrantedAuthorityFactory() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("Everyone", list.get(0));
         Assertions.assertEquals("Users", list.get(1));
         Assertions.assertTrue(authenticated.getPrincipal() instanceof WindowsPrincipal);
diff --git a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
index d8f06a3cd3..b0eec5ea59 100644
--- a/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
+++ b/Source/JNA/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
@@ -59,7 +59,7 @@ void testWindowsAuthenticationToken() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("ROLE_GROUP1", list.get(0));
         Assertions.assertEquals("ROLE_GROUP2", list.get(1));
         Assertions.assertEquals("ROLE_USER", list.get(2));
@@ -86,7 +86,7 @@ void testCustomGrantedAuthorityFactory() {
         for (final GrantedAuthority grantedAuthority : authorities) {
             list.add(grantedAuthority.getAuthority());
         }
-        Collections.sort(list);
+        list.sort(Comparator.naturalOrder());
         Assertions.assertEquals("group1", list.get(0));
         Assertions.assertEquals("group2", list.get(1));
         Assertions.assertEquals(this.principal, myToken.getPrincipal());
diff --git a/Source/JNA/waffle-tomcat10/src/test/java/waffle/apache/MixedAuthenticatorTest.java b/Source/JNA/waffle-tomcat10/src/test/java/waffle/apache/MixedAuthenticatorTest.java
index f65b4ef663..0491a0f941 100644
--- a/Source/JNA/waffle-tomcat10/src/test/java/waffle/apache/MixedAuthenticatorTest.java
+++ b/Source/JNA/waffle-tomcat10/src/test/java/waffle/apache/MixedAuthenticatorTest.java
@@ -14,7 +14,7 @@
 import jakarta.servlet.ServletException;
 
 import java.util.Base64;
-import java.util.Collections;
+import java.util.List;
 
 import mockit.Expectations;
 import mockit.Mocked;
@@ -352,7 +352,7 @@ void testSecurityCheckQueryString() {
 
     @Test
     void testCustomPrincipal() throws LifecycleException {
-        final GenericPrincipal genericPrincipal = new GenericPrincipal("my-principal", Collections.emptyList());
+        final GenericPrincipal genericPrincipal = new GenericPrincipal("my-principal", List.of());
         final MixedAuthenticator customAuthenticator = new MixedAuthenticator() {
             @Override
             protected GenericPrincipal createPrincipal(final IWindowsIdentity windowsIdentity) {
diff --git a/Source/JNA/waffle-tomcat11/src/test/java/waffle/apache/MixedAuthenticatorTest.java b/Source/JNA/waffle-tomcat11/src/test/java/waffle/apache/MixedAuthenticatorTest.java
index c015a0dc29..6a10980b9f 100644
--- a/Source/JNA/waffle-tomcat11/src/test/java/waffle/apache/MixedAuthenticatorTest.java
+++ b/Source/JNA/waffle-tomcat11/src/test/java/waffle/apache/MixedAuthenticatorTest.java
@@ -14,7 +14,7 @@
 import jakarta.servlet.ServletException;
 
 import java.util.Base64;
-import java.util.Collections;
+import java.util.List;
 
 import mockit.Expectations;
 import mockit.Mocked;
@@ -353,7 +353,7 @@ void testSecurityCheckQueryString() {
 
     @Test
     void testCustomPrincipal() throws LifecycleException {
-        final GenericPrincipal genericPrincipal = new GenericPrincipal("my-principal", Collections.emptyList());
+        final GenericPrincipal genericPrincipal = new GenericPrincipal("my-principal", List.of());
         final MixedAuthenticator customAuthenticator = new MixedAuthenticator() {
             @Override
             protected GenericPrincipal createPrincipal(final IWindowsIdentity windowsIdentity) {
diff --git a/Source/JNA/waffle-tomcat9/src/test/java/waffle/apache/MixedAuthenticatorTest.java b/Source/JNA/waffle-tomcat9/src/test/java/waffle/apache/MixedAuthenticatorTest.java
index 83d981735d..e50730a4fa 100644
--- a/Source/JNA/waffle-tomcat9/src/test/java/waffle/apache/MixedAuthenticatorTest.java
+++ b/Source/JNA/waffle-tomcat9/src/test/java/waffle/apache/MixedAuthenticatorTest.java
@@ -12,7 +12,7 @@
 import com.sun.jna.platform.win32.SspiUtil.ManagedSecBufferDesc;
 
 import java.util.Base64;
-import java.util.Collections;
+import java.util.List;
 
 import javax.servlet.ServletException;
 
@@ -352,8 +352,7 @@ void testSecurityCheckQueryString() {
 
     @Test
     void testCustomPrincipal() throws LifecycleException {
-        final GenericPrincipal genericPrincipal = new GenericPrincipal("my-principal", "my-password",
-                Collections.emptyList());
+        final GenericPrincipal genericPrincipal = new GenericPrincipal("my-principal", "my-password", List.of());
         final MixedAuthenticator customAuthenticator = new MixedAuthenticator() {
             @Override
             protected GenericPrincipal createPrincipal(final IWindowsIdentity windowsIdentity) {