Spring/spring-grpc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add registrar to autoconfig

Browse Source
This commit is contained in:
Dave Syer
2025-03-25 07:11:24 +00:00
parent fce479bc36
commit 582b59a7a6
3 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java
View File

@@ -5,14 +5,11 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.grpc.server.exception.GrpcExceptionHandler;
import org.springframework.grpc.server.exception.ReactiveStubBeanDefinitionRegistrar;
import io.grpc.Status;
@SpringBootApplication
@Import(ReactiveStubBeanDefinitionRegistrar.class)
public class GrpcServerApplication {
private static Log log = LogFactory.getLog(GrpcServerApplication.class);

96
spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/ReactiveStubBeanDefinitionRegistrar.java
View File

@@ -21,7 +21,6 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -52,63 +51,66 @@ public class ReactiveStubBeanDefinitionRegistrar implements ImportBeanDefinition
return;
}
registry.registerBeanDefinition(ReactiveStubBeanFactoryPostProcessor.BEAN_NAME,
BeanDefinitionBuilder.genericBeanDefinition(ReactiveStubBeanFactoryPostProcessor.class).getBeanDefinition());
BeanDefinitionBuilder.genericBeanDefinition(ReactiveStubBeanFactoryPostProcessor.class)
.getBeanDefinition());
}
}
static class ReactiveStubBeanFactoryPostProcessor
implements BeanFactoryPostProcessor, MethodReplacer, ApplicationContextAware {
class ReactiveStubBeanFactoryPostProcessor implements BeanFactoryPostProcessor, MethodReplacer, ApplicationContextAware {
/**
* Bean name for this post processor in the application context.
*/
public static final String BEAN_NAME = ReactiveStubBeanFactoryPostProcessor.class.getName();
/**
* Bean name for this post processor in the application context.
*/
public static final String BEAN_NAME = ReactiveStubBeanFactoryPostProcessor.class.getName();
private CompositeGrpcExceptionHandler handler;
private CompositeGrpcExceptionHandler handler;
private ApplicationContext context;
private ApplicationContext context;
@Override
public void setApplicationContext(ApplicationContext context) throws BeansException {
this.context = context;
}
private Throwable onErrorMap(Throwable throwable) {
if (this.handler == null) {
GrpcExceptionHandler[] handlers = this.context.getAutowireCapableBeanFactory()
.getBeanProvider(GrpcExceptionHandler.class)
.orderedStream()
.toArray(GrpcExceptionHandler[]::new);
this.handler = new CompositeGrpcExceptionHandler(handlers);
@Override
public void setApplicationContext(ApplicationContext context) throws BeansException {
this.context = context;
}
Status status = handler.handleException(throwable);
return status != null ? new StatusException(status) : throwable;
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) {
if (this.context.getBeanNamesForType(GrpcExceptionHandler.class).length == 0) {
return;
private Throwable onErrorMap(Throwable throwable) {
if (this.handler == null) {
GrpcExceptionHandler[] handlers = this.context.getAutowireCapableBeanFactory()
.getBeanProvider(GrpcExceptionHandler.class)
.orderedStream()
.toArray(GrpcExceptionHandler[]::new);
this.handler = new CompositeGrpcExceptionHandler(handlers);
}
Status status = this.handler.handleException(throwable);
return status != null ? new StatusException(status) : throwable;
}
for (String name : factory.getBeanNamesForType(BindableService.class)) {
BeanDefinition service = factory.getBeanDefinition(name);
Class<?> type = factory.getType(name);
if (type != null && ReflectionUtils.findMethod(type, "onErrorMap", Throwable.class) != null) {
if (service instanceof AbstractBeanDefinition root) {
ReplaceOverride override = new ReplaceOverride("onErrorMap", BEAN_NAME);
// You need this in an AOT build (but the interceptor still isn't used
// at runtime with AOT
// https://github.com/spring-projects/spring-framework/issues/34642)
override.addTypeIdentifier("Throwable");
root.getMethodOverrides().addOverride(override);
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) {
if (this.context.getBeanNamesForType(GrpcExceptionHandler.class).length == 0) {
return;
}
for (String name : factory.getBeanNamesForType(BindableService.class)) {
BeanDefinition service = factory.getBeanDefinition(name);
Class<?> type = factory.getType(name);
if (type != null && ReflectionUtils.findMethod(type, "onErrorMap", Throwable.class) != null) {
if (service instanceof AbstractBeanDefinition root) {
ReplaceOverride override = new ReplaceOverride("onErrorMap", BEAN_NAME);
// You need this in an AOT build (but the interceptor still isn't
// used
// at runtime with AOT
// https://github.com/spring-projects/spring-framework/issues/34642)
override.addTypeIdentifier("Throwable");
root.getMethodOverrides().addOverride(override);
}
}
}
}
@Override
public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
return onErrorMap((Throwable) args[0]);
}
}
@Override
public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
return onErrorMap((Throwable) args[0]);
}
}
}

10
spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerAutoConfiguration.java
View File

@@ -19,15 +19,18 @@ import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.grpc.autoconfigure.common.codec.GrpcCodecConfiguration;
import org.springframework.grpc.server.GrpcServerFactory;
import org.springframework.grpc.server.ServerBuilderCustomizer;
import org.springframework.grpc.server.exception.ReactiveStubBeanDefinitionRegistrar;
import org.springframework.grpc.server.lifecycle.GrpcServerLifecycle;
import org.springframework.grpc.server.service.DefaultGrpcServiceConfigurer;
import org.springframework.grpc.server.service.DefaultGrpcServiceDiscoverer;
@@ -100,4 +103,11 @@ public class GrpcServerAutoConfiguration {
return builder -> builder.decompressorRegistry(registry);
}
@ConditionalOnClass(name = "com.salesforce.reactivegrpc.common.Function")
@Configuration
@Import(ReactiveStubBeanDefinitionRegistrar.class)
static class ReactiveStubConfiguration {
}
}