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
@@ -69,8 +69,7 @@ public class CacheMetricsRegistrar {
return false;
}
// Lambda isn't detected with the correct nullability
@SuppressWarnings({ "unchecked", "NullAway" })
@SuppressWarnings("unchecked")
private @Nullable MeterBinder getMeterBinder(Cache cache, Tags tags) {
Tags cacheTags = tags.and(getAdditionalTags(cache));
return LambdaSafe.callbacks(CacheMeterBinderProvider.class, this.binderProviders, cache)
@@ -42,7 +42,6 @@ import static org.mockito.Mockito.mock;
class JCacheCacheMeterBinderProviderTests {
@Mock
@SuppressWarnings("NullAway.Init")
private javax.cache.Cache<Object, Object> nativeCache;
@Test