fixed circular ref false positive during property resolution with mul… #269
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
| @@ -171,8 +181,7 @@ protected Object resolveReferenceInDepth(Reference reference, Map<String, Object | |||
| currentProperty = resolveKeyInIterable(keyPart, (Collection<?>) currentProperty, deepReferenceKey); | |||
| keyPart = ""; | |||
| } else if (currentProperty instanceof Map) { | |||
| @SuppressWarnings("unchecked") | |||
| Object subProperty = MapUtils.getObject((Map<Object, ?>) currentProperty, keyPart); | |||
| @SuppressWarnings("unchecked") Object subProperty = MapUtils.getObject((Map<Object, ?>) currentProperty, keyPart); | |||
There was a problem hiding this comment.
In the rest of the code @SuppressWarnings("unchecked") is on a separate row, please align
theghost5800
reviewed
Aug 5, 2024
| boolean resolutionContextWasCreated = false; | ||
| HashSet<String> contextKeysBackup = null; |
There was a problem hiding this comment.
Isn't it better to use Collections.emptySet() for collections instead of null.
| @@ -171,8 +181,7 @@ protected Object resolveReferenceInDepth(Reference reference, Map<String, Object | |||
| currentProperty = resolveKeyInIterable(keyPart, (Collection<?>) currentProperty, deepReferenceKey); | |||
| keyPart = ""; | |||
| } else if (currentProperty instanceof Map) { | |||
| @SuppressWarnings("unchecked") | |||
| Object subProperty = MapUtils.getObject((Map<Object, ?>) currentProperty, keyPart); | |||
| @SuppressWarnings("unchecked") Object subProperty = MapUtils.getObject((Map<Object, ?>) currentProperty, keyPart); | |||
| void testResolve(String parameterName, String parameterValue, Expectation expectation) { | ||
| PropertiesResolver testResolver = new PropertiesResolver(null, irrelevant -> replacementValues, ReferencePattern.PLACEHOLDER, | ||
| "test-", false, Collections.emptySet()); | ||
| tester.test(() -> testResolver.visit(parameterName, parameterValue), expectation); |
There was a problem hiding this comment.
Why invoked method was changed from resolveReferenceInDepth to visit?
There was a problem hiding this comment.
the previous method only tested a small portion of the code and couldn't resolve variables in depth (variables containing refs to other refs)
s-yonkov-yonkov
approved these changes
Aug 5, 2024
theghost5800
approved these changes
Aug 5, 2024
ikasarov
force-pushed
the
circular-ref-fix
branch
from
b23c3d3
to
bf25337
Compare
|
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.
…tiple references
LMCROSSITXSADEPLOY-2936
Using multiple references linking to same variable was incorrectly detected as a circular reference - Fixed ref key context to reset on each subsequent ref.
Fixed error message in Tester class