Merge branch '4.0.x' into 4.1.x

Closes gh-51599
This commit is contained in:
Andy Wilkinson
2026-09-07 08:26:42 +01:00
149 changed files with 5 additions and 243 deletions
@@ -48,11 +48,9 @@ import static org.mockito.BDDMockito.given;
class SecurityInterceptorTests {
@Mock
@SuppressWarnings("NullAway.Init")
private TokenValidator tokenValidator;
@Mock
@SuppressWarnings("NullAway.Init")
private SecurityService securityService;
private SecurityInterceptor interceptor;
@@ -60,7 +60,6 @@ class TokenValidatorTests {
private static final byte[] DOT = ".".getBytes();
@Mock
@SuppressWarnings("NullAway.Init")
private SecurityService securityService;
private TokenValidator tokenValidator;
@@ -46,11 +46,9 @@ import static org.mockito.BDDMockito.then;
class SecurityInterceptorTests {
@Mock
@SuppressWarnings("NullAway.Init")
private TokenValidator tokenValidator;
@Mock
@SuppressWarnings("NullAway.Init")
private SecurityService securityService;
private SecurityInterceptor interceptor;
@@ -59,7 +59,6 @@ class TokenValidatorTests {
private static final byte[] DOT = ".".getBytes();
@Mock
@SuppressWarnings("NullAway.Init")
private SecurityService securityService;
private TokenValidator tokenValidator;