fix(spring): Resolve the Error Prone and javac 21 findings in the Spring modules

Author: markushi

sentry-spring-7/src/main/java/io/sentry/spring7/HttpServletRequestSentryUserProvider.java

@@ -25,9 +25,8 @@ public HttpServletRequestSentryUserProvider(final @NotNull SentryOptions options
   public @Nullable User provideUser() {
     if (options.getDataCollectionResolver().isUserInfo()) {
       final RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-      if (requestAttributes instanceof ServletRequestAttributes) {
-        final ServletRequestAttributes servletRequestAttributes =
-            (ServletRequestAttributes) requestAttributes;
+      if (requestAttributes instanceof ServletRequestAttributes servletRequestAttributes) {
+
         final HttpServletRequest request = servletRequestAttributes.getRequest();
 
         final User user = new User();

sentry-spring-7/src/main/java/io/sentry/spring7/SentryInitBeanPostProcessor.java

@@ -42,8 +42,7 @@ public SentryInitBeanPostProcessor() {
   @SuppressWarnings({"unchecked", "deprecation"})
   public @NotNull Object postProcessAfterInitialization(
       final @NotNull Object bean, @NotNull final String beanName) throws BeansException {
-    if (bean instanceof SentryOptions) {
-      final SentryOptions options = (SentryOptions) bean;
+    if (bean instanceof SentryOptions options) {
 
       if (applicationContext != null) {
         applicationContext

sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheBeanPostProcessor.java

@@ -16,8 +16,8 @@ public final class SentryCacheBeanPostProcessor implements BeanPostProcessor, Pr
   @Override
   public @NotNull Object postProcessAfterInitialization(
       final @NotNull Object bean, final @NotNull String beanName) throws BeansException {
-    if (bean instanceof CacheManager && !(bean instanceof SentryCacheManagerWrapper)) {
-      return new SentryCacheManagerWrapper((CacheManager) bean, ScopesAdapter.getInstance());
+    if (bean instanceof CacheManager cacheManager && !(bean instanceof SentryCacheManagerWrapper)) {
+      return new SentryCacheManagerWrapper(cacheManager, ScopesAdapter.getInstance());
     }
     return bean;
   }

sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdvice.java

@@ -44,9 +44,11 @@ public SentryCheckInAdvice(final @NotNull IScopes scopes) {
   }
 
   @Override
-  public Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
+  public @Nullable Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
+    final @Nullable Object target = invocation.getThis();
     final Method mostSpecificMethod =
-        AopUtils.getMostSpecificMethod(invocation.getMethod(), invocation.getThis().getClass());
+        AopUtils.getMostSpecificMethod(
+            invocation.getMethod(), target != null ? target.getClass() : null);
 
     @Nullable
     SentryCheckIn checkInAnnotation =

sentry-spring-7/src/main/java/io/sentry/spring7/exception/SentryCaptureExceptionParameterAdvice.java

@@ -11,6 +11,7 @@
 import org.aopalliance.intercept.MethodInvocation;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.core.annotation.AnnotationUtils;
 
@@ -33,17 +34,19 @@ public SentryCaptureExceptionParameterAdvice(final @NotNull IScopes scopes) {
   }
 
   @Override
-  public Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
+  public @Nullable Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
+    final @Nullable Object target = invocation.getThis();
     final Method mostSpecificMethod =
-        AopUtils.getMostSpecificMethod(invocation.getMethod(), invocation.getThis().getClass());
+        AopUtils.getMostSpecificMethod(
+            invocation.getMethod(), target != null ? target.getClass() : null);
     SentryCaptureExceptionParameter sentryCaptureExceptionParameter =
         AnnotationUtils.findAnnotation(mostSpecificMethod, SentryCaptureExceptionParameter.class);
 
     if (sentryCaptureExceptionParameter != null) {
       Object[] args = invocation.getArguments();
       for (Object arg : args) {
-        if (arg instanceof Exception) {
-          captureException((Exception) arg);
+        if (arg instanceof Exception exception) {
+          captureException(exception);
           break;
         }
       }

sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryBatchLoaderRegistry.java

@@ -108,8 +108,8 @@ public void registerMappedBatchLoader(
 
     private @NotNull IScopes scopesFromContext(final @NotNull BatchLoaderEnvironment environment) {
       Object context = environment.getContext();
-      if (context instanceof GraphQLContext) {
-        GraphQLContext graphqlContext = (GraphQLContext) context;
+      if (context instanceof GraphQLContext graphqlContext) {
+
         return graphqlContext.getOrDefault(SENTRY_SCOPES_CONTEXT_KEY, NoOpScopes.getInstance());
       }
 

sentry-spring-7/src/main/java/io/sentry/spring7/graphql/SentryGraphqlBeanPostProcessor.java

@@ -12,8 +12,8 @@ public final class SentryGraphqlBeanPostProcessor implements BeanPostProcessor,
 
   @Override
   public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-    if (bean instanceof BatchLoaderRegistry) {
-      return new SentryBatchLoaderRegistry((BatchLoaderRegistry) bean);
+    if (bean instanceof BatchLoaderRegistry batchLoaderRegistry) {
+      return new SentryBatchLoaderRegistry(batchLoaderRegistry);
     }
     return bean;
   }

sentry-spring-7/src/main/java/io/sentry/spring7/kafka/SentryKafkaProducerBeanPostProcessor.java

@@ -36,8 +36,8 @@ public final class SentryKafkaProducerBeanPostProcessor
   @SuppressWarnings({"unchecked", "rawtypes"})
   public @NotNull Object postProcessAfterInitialization(
       final @NotNull Object bean, final @NotNull String beanName) throws BeansException {
-    if (bean instanceof ProducerFactory) {
-      final @NotNull ProducerFactory factory = (ProducerFactory) bean;
+    if (bean instanceof ProducerFactory<?, ?> factory) {
+
       final @NotNull SentryProducerPostProcessor pp = new SentryProducerPostProcessor<>();
       factory.addPostProcessor(pp);
       if (!factory.getPostProcessors().contains(pp)) {

sentry-spring-7/src/main/java/io/sentry/spring7/kafka/SentryKafkaRecordInterceptor.java

@@ -196,7 +196,9 @@ private boolean isIgnored() {
     if (enqueuedTimeStr != null) {
       try {
         final double enqueuedTimeSeconds = Double.parseDouble(enqueuedTimeStr);
-        final double nowSeconds = DateUtils.millisToSeconds(System.currentTimeMillis());
+        // millisToSeconds takes a double; the cast is explicit for Error Prone's
+        // LongDoubleConversion check.
+        final double nowSeconds = DateUtils.millisToSeconds((double) System.currentTimeMillis());
         final long latencyMs = (long) ((nowSeconds - enqueuedTimeSeconds) * 1000);
         if (latencyMs >= 0) {
           transaction.setData(SpanDataConvention.MESSAGING_MESSAGE_RECEIVE_LATENCY, latencyMs);

sentry-spring-7/src/main/java/io/sentry/spring7/tracing/SentrySpanAdvice.java

@@ -35,15 +35,17 @@ public SentrySpanAdvice(final @NotNull IScopes scopes) {
 
   @SuppressWarnings("deprecation")
   @Override
-  public Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
+  public @Nullable Object invoke(final @NotNull MethodInvocation invocation) throws Throwable {
     final ISpan activeSpan = scopes.getSpan();
 
     if (activeSpan == null || activeSpan.isNoOp()) {
       // there is no active transaction, we do not start new span
       return invocation.proceed();
     } else {
+      final @Nullable Object target = invocation.getThis();
       final Method mostSpecificMethod =
-          AopUtils.getMostSpecificMethod(invocation.getMethod(), invocation.getThis().getClass());
+          AopUtils.getMostSpecificMethod(
+              invocation.getMethod(), target != null ? target.getClass() : null);
       final Class<?> targetClass = invocation.getMethod().getDeclaringClass();
       SentrySpan sentrySpan = AnnotationUtils.findAnnotation(mostSpecificMethod, SentrySpan.class);
       if (sentrySpan == null) {