Skip to content

add gRPC exception advice support for factory beans #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

add gRPC exception advice support for factory beans #266

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d0ed77
add gRPC exception advice support for factory beans
Nov 24, 2021
c4b40eb
cleanup code
Nov 24, 2021
a4bf9eb
address NPE
Nov 24, 2021
c69b193
fix formatting
Nov 24, 2021
01f6d42
more formatting fixes
Nov 24, 2021
fc47852
add tests
Nov 29, 2021
860950d
more fixes
Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions ...rc/main/java/org/lognet/springboot/grpc/autoconfigure/OnMissingErrorHandlerCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
import org.lognet.springboot.grpc.recovery.GRpcExceptionHandler;
import org.lognet.springboot.grpc.recovery.GRpcServiceAdvice;
import org.lognet.springboot.grpc.recovery.HandlerMethod;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.MethodIntrospector;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.core.type.MethodMetadata;
import org.springframework.util.ReflectionUtils;

import java.lang.reflect.Method;
Expand All @@ -24,26 +27,35 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
.get("value");

ReflectionUtils.MethodFilter f = method -> AnnotatedElementUtils.hasAnnotation(method, GRpcExceptionHandler.class);
for(String adviceBeanName:context.getBeanFactory().getBeanNamesForAnnotation(GRpcServiceAdvice.class)){
final String beanClassName = context.getBeanFactory().getBeanDefinition(adviceBeanName)
.getBeanClassName();

for (String adviceBeanName : context.getBeanFactory().getBeanNamesForAnnotation(GRpcServiceAdvice.class)) {
BeanDefinition beanDefinition = context.getBeanFactory().getBeanDefinition(adviceBeanName);
String beanClassName = getBeanClassName(beanDefinition);
try {
for (Method method : MethodIntrospector.selectMethods(Class.forName(beanClassName), f)) {
final Optional<Class<? extends Throwable>> handledException = HandlerMethod.getHandledException(method, false);
if(handledException.isPresent() && handledException.get().isAssignableFrom(exc)){
if (handledException.isPresent() && handledException.get().isAssignableFrom(exc)) {
return ConditionOutcome.noMatch(String.format("Found %s handler at %s.%s",
handledException.get().getName(),
beanClassName,
method.getName()
));
handledException.get().getName(),
beanClassName,
method.getName()
));
}
}
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e);
throw new IllegalStateException(e);
}
};
}

return ConditionOutcome.match();
}

private String getBeanClassName(BeanDefinition beanDefinition) {
if (beanDefinition instanceof AnnotatedBeanDefinition) {
MethodMetadata factoryMethodMetadata = ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata();
if (factoryMethodMetadata != null) {
return factoryMethodMetadata.getReturnTypeName();
}
}
return beanDefinition.getBeanClassName();
}
}