Skip to content

Fix the issue where MergedAnnotation is null when retrieved in Spring 5.x #15581

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.

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

Merged
merged 2 commits into from
Jul 25, 2025

Conversation

jkoChen
Copy link
Contributor

@jkoChen jkoChen commented Jul 23, 2025

Added compatibility support for Spring 5.x in the method org.apache.dubbo.config.spring.util.AnnotationUtils#tryGetMergedAnnotation to ensure that MergedAnnotations can be correctly retrieved in Spring 5.x environments

What is the purpose of the change?

PR of the issue : #14104

I fixed this issue in Dubbo 3.2, but the code was reverted in version 3.3, so I need to fix it again.

Checklist

  • Make sure there is a GitHub_issue field for the change.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction. If the new feature or significant change is committed, please remember to add sample in dubbo samples project.
  • Make sure gitHub actions can pass. Why the workflow is failing and how to fix it?

jkoChen and others added 2 commits July 23, 2025 10:56
… 5.x

Added compatibility support for Spring 5.x in the method org.apache.dubbo.config.spring.util.AnnotationUtils#tryGetMergedAnnotation to ensure that MergedAnnotations can be correctly retrieved in Spring 5.x environments
@codecov-commenter
Copy link

codecov-commenter commented Jul 23, 2025

Codecov Report

❌ Patch coverage is 44.44444% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.01%. Comparing base (192d433) to head (2b86c1d).
⚠️ Report is 9 commits behind head on 3.3.

Files with missing lines Patch % Lines
...ache/dubbo/config/spring/util/AnnotationUtils.java 44.44% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##                3.3   #15581   +/-   ##
=========================================
  Coverage     61.00%   61.01%           
- Complexity    11495    11500    +5     
=========================================
  Files          1909     1909           
  Lines         86777    86782    +5     
  Branches      13093    13094    +1     
=========================================
+ Hits          52942    52951    +9     
+ Misses        28416    28415    -1     
+ Partials       5419     5416    -3     
Flag Coverage Δ
integration-tests-java21 32.95% <44.44%> (-0.07%) ⬇️
integration-tests-java8 33.06% <44.44%> (+<0.01%) ⬆️
samples-tests-java21 31.69% <44.44%> (+0.03%) ⬆️
samples-tests-java8 29.33% <44.44%> (+0.04%) ⬆️
unit-tests-java11 59.07% <44.44%> (+0.01%) ⬆️
unit-tests-java17 58.80% <44.44%> (+0.02%) ⬆️
unit-tests-java21 58.77% <44.44%> (+0.01%) ⬆️
unit-tests-java8 59.08% <44.44%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@zrlw zrlw added the type/enhancement Everything related with code enhancement or performance label Jul 23, 2025
@zrlw zrlw requested review from AlbumenJ and zrlw July 23, 2025 03:36
@zrlw zrlw requested review from oxsean, heliang666s and RainYuY July 23, 2025 04:47
@zrlw zrlw merged commit 6571e82 into apache:3.3 Jul 25, 2025
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/enhancement Everything related with code enhancement or performance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants