Fix problematic regular expressions reported by SonarCloud #6995
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
Suggested tests to cover this Pull Request
|
nadvornik
force-pushed
the
rexex
branch
3 times, most recently
from
12a53d6 to
11a1861
Compare
nadvornik
changed the title
nadvornik
force-pushed
the
rexex
branch
2 times, most recently
from
567be3c to
7798518
Compare
cbosdo
reviewed
May 24, 2023
| @@ -240,7 +240,7 @@ public static SortedMap<String, String> setUpPowerTypes(HttpServletRequest reque | |||
| SortedMap<String, String> types = new TreeMap<>(); | |||
| String typeString = ConfigDefaults.get().getCobblerPowerTypes(); | |||
| if (typeString != null) { | |||
| List<String> typeNames = Arrays.asList(typeString.split(" *, *")); | |||
| List<String> typeNames = Arrays.asList(typeString.split(" *+, *+")); | |||
There was a problem hiding this comment.
Wouldn't it be even better with "[^,]*+, *+" ?
| @@ -71,7 +71,7 @@ public class PowerManagementHandler extends BaseHandler { | |||
| public List<String> listTypes(User loggedInUser) { | |||
| String typeString = ConfigDefaults.get().getCobblerPowerTypes(); | |||
| if (typeString != null) { | |||
| return Arrays.asList(typeString.split(" *, *")); | |||
| return Arrays.asList(typeString.split(" *+, *+")); | |||
| @@ -37,11 +37,11 @@ public class RhelUtils { | |||
| private RhelUtils() { } | |||
|
|
|||
| private static final Pattern RHEL_RELEASE_MATCHER = | |||
| Pattern.compile("(.+)\\srelease\\s([\\d.]+)\\s*\\((.+)\\).*", Pattern.DOTALL); | |||
| Pattern.compile("(.+)\\srelease\\s([\\d.]+)\\s*+\\(([^)]++)\\).*+", Pattern.DOTALL); | |||
There was a problem hiding this comment.
Don't you need a + to prevent backtracking in the first group too?
| private static final Pattern ORACLE_RELEASE_MATCHER = | ||
| Pattern.compile("(.+)\\srelease\\s([\\d.]+).*", Pattern.DOTALL); | ||
| private static final Pattern ALIBABA_RELEASE_MATCHER = | ||
| Pattern.compile("(.+)\\srelease\\s([\\d.]+)\\s*LTS\\s*\\((.+)\\).*", Pattern.DOTALL); | ||
| Pattern.compile("(.+)\\srelease\\s([\\d.]+)\\s*+LTS\\s*+\\(([^)]++)\\).*+", Pattern.DOTALL); |
|
This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
|
This PR was closed because it has been stalled for 10 days with no activity. |
|
Reopening: some questions haven't been answered |
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.
What does this PR change?
This PR fixes some of the problematic regular expressions by using
String contains()method or by using possessive quantifiers.GUI diff
No difference.
Documentation
Test coverage
Links
Partially fixes https://github.com/SUSE/spacewalk/issues/21403
Changelogs
Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository
If you don't need a changelog check, please mark this checkbox:
If you uncheck the checkbox after the PR is created, you will need to re-run
changelog_test(see below)Re-run a test
If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run: