honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaks to interceptor registry

This commit is contained in:
James Agnew 2019-01-20 12:09:19 -05:00
parent c3c7d156e9
commit c22aeaa2e5
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/interceptor/executor/InterceptorRegistry.java
View File

@ -46,9 +46,9 @@ import java.util.concurrent.atomic.AtomicInteger;
public class InterceptorRegistry implements IInterceptorRegistry, ApplicationContextAware {
private static final Logger ourLog = LoggerFactory.getLogger(InterceptorRegistry.class);
private ApplicationContext myAppCtx;
private List<Object> myGlobalInterceptors = new ArrayList<>();
private ListMultimap<Pointcut, BaseInvoker> myInvokers = ArrayListMultimap.create();
private ListMultimap<Pointcut, BaseInvoker> myAnonymousInvokers = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
private final List<Object> myGlobalInterceptors = new ArrayList<>();
private final ListMultimap<Pointcut, BaseInvoker> myInvokers = ArrayListMultimap.create();
private final ListMultimap<Pointcut, BaseInvoker> myAnonymousInvokers = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
/**
* Constructor
@ -89,20 +89,20 @@ public class InterceptorRegistry implements IInterceptorRegistry, ApplicationCon
// Grab the global interceptors
String[] globalInterceptorNames = myAppCtx.getBeanNamesForAnnotation(Interceptor.class);
for (String nextName : globalInterceptorNames) {
Object nextGlobalInterceptor = myAppCtx.getBean(nextName);
myGlobalInterceptors.add(nextGlobalInterceptor);
Object nextInterceptor = myAppCtx.getBean(nextName);
registerGlobalInterceptor(nextInterceptor);
}
// Pull out the hook methods
for (Object nextInterceptor : myGlobalInterceptors) {
}
private void registerGlobalInterceptor(Object theNextInterceptor) {
int typeOrder = DEFAULT_ORDER;
Order typeOrderAnnotation = AnnotationUtils.findAnnotation(nextInterceptor.getClass(), Order.class);
Order typeOrderAnnotation = AnnotationUtils.findAnnotation(theNextInterceptor.getClass(), Order.class);
if (typeOrderAnnotation != null) {
typeOrder = typeOrderAnnotation.value();
}
for (Method nextMethod : nextInterceptor.getClass().getDeclaredMethods()) {
for (Method nextMethod : theNextInterceptor.getClass().getDeclaredMethods()) {
Hook hook = AnnotationUtils.findAnnotation(nextMethod, Hook.class);
if (hook != null) {
@ -113,15 +113,17 @@ public class InterceptorRegistry implements IInterceptorRegistry, ApplicationCon
methodOrder = methodOrderAnnotation.value();
}
HookInvoker invoker = new HookInvoker(hook, nextInterceptor, nextMethod, methodOrder);
HookInvoker invoker = new HookInvoker(hook, theNextInterceptor, nextMethod, methodOrder);
for (Pointcut nextPointcut : hook.value()) {
myInvokers.put(nextPointcut, invoker);
}
}
}
}
// Sort everything by declared order
myGlobalInterceptors.add(theNextInterceptor);
// Make sure we're always sorted according to the order declared in
// @Order
sortByOrderAnnotation(myGlobalInterceptors);
for (Pointcut nextPointcut : myInvokers.keys()) {
List<BaseInvoker> nextInvokerList = myInvokers.get(nextPointcut);