Skip to content
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

Jump to bottom

Various cleanups and minor fixes for the Hibernate ORM and Hibernate Search extensions #26838

Merged
merged 8 commits into from
Jul 20, 2022
Merged

Various cleanups and minor fixes for the Hibernate ORM and Hibernate Search extensions #26838

merged 8 commits into from
Jul 20, 2022

Conversation

yrodiere
Copy link
Member

@yrodiere yrodiere commented Jul 20, 2022 •
edited
Loading

Just a few problems I discovered while working on another PR.

Best reviewed commit by commit, due to one annoyingly large commit.

Creating as draft because this PR is based on #26815 , which should be merged first.

@yrodiere yrodiere force-pushed the hsearch-cleanups branch 2 times, most recently from fca254f to 507d32d Compare July 20, 2022 12:24
@quarkus-bot

This comment has been minimized.

Sign in to view
@yrodiere yrodiere mentioned this pull request Jul 20, 2022
Merged
@yrodiere yrodiere marked this pull request as ready for review July 20, 2022 12:42
@quarkus-bot

This comment has been minimized.

Sign in to view
@quarkus-bot

This comment has been minimized.

Sign in to view
yrodiere added 7 commits July 20, 2022 16:36
@yrodiere
Don't set the H2 dialect in Hibernate ORM tests
5f41ece 
1. Because that's not necessary: if the db-kind is set to H2 in the
   datasource, we'll use the H2 dialect automatically.
2. Because that's harmful: we don't want to use the "vanilla" H2
   dialect, but a custom, Quarkus-specific version.
   See QuarkusH2Dialect.
@yrodiere
Fix a few potential NPEs when Hibernate Search build config is null
b0246b4
@yrodiere
Always use quotes for the persistence unit name in generated Hibernat…
2bd4ac4 
…e Search property keys
@yrodiere
Consistently consider quoted AND non-quoted versions of quarkus.hiber…
9c8f05e 
…nate-search-orm configuration properties

Similar to what we did recently with HibernateOrmProcessor.
@yrodiere
Correctly report missing ".version" in Hibernate Search configuration…
50452cd 
… for named PUs and named backends
@yrodiere
Don't ignore AutomaticIndexingSynchronizationStrategy configured thro…
060c61d 
…ugh @SearchExtension when there are no runtime configuration properties
@yrodiere
Don't even try to resolve @SearchExtension for runtime configuration …
4b69107 
…when Hibernate Search is disabled
@quarkus-bot
Copy link

quarkus-bot bot commented Jul 20, 2022

Failing Jobs - Building 4b69107

Status Name Step Failures Logs Raw logs
✖ Gradle Tests - JDK 11 Build Failures Logs Raw logs
✔️ Gradle Tests - JDK 11 Windows

Full information is available in the Build summary check run.

Failures

⚙️ Gradle Tests - JDK 11 #

- Failing: integration-tests/gradle

📦 integration-tests/gradle

✖ io.quarkus.gradle.devmode.MultiModuleNamedInjectionDevModeTest.main line 21 - More details - Source on GitHub

org.awaitility.core.ConditionTimeoutException: Condition with lambda expression in io.quarkus.test.devmode.util.DevModeTestUtils that uses java.util.function.Supplier, java.util.function.Supplierjava.util.concurrent.atomic.AtomicReference, java.util.concurrent.atomic.AtomicReferencejava.lang.String, java.lang.Stringboolean was not fulfilled within 1 minutes.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.CallableCondition.await(CallableCondition.java:78)

✖ io.quarkus.gradle.devmode.MultiSourceProjectDevModeTest.main line 22 - More details - Source on GitHub

org.awaitility.core.ConditionTimeoutException: Condition with lambda expression in io.quarkus.test.devmode.util.DevModeTestUtils that uses java.util.function.Supplier, java.util.function.Supplierjava.util.concurrent.atomic.AtomicReference, java.util.concurrent.atomic.AtomicReferencejava.lang.String, java.lang.Stringboolean was not fulfilled within 1 minutes.
	at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
	at org.awaitility.core.CallableCondition.await(CallableCondition.java:78)

Sanne
Sanne approved these changes Jul 20, 2022
View reviewed changes
Copy link
Member

@Sanne Sanne left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I was actually needing this very same change in my WIP branches.

[edit: I was referring to commit 5f41ece - seems github UI changed how one can comment on a single comment and confused me, sorry ]

@Sanne Sanne merged commit dee4549 into quarkusio:main Jul 20, 2022
@quarkus-bot quarkus-bot bot added this to the 2.12 - main milestone Jul 20, 2022
@yrodiere yrodiere deleted the hsearch-cleanups branch August 2, 2022 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sanne Sanne Sanne approved these changes

Assignees
No one assigned
Labels
area/cache area/config area/core area/documentation area/gradle Gradle area/hibernate-orm Hibernate ORM area/hibernate-search Hibernate Search area/panache area/persistence OBSOLETE, DO NOT USE area/smallrye area/spring Issues relating to the Spring integration area/tracing
Projects
None yet
Milestone
2.12.0.CR1
Development

Successfully merging this pull request may close these issues.
2 participants
@yrodiere @Sanne