Add DefaultLookupTest for lookupOptional NPE fix#12385
Conversation
There was a problem hiding this comment.
Pull request overview
Adds a regression test in maven-core to lock in the behavior of DefaultLookup.lookupOptional(...) after the backported fix that switched to Optional.ofNullable(...), ensuring null container lookups yield Optional.empty() instead of an NPE.
Changes:
- Introduces
DefaultLookupTestcoveringlookupOptional(Class)/lookupOptional(Class, String)returning empty when the container returnsnull. - Adds coverage for translating
ComponentLookupExceptioncaused byNoSuchElementExceptionintoOptional.empty()(currently only for the(Class)overload).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @Test | ||
| void lookupOptionalReturnsEmptyOnNoSuchElementCause() throws Exception { | ||
| ComponentLookupException cle = | ||
| new ComponentLookupException(new NoSuchElementException(), String.class.getName(), ""); | ||
| assertSame(NoSuchElementException.class, cle.getCause().getClass(), "test fixture precondition"); | ||
| when(container.lookup(String.class)).thenThrow(cle); | ||
|
|
||
| Optional<String> result = lookup.lookupOptional(String.class); | ||
|
|
||
| assertFalse(result.isPresent(), "expected empty Optional when component is absent"); | ||
| } | ||
| } |
2fdc618 to
76f1c09
Compare
gnodet
left a comment
There was a problem hiding this comment.
Review: Add DefaultLookupTest for lookupOptional NPE fix (maven-4.0.x)
Nice work adding this regression guard — the test is well-structured and covers the key scenarios. This is the backport of the same test from PR #12384 (master), with the only difference being the Javadoc reference to #12340 instead of #12336. A couple of minor suggestions below.
Findings
1. [Low / Suggestion] Missing test for the rethrow path
The production code has a branch where ComponentLookupException with a cause that is not NoSuchElementException rethrows as LookupException. The test covers the NoSuchElementException cause path but does not test that other causes are properly rethrown. This would round out coverage, but is not a blocker for this focused regression guard PR.
2. [Info] No [MNG-XXXX] prefix in commit message
Minor convention deviation — acceptable for a test-only addition.
Positive notes
- 6 well-structured JUnit 5 test methods covering both
lookupOptionaloverloads × 3 scenarios (null, present, NoSuchElementException) - Proper Mockito usage with existing project dependency
- Correct Apache License 2.0 header
- CI: all 22 checks pass
This review does not replace specialized tools such as CodeRabbit, Sourcery, or SonarCloud.
Reviewed with Claude Code on behalf of @gnodet. This review was generated by an AI agent and may contain inaccuracies; please verify all suggestions before applying.
The backported NPE fix for DefaultLookup.lookupOptional (apache#12340) — switching Optional.of to Optional.ofNullable so a null component lookup returns an empty Optional instead of throwing NullPointerException — shipped without a regression test. Add DefaultLookupTest in maven-core covering both lookupOptional overloads across four scenarios: null component -> empty Optional (the guarded NPE case), present component -> value, ComponentLookupException caused by NoSuchElementException -> empty, and any other cause -> rethrown as LookupException. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
76f1c09 to
7277c0b
Compare
|
Thanks for the review, @gnodet! Both points addressed (backport of #12384): 1. Rethrow path — added coverage for a 2. Commit reference — added a Force-pushed ( |
What
Adds
DefaultLookupTest(maven-core) — the regression test that the backported NPE fix #12340 shipped without.Why
#12340 (backport of #12336) changed
DefaultLookup.lookupOptional(...)to useOptional.ofNullableinstead ofOptional.of, so anullcomponent lookup returns an emptyOptionalinstead of throwingNullPointerException. Nothing currently guards that behavior on this line — reverting the fix goes undetected by the suite.Test
DefaultLookupTestcovers bothlookupOptionaloverloads:null-> emptyOptional(the guarded NPE case)OptionalComponentLookupExceptionwhose cause isNoSuchElementException-> emptyVerified locally: green on current maven-4.0.x; reverting
ofNullable->ofturns the two null-case tests red with the NPE fromjava.util.Optional.of. No production code change.