Skip to content

Commit 611c2a5

Browse files
committed
chore(spdx): Simplify two fallback conditions
Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 2901d30 commit 611c2a5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

plugins/reporters/spdx/src/main/kotlin/Extensions.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,8 @@ internal fun OrtResult.getSpdxFiles(
288288
),
289289
filename = fileFindings.path,
290290
licenseConcluded = SpdxConstants.NOASSERTION,
291-
licenseInfoInFiles = fileFindings.licenses.takeIf { it.isNotEmpty() }?.map { it.toString() }
292-
?: listOf(SpdxConstants.NONE),
293-
copyrightText = fileFindings.copyrights.sorted().joinToString("\n").takeUnless {
294-
it.isBlank()
295-
} ?: SpdxConstants.NONE
291+
licenseInfoInFiles = fileFindings.licenses.map { it.toString() }.ifEmpty { listOf(SpdxConstants.NONE) },
292+
copyrightText = fileFindings.copyrights.sorted().joinToString("\n").ifBlank { SpdxConstants.NONE }
296293
)
297294
}
298295

0 commit comments

Comments
 (0)