fix(fossid-webapp): Replace version comparison with Semver #8353
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
sschuberth
requested changes
Feb 28, 2024
| @@ -700,7 +702,9 @@ class FossId internal constructor( | |||
| // Scans that were added to the queue are interpreted as an error by FossID before version 2021.2. | |||
| // For older versions, `waitScanComplete()` is able to deal with queued scans. Therefore, not checking the | |||
| // response of queued scans. | |||
| if (version >= "2021.2" || scanResult.error != "Scan was added to queue.") { | |||
| if (Semver.coerce(version)?.isGreaterThan("2021.2.0") == true || | |||
There was a problem hiding this comment.
Both comparisons should use isGreaterThanOrEqualTo() to match the original code. As that's quite long, consider doing something like
val currentVersion = checkNotNull(Semver.coerce(version))
val minVersion = checkNotNull(Semver.coerce("2021.2"))
if (currentVersion >= minVersion || scanResult.error != "Scan was added to queue.") {
Similar below, and probably also in the test.
There was a problem hiding this comment.
Done but I am not too sure about the checkNotNull though: If FossID does sometimes exotic one day in the future, e.g. 25.6-patch6, the integration will be broken ?
There was a problem hiding this comment.
Actually, coerce turns "25.6-patch6" into "25.6.0", i.e. it's not null. So I thing we should be good.
nnobelis
force-pushed
the
nnobelis/use_semver_4j_for_fossid
branch
from
50fd8a7 to
10fa5ed
Compare
`coerce` needs to be used because FossID versions are not valid semantic versions e.g. "23.3". Signed-off-by: Nicolas Nobelis <[email protected]>
nnobelis
force-pushed
the
nnobelis/use_semver_4j_for_fossid
branch
from
10fa5ed to
bd4d853
Compare
sschuberth
approved these changes
Feb 29, 2024
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.
coerceneeds to be used because FossID versions are not valid semantic versions e.g. "23.3".This follows discussion on #8352.