Skip to content

Commit d3b4518

Browse files
committed
NodeSupport: Simplify the code to lookup workspaces a bit
Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 85326ec commit d3b4518

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

analyzer/src/main/kotlin/managers/utils/NodeSupport.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ package org.ossreviewtoolkit.analyzer.managers.utils
2323

2424
import com.fasterxml.jackson.core.JsonProcessingException
2525
import com.fasterxml.jackson.databind.node.ArrayNode
26-
import com.fasterxml.jackson.databind.node.ObjectNode
2726

2827
import java.io.File
2928
import java.nio.file.FileSystems
3029
import java.nio.file.PathMatcher
3130

32-
import org.ossreviewtoolkit.model.readValue
31+
import org.ossreviewtoolkit.model.readJsonFile
3332
import org.ossreviewtoolkit.utils.AuthenticatedProxy
3433
import org.ossreviewtoolkit.utils.ProtocolProxyMap
3534
import org.ossreviewtoolkit.utils.collectMessagesAsString
@@ -176,7 +175,7 @@ private fun getPackageJsonInfo(definitionFiles: Set<File>): Collection<PackageJs
176175

177176
private fun isYarnWorkspaceRoot(definitionFile: File) =
178177
try {
179-
definitionFile.readValue<ObjectNode>()["workspaces"] != null
178+
readJsonFile(definitionFile).has("workspaces")
180179
} catch (e: JsonProcessingException) {
181180
e.showStackTrace()
182181

@@ -211,7 +210,7 @@ private fun getYarnWorkspaceSubmodules(definitionFiles: Set<File>): Set<File> {
211210

212211
private fun getWorkspaceMatchers(definitionFile: File): List<PathMatcher> {
213212
var workspaces = try {
214-
definitionFile.readValue<ObjectNode>()["workspaces"]
213+
readJsonFile(definitionFile).get("workspaces")
215214
} catch (e: JsonProcessingException) {
216215
e.showStackTrace()
217216

0 commit comments

Comments
 (0)