Fix Conflict for NonBlocking Interface in Reactor Integration
#6037
Conversation
This file contains 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
Motivation: The `reactor.core.scheduler.NonBlocking` interface was introduced to `armeria-core` in line#1665 to make `Schedulers.isInNonBlockingThread()` return `true` for an Armeria `EventLoop`. However, a conflict arises when building Java modules because the `NonBlocking` interface clashes with Reactor's own definition. Modifications: - Moved `NonBlocking` to `com.linecorp.armeria.common` to resolve the module conflict while retaining its utility for identifying non-blocking threads. - Updated to call `Schedulers.registerNonBlockingThreadPredicate` if Reactor is available in the classpath. - Adjusted `CoreBlockHoundIntegration` to update the non-blocking thread predicate. Result: - Resolved the Java module conflict with the `NonBlocking` interface.
trustin
reviewed
Dec 16, 2024
trustin
approved these changes
Dec 16, 2024
ikhoon
approved these changes
Dec 17, 2024
jrhee17
approved these changes
Dec 20, 2024
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.
Motivation:
The
reactor.core.scheduler.NonBlockinginterface was introduced toarmeria-corein #1665 to makeSchedulers.isInNonBlockingThread()returntruefor an ArmeriaEventLoop. However, a conflict arises when building Java modules because theNonBlockinginterface clashes with Reactor's own definition.Modifications:
NonBlockingtocom.linecorp.armeria.commonto resolve the module conflict while retaining its utility for identifying non-blocking threads.Schedulers.registerNonBlockingThreadPredicateif Reactor is available in the classpath.CoreBlockHoundIntegrationto update the non-blocking thread predicate.Result:
NonBlockinginterface.