fix: MutableContext and ImmutableContext merge are made recursive

[javicv]

Signed-off-by: Javier Collado javicv@gmail.com

This PR

• Makes the evaluation context merge recursive for both MutableContext and ImmutableContext

Related Issues

Fixes #270

Notes

Follow-up Tasks

How to test

• A new test method mergeShouldRetainItsSubkeysWhenOverridingContextHasTheSameKey in dev.openfeature.sdk.ImmutableContextTest has been added

[toddbaert]

@javicv spotbugs has a few complaints! Please take a look.

[codecov-commenter]

Codecov Report

Merging #280 (b810b3a) into main (ed2e963) will increase coverage by 0.29%.
The diff coverage is 88.46%.

@@             Coverage Diff              @@
##               main     #280      +/-   ##
============================================
+ Coverage     91.52%   91.82%   +0.29%     
- Complexity      208      213       +5     
============================================
  Files            23       23              
  Lines           472      489      +17     
  Branches         27       30       +3     
============================================
+ Hits            432      449      +17     
+ Misses           26       24       -2     
- Partials         14       16       +2     

Flag	Coverage Δ
unittests	91.82% <88.46%> (+0.29%)	⬆️

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

Impacted Files	Coverage Δ
.../main/java/dev/openfeature/sdk/MutableContext.java	72.54% <80.00%> (+4.46%)	⬆️
src/main/java/dev/openfeature/sdk/Structure.java	89.74% <92.30%> (+1.28%)	⬆️
...ain/java/dev/openfeature/sdk/ImmutableContext.java	90.90% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

[toddbaert]

CI is passing now. I'll take a closer look at this today/tomorrow.

[toddbaert]

Thanks so much @javicv . I think this is good conceptually. See comments in private merge methods.

[toddbaert]

Failed to execute goal org.apache.maven.plugins:maven-pmd-plugin:3.20.0:check (run-pmd) on project sdk: You have 3 PMD violations.

@javicv I will re-review later today, but this looks almost perfect to me! You do have some PMD issues though. Try running mvn verify locally to see them (if you have issues, try using JDK 8).

[toddbaert]

@javicv I pushed some (very) small changes to your second test that I think should resolve the coverage issue.

[toddbaert]

I'm a bit confused my codecov isn't seeing that one line covered, but I'm satisfied with the tests, and the delta is very small anyway.

Thanks @javicv for all your efforts! This will be really nice to have. Approved.

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information