node: Port all remaining Jackson-based code to KxS #9125
Merged
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
fviernau
force-pushed
the
node-finish-porting-to-kxs
branch
from
e360304
to
f1f6dc8
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #9125 +/- ##
============================================
+ Coverage 67.14% 67.15% +0.01%
+ Complexity 1193 1191 -2
============================================
Files 239 239
Lines 7892 7898 +6
Branches 914 916 +2
============================================
+ Hits 5299 5304 +5
Misses 2225 2225
- Partials 368 369 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
sschuberth
requested changes
Sep 11, 2024
| @@ -146,7 +141,8 @@ class Yarn2( | |||
| */ | |||
| private fun isCorepackEnabledInManifest(workingDir: File): Boolean = | |||
| runCatching { | |||
| PACKAGE_MANAGER_PROPERTY in jsonMapper.readTree(workingDir.resolve(MANIFEST_FILE)) | |||
| val packageJson = parsePackageJson(workingDir.resolve(MANIFEST_FILE)) | |||
| packageJson.packageManger.orEmpty().isNotBlank() | |||
There was a problem hiding this comment.
How about !packageJson.packageManger.isNullOrEmpty() instead? There is also isNullOrBlank(), but I'm not sure whether we need to cover the rather pathological blank case here.
Comment on lines
739
to
740
| when { | ||
| type == YarnDependencyType.DEPENDENCIES -> dependencies | ||
| else -> devDependencies | ||
| } |
There was a problem hiding this comment.
Better use
when (type) {
YarnDependencyType.DEPENDENCIES -> dependencies
YarnDependencyType.DEV_DEPENDENCIES -> devDependencies
}
Kotlin will recognize that the when is exhaustive, so no else is needed.
| @@ -61,8 +59,11 @@ import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.mapNpmLicenses | |||
| import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.parseNpmAuthor | |||
| import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.parseNpmVcsInfo | |||
| import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.splitNpmNamespaceAndName | |||
| import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn2.Yarn2.Companion.YARN2_RESOURCE_FILE | |||
There was a problem hiding this comment.
Commit message: Typo in .yarn*r*c.yml.
Comment on lines
745
to
747
| val yarnPath = yarnConfig.get<YamlScalar>(YARN_PATH_PROPERTY_NAME)?.content.orEmpty().ifBlank { null } | ||
|
|
||
| requireNotNull(yarnPath) { "No Yarn 2+ executable could be found in '$YARN2_RESOURCE_FILE'." } |
There was a problem hiding this comment.
While at it, maybe simplify to
val yarnPath = yarnConfig.get<YamlScalar>(YARN_PATH_PROPERTY_NAME)?.content
require(!yarnPath.isNullOrEmpty()) { "No Yarn 2+ executable could be found in '$YARN2_RESOURCE_FILE'." }
Again, I'm unsure whether we need to cover the pathological bank case.
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
fviernau
force-pushed
the
node-finish-porting-to-kxs
branch
from
f1f6dc8
to
7855479
Compare
sschuberth
previously approved these changes
Sep 11, 2024
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Separate the parsing of '.yarnrc.yml' a bit. Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Signed-off-by: Frank Viernau <frank_viernau@epam.com>
fviernau
force-pushed
the
node-finish-porting-to-kxs
branch
from
7855479
to
de0df1b
Compare
nnobelis
approved these changes
Sep 12, 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.
See individual commits.