GH-2655: AOT support user declared binders #2689
Conversation
| @@ -94,6 +104,13 @@ public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registe | |||
| return null; | |||
| } | |||
|
|
|||
| private BindingServiceProperties createBindingServiceProperties() { | |||
There was a problem hiding this comment.
At this stage of AOT processing, the env/yml is not available by default and as such the BindingServiceProperties passed into the DefaultBinderFactory have defaults and not the user-declared binders.
| return this.doGetBinderConventional(name, bindingTargetType); | ||
| // If child initializers - use AOT lookup | ||
| if (!CollectionUtils.isEmpty(this.binderChildContextInitializers)) { | ||
| return this.doGetBinderAOT(name, bindingTargetType); |
There was a problem hiding this comment.
Moved the AOT flavor or "doGetBinder" into its own method.
| return this.getBinderInstance(configurationName); | ||
| } | ||
| else if (this.defaultBinder != null && this.binderChildContextInitializers.size() > 1) { |
There was a problem hiding this comment.
This improves the existing impl and now behaves as follows (inline comments hopefully describe this as well):
- if no name or no default specified then fail if > 1 binders or return single binder if 1 binder available
- if name specified be sure it exists in child initializers (else fail)
- if default specified be sure it exists in child initializers (else fail)
- else fail
| @@ -296,16 +318,19 @@ private <T> Binder<T, ConsumerProperties, ProducerProperties> getBinderInstance( | |||
| ConfigurableApplicationContext binderProducingContext; | |||
| if (this.binderChildContextInitializers.containsKey(configurationName)) { | |||
| this.logger.info("Using AOT pre-prepared initializer to construct binder child context for " + configurationName); | |||
| if (binderConfiguration != null) { | |||
There was a problem hiding this comment.
This carries any binder configuration properties from the yaml into the child context. AOT processing does not cover the values in the yaml file - only the context. Just like native/AOT apps still need/use application.yml files - this does to.
- Adds support for AOT child context generation for user-declared binder configurations. Fixes spring-cloud#2655
onobc
force-pushed
the
GH-2655-aot-multi-binder-fix
branch
from
54ccf5d to
1731493
Compare
|
Looks good. Merged upstream. |
Fixes #2655