From 7ce1da0b960d31d26e8d7073e7dbe830defedfad Mon Sep 17 00:00:00 2001 From: Aleksey Genus Date: Tue, 11 Mar 2025 09:47:43 +0100 Subject: [PATCH] Add @ConditionalOnMissingBean on grpcAdviceExceptionInterceptor. This may be used to change the interceptor order --- .../grpc/server/autoconfigure/GrpcAdviceAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcAdviceAutoConfiguration.java b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcAdviceAutoConfiguration.java index 22a9f8a56..e305e5c03 100644 --- a/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcAdviceAutoConfiguration.java +++ b/grpc-server-spring-boot-starter/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcAdviceAutoConfiguration.java @@ -17,6 +17,7 @@ package net.devh.boot.grpc.server.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -67,6 +68,7 @@ public GrpcAdviceExceptionHandler grpcAdviceExceptionHandler( return new GrpcAdviceExceptionHandler(grpcExceptionHandlerMethodResolver); } + @ConditionalOnMissingBean @GrpcGlobalServerInterceptor @Order(InterceptorOrder.ORDER_GLOBAL_EXCEPTION_HANDLING) public GrpcExceptionInterceptor grpcAdviceExceptionInterceptor(