chore(spdx-reporter): Simplify licenseDeclared expressions

Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Nov 5, 2024 · c9048f3 · c9048f3
1 parent 955e72f
commit c9048f3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-expected-output.spdx.yml b/plugins/reporters/spdx/src/funTest/assets/disclosure-cli-expected-output.spdx.yml
@@ -273,7 +273,7 @@ packages:
   filesAnalyzed: false
   homepage: "NONE"
   licenseConcluded: "NOASSERTION"
-  licenseDeclared: "Apache-2.0 AND MIT AND MIT"
+  licenseDeclared: "Apache-2.0 AND MIT"
   name: "gopkg.in/yaml.v3"
   summary: "NONE"
   versionInfo: "3.0.1"
@@ -288,7 +288,7 @@ packages:
   filesAnalyzed: false
   homepage: "NONE"
   licenseConcluded: "NOASSERTION"
-  licenseDeclared: "Apache-2.0 AND MIT AND MIT"
+  licenseDeclared: "Apache-2.0 AND MIT"
   name: "gopkg.in/yaml.v3"
   summary: "NONE"
   versionInfo: "3.0.1"

diff --git a/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json b/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.json
@@ -46,7 +46,7 @@
     "filesAnalyzed" : false,
     "homepage" : "first package's homepage URL",
     "licenseConcluded" : "BSD-2-Clause AND BSD-3-Clause AND MIT",
-    "licenseDeclared" : "Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only OR MIT) AND MIT AND MIT AND MIT",
+    "licenseDeclared" : "Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND MIT",
     "name" : "first-package",
     "summary" : "A package with all supported attributes set, with a VCS URL containing a user name, and with two scan results for the VCS containing copyright findings matched to a license finding.",
     "versionInfo" : "0.0.1"
@@ -63,7 +63,7 @@
     "hasFiles" : [ "SPDXRef-File-1" ],
     "homepage" : "first package's homepage URL",
     "licenseConcluded" : "NOASSERTION",
-    "licenseDeclared" : "Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only OR MIT) AND MIT AND MIT AND MIT",
+    "licenseDeclared" : "Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND MIT",
     "licenseInfoFromFiles" : [ "Apache-2.0", "BSD-2-Clause" ],
     "name" : "first-package",
     "packageVerificationCode" : {
@@ -87,7 +87,7 @@
     "filesAnalyzed" : false,
     "homepage" : "first package's homepage URL",
     "licenseConcluded" : "NOASSERTION",
-    "licenseDeclared" : "Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only OR MIT) AND MIT AND MIT AND MIT",
+    "licenseDeclared" : "Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND MIT",
     "name" : "first-package",
     "summary" : "A package with all supported attributes set, with a VCS URL containing a user name, and with two scan results for the VCS containing copyright findings matched to a license finding.",
     "versionInfo" : "0.0.1"

diff --git a/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml b/plugins/reporters/spdx/src/funTest/assets/spdx-document-reporter-expected-output.spdx.yml
@@ -55,10 +55,8 @@ packages:
   filesAnalyzed: false
   homepage: "first package's homepage URL"
   licenseConcluded: "BSD-2-Clause AND BSD-3-Clause AND MIT"
-  licenseDeclared: "Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause\
-    \ AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause\
-    \ AND BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only\
-    \ OR MIT) AND (GPL-2.0-only OR MIT) AND MIT AND MIT AND MIT"
+  licenseDeclared: "Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-only\
+    \ OR MIT) AND MIT"
   name: "first-package"
   summary: "A package with all supported attributes set, with a VCS URL containing\
     \ a user name, and with two scan results for the VCS containing copyright findings\
@@ -78,10 +76,8 @@ packages:
   - "SPDXRef-File-1"
   homepage: "first package's homepage URL"
   licenseConcluded: "NOASSERTION"
-  licenseDeclared: "Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause\
-    \ AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause\
-    \ AND BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only\
-    \ OR MIT) AND (GPL-2.0-only OR MIT) AND MIT AND MIT AND MIT"
+  licenseDeclared: "Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-only\
+    \ OR MIT) AND MIT"
   licenseInfoFromFiles:
   - "Apache-2.0"
   - "BSD-2-Clause"
@@ -107,10 +103,8 @@ packages:
   filesAnalyzed: false
   homepage: "first package's homepage URL"
   licenseConcluded: "NOASSERTION"
-  licenseDeclared: "Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause AND BSD-2-Clause\
-    \ AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause AND BSD-3-Clause\
-    \ AND BSD-3-Clause AND BSD-3-Clause AND (GPL-2.0-only OR MIT) AND (GPL-2.0-only\
-    \ OR MIT) AND (GPL-2.0-only OR MIT) AND MIT AND MIT AND MIT"
+  licenseDeclared: "Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-only\
+    \ OR MIT) AND MIT"
   name: "first-package"
   summary: "A package with all supported attributes set, with a VCS URL containing\
     \ a user name, and with two scan results for the VCS containing copyright findings\

diff --git a/plugins/reporters/spdx/src/main/kotlin/Extensions.kt b/plugins/reporters/spdx/src/main/kotlin/Extensions.kt
@@ -204,6 +204,7 @@ internal fun Package.toSpdxPackage(
             SpdxConstants.NONE
         } else {
             packageLicenseExpressions.reduce(SpdxExpression::and)
+                .simplify()
                 .sorted()
                 .nullOrBlankToSpdxNoassertionOrNone()
         },