Add tests for SpringBeanContainer (Hibernate ORM integration) and fix the behavior when requesting named beans #22260
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@yrodiere Please sign the Contributor License Agreement! Click here to manually synchronize the status of this Pull Request. See the FAQ for frequently asked questions. |
|
@yrodiere Thank you for signing the Contributor License Agreement! |
yrodiere
force-pushed
the
orm-named-beans
branch
from
709b5e4 to
99e06f9
Compare
|
Just rebased on master and fixed the problems reported by codacy. |
|
@yrodiere this looks good to me so far, it just seems that some Hibernate search copyright headers sneaked into the test classes? Could you update all copyright headers to the common Spring one, ideally with copyright range -2019? |
…rnate ORM integration)
… the fallback producer
yrodiere
force-pushed
the
orm-named-beans
branch
from
99e06f9 to
de28e5a
Compare
|
@jhoeller That was an oversight, sorry. I force-pushed an update, all should be good now. |
jhoeller
pushed a commit
that referenced
this pull request
Feb 5, 2019
… the behavior when requesting named beans (#22260) * Add integration tests for SpringBeanContainer (Hibernate ORM integration) * Autowire bean properties of beans retrieved by name in SpringBeanContainer * Add integration tests for fallback cases in SpringBeanContainer (Hibernate ORM integration) * Fix SpringBeanContainer incorrectly losing the bean name when calling the fallback producer (cherry picked from commit 00855c4)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@jhoeller Hi! I think you're the one to ping regarding this part of the code? We've talked previously in #21548.
This PR:
SpringBeanContainerSpringBeanContainerwould forget to autowire bean properties when a bean is requested by name (org.springframework.orm.jpa.hibernate.HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests#testCanRetrieveBeanByNameWithJpaCompliantOptionswas failing)SpringBeanContainerwould simply ignore the name when a bean is requested by name (the testsorg.springframework.orm.jpa.hibernate.HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests#testCanRetrieveFallbackBeanByName*were failing). If it was only about internal Spring behavior, it would be fine, but it also affected how the fallback producer was used. Essentially, whenever a bean name didn't match anything in Spring,SpringBeanContainerwould first try to ignore the name, and if that failed it would callorg.hibernate.resource.beans.spi.BeanInstanceProducer#produceBeanInstance(java.lang.Class<B>), not passing the name to the fallback bean producer.Note that the fixes should not affect current setups, because Hibernate ORM currently never requests named beans,. The concept of named beans in ORM SPIs was added with future changes in mind, and is currently being leveraged in Hibernate Search 6 (still in Alpha).