Java 25 support

Signed-off-by: Oleksandr Shevchenko <oleksandr.shevchenko@datarobot.com>

Author: o-shevchenko

spring-grpc-core/src/main/java/org/springframework/grpc/server/advice/GrpcAdviceDiscoverer.java

@@ -24,10 +24,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.MethodIntrospector;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.util.Assert;
@@ -39,7 +39,7 @@
  *
  * @author Oleksandr Shevchenko
  */
-public class GrpcAdviceDiscoverer implements InitializingBean, ApplicationContextAware {
+public class GrpcAdviceDiscoverer implements InitializingBean {
 
 	private static final Log logger = LogFactory.getLog(GrpcAdviceDiscoverer.class);
 
@@ -49,30 +49,31 @@ public class GrpcAdviceDiscoverer implements InitializingBean, ApplicationContex
 	public static final MethodFilter EXCEPTION_HANDLER_METHODS = method -> AnnotatedElementUtils.hasAnnotation(method,
 			GrpcExceptionHandler.class);
 
-	private ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
 
-	private Map<String, Object> annotatedBeans;
+	private @Nullable Map<String, Object> annotatedBeans;
 
-	private Set<Method> annotatedMethods;
+	private @Nullable Set<Method> annotatedMethods;
 
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) {
+	public GrpcAdviceDiscoverer(ApplicationContext applicationContext) {
+		Assert.notNull(applicationContext, "applicationContext must not be null");
 		this.applicationContext = applicationContext;
 	}
 
 	@Override
 	public void afterPropertiesSet() {
-		this.annotatedBeans = this.applicationContext.getBeansWithAnnotation(GrpcAdvice.class);
-		this.annotatedBeans.forEach((key, value) -> {
+		Map<String, Object> beans = this.applicationContext.getBeansWithAnnotation(GrpcAdvice.class);
+		beans.forEach((key, value) -> {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Found gRPC advice: " + key + ", class: " + value.getClass().getName());
 			}
 		});
-		this.annotatedMethods = findAnnotatedMethods();
+		this.annotatedBeans = beans;
+		this.annotatedMethods = findAnnotatedMethods(beans);
 	}
 
-	private Set<Method> findAnnotatedMethods() {
-		return this.annotatedBeans.values()
+	private Set<Method> findAnnotatedMethods(Map<String, Object> beans) {
+		return beans.values()
 			.stream()
 			.map(Object::getClass)
 			.map(this::findAnnotatedMethods)

spring-grpc-core/src/main/java/org/springframework/grpc/server/advice/GrpcAdviceExceptionHandler.java

@@ -130,7 +130,7 @@ protected Object handleThrownException(Throwable exception) throws Throwable {
 			return null;
 		}
 
-		Entry<Object, Method> methodWithInstance = this.grpcExceptionHandlerMethodResolver
+		Entry<@Nullable Object, @Nullable Method> methodWithInstance = this.grpcExceptionHandlerMethodResolver
 			.resolveMethodWithInstance(exceptionClass);
 		Method mappedMethod = methodWithInstance.getValue();
 		Object instanceOfMappedMethod = methodWithInstance.getKey();

spring-grpc-core/src/main/java/org/springframework/grpc/server/advice/GrpcExceptionHandlerMethodResolver.java

@@ -43,7 +43,8 @@ public class GrpcExceptionHandlerMethodResolver implements InitializingBean {
 
 	private final GrpcAdviceDiscoverer grpcAdviceDiscoverer;
 
-	private Class<? extends Throwable>[] annotatedExceptions;
+	@SuppressWarnings("unchecked")
+	private Class<? extends Throwable>[] annotatedExceptions = new Class[0];
 
 	/**
 	 * Create a new instance.

spring-grpc-core/src/test/java/org/springframework/grpc/server/advice/GrpcAdviceExceptionHandlerTests.java

@@ -22,6 +22,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -120,8 +121,8 @@ void selectsMostSpecificHandler() {
 	static class TestConfig {
 
 		@Bean
-		GrpcAdviceDiscoverer grpcAdviceDiscoverer() {
-			return new GrpcAdviceDiscoverer();
+		GrpcAdviceDiscoverer grpcAdviceDiscoverer(ApplicationContext applicationContext) {
+			return new GrpcAdviceDiscoverer(applicationContext);
 		}
 
 		@Bean

spring-grpc-server-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/server/autoconfigure/exception/GrpcAdviceAutoConfiguration.java

@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.grpc.server.autoconfigure.ConditionalOnGrpcServerEnabled;
 import org.springframework.boot.grpc.server.autoconfigure.ConditionalOnSpringGrpc;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.grpc.server.advice.GrpcAdvice;
 import org.springframework.grpc.server.advice.GrpcAdviceDiscoverer;
@@ -43,8 +44,8 @@ public class GrpcAdviceAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	GrpcAdviceDiscoverer grpcAdviceDiscoverer() {
-		return new GrpcAdviceDiscoverer();
+	GrpcAdviceDiscoverer grpcAdviceDiscoverer(ApplicationContext applicationContext) {
+		return new GrpcAdviceDiscoverer(applicationContext);
 	}
 
 	@Bean