-
Notifications
You must be signed in to change notification settings - Fork 366
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
Give explicit property definitions higher precedence than Maven's implicit ones. #4334
Merged
timtebeek
merged 4 commits into
openrewrite:main
from
nguyenhoan:circular-placeholder-reference
Jul 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
86ae0f1
Exclude Maven built-in property from circular placeholder reference c…
34decaf
Revert "Exclude Maven built-in property from circular placeholder ref…
5034df0
Give explicit property definitions higher precedence than Maven's imp…
18b434c
Reformat test
timtebeek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -15,6 +15,7 @@ | |||||||||||||
*/ | ||||||||||||||
package org.openrewrite.internal; | ||||||||||||||
|
||||||||||||||
import org.openrewrite.internal.lang.NonNull; | ||||||||||||||
import org.openrewrite.internal.lang.Nullable; | ||||||||||||||
|
||||||||||||||
import java.util.*; | ||||||||||||||
|
@@ -27,12 +28,21 @@ | |||||||||||||
* @author Rob Harrop | ||||||||||||||
*/ | ||||||||||||||
public class PropertyPlaceholderHelper { | ||||||||||||||
|
||||||||||||||
private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<>(4); | ||||||||||||||
|
||||||||||||||
private static final List<String> MAVEN_BUILT_IN_PROPERTY_PREFIXES = new ArrayList<>(); | ||||||||||||||
|
||||||||||||||
static { | ||||||||||||||
wellKnownSimplePrefixes.put("}", "{"); | ||||||||||||||
wellKnownSimplePrefixes.put("]", "["); | ||||||||||||||
wellKnownSimplePrefixes.put(")", "("); | ||||||||||||||
|
||||||||||||||
MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("project."); | ||||||||||||||
MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("pom."); | ||||||||||||||
MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("maven."); | ||||||||||||||
MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("env."); | ||||||||||||||
MAVEN_BUILT_IN_PROPERTY_PREFIXES.add("settings."); | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
private final String placeholderPrefix; | ||||||||||||||
|
@@ -88,7 +98,7 @@ protected String parseStringValue(String value, Function<String, String> placeho | |||||||||||||
if (visitedPlaceholders == null) { | ||||||||||||||
visitedPlaceholders = new HashSet<>(4); | ||||||||||||||
} | ||||||||||||||
if (!visitedPlaceholders.add(originalPlaceholder)) { | ||||||||||||||
if (!visitedPlaceholders.add(originalPlaceholder) && !isMavenBuiltInProperty(originalPlaceholder)) { | ||||||||||||||
throw new IllegalArgumentException( | ||||||||||||||
"Circular placeholder reference '" + originalPlaceholder + "' in property definitions"); | ||||||||||||||
} | ||||||||||||||
|
@@ -160,4 +170,13 @@ private static boolean substringMatch(CharSequence str, int index, CharSequence | |||||||||||||
} | ||||||||||||||
return true; | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
private static boolean isMavenBuiltInProperty(@NonNull final String originalPlaceholder) { | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We've already annotated the package; that means we likely don't have to repeat ourselves here. rewrite/rewrite-core/src/main/java/org/openrewrite/internal/package-info.java Lines 16 to 19 in 86ae0f1
Suggested change
|
||||||||||||||
for (final String prefix : MAVEN_BUILT_IN_PROPERTY_PREFIXES) { | ||||||||||||||
if (originalPlaceholder.startsWith(prefix)) { | ||||||||||||||
return true; | ||||||||||||||
} | ||||||||||||||
} | ||||||||||||||
return false; | ||||||||||||||
} | ||||||||||||||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.