Skip to content

Modernize MixedAuthenticatorTest to use List.of() for empty authorities #3328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hazendaz merged 10 commits into from
May 24, 2026
Merged

Modernize MixedAuthenticatorTest to use List.of() for empty authorities #3328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d98ad6a
Modernize empty list creation in MixedAuthenticatorTest
Copilot May 17, 2026
d0de477
Finalize modernizer fix validation
Copilot May 17, 2026
d4c6f5a
Modernize spring-security5 tests to use List.sort natural order
Copilot May 17, 2026
72aeb1d
Modernize tomcat10 and tomcat11 MixedAuthenticatorTest empty lists
Copilot May 18, 2026
87e01e4
Modernize spring-security6 tests to List.sort natural order
Copilot May 18, 2026
a4ba803
Modernize demo controller to String.formatted
Copilot May 18, 2026
9d30bbd
Modernize spring-security7 test list sorting
Copilot May 24, 2026
06ac8b8
Modernize filter4 DemoController string formatting
Copilot May 24, 2026
8f25110
Modernize shiro group map setup
Copilot May 24, 2026
a45d792
Modernize shiro-jakarta group map setup
Copilot May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...waffle-demo-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(", ")));
}

Expand Down
2 changes: 1 addition & 1 deletion ...waffle-demo-spring-boot-filter4/src/main/java/waffle/spring/boot/demo/DemoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(", ")));
}

Expand Down
4 changes: 2 additions & 2 deletions Source/JNA/waffle-shiro-jakarta/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Source/JNA/waffle-shiro/src/test/java/waffle/shiro/GroupMappingWaffleRealmTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...e-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions .../JNA/waffle-spring-security5/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions ...affle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...A/waffle-spring-security5/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...e-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions .../JNA/waffle-spring-security6/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions ...affle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...A/waffle-spring-security6/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...e-spring-security7/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions .../JNA/waffle-spring-security7/src/test/java/waffle/spring/NegotiateSecurityFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions ...affle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...A/waffle-spring-security7/src/test/java/waffle/spring/WindowsAuthenticationTokenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions Source/JNA/waffle-tomcat10/src/test/java/waffle/apache/MixedAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions Source/JNA/waffle-tomcat11/src/test/java/waffle/apache/MixedAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 2 additions & 3 deletions Source/JNA/waffle-tomcat9/src/test/java/waffle/apache/MixedAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
Loading