From 2fa684a2a089a7c76eb4f4500597aa41ebab82fe Mon Sep 17 00:00:00 2001
From: Arthit Suriyawongkul <arthit@gmail.com>
Date: Mon, 20 Jul 2026 23:42:34 +0100
Subject: [PATCH] Migrate away from deprecated matchingStandardLicenseIds

Change from the deprecated `LicenseCompareHelper.matchingStandardLicenseIds(licenseText)`
to `LicenseCompareHelper.listAllListedLicenseIdsMatched(licenseText)`

Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
---
 .../spdx/tools/MatchingStandardLicenses.java  | 13 ++--
 .../tools/MatchingStandardLicensesTest.java   | 70 +++++++++++++++++++
 2 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/org/spdx/tools/MatchingStandardLicensesTest.java

diff --git a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java
index 58a097c..c560643 100644
--- a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java
+++ b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.util.List;
 
 import org.spdx.core.InvalidSPDXAnalysisException;
 import org.spdx.utility.compare.LicenseCompareHelper;
@@ -96,9 +97,9 @@ static int run(String[] args) {
 			return ExitCode.ERROR;
 		}
 
-		String[] matchingLicenseIds = null;
+		List<String> matchingLicenseIds = null;
 		try {
-			matchingLicenseIds = LicenseCompareHelper.matchingStandardLicenseIds(licenseText);
+			matchingLicenseIds = LicenseCompareHelper.listAllListedLicenseIdsMatched(licenseText);
 		} catch (InvalidSPDXAnalysisException e) {
 			System.out.println("Error reading standard licenses: "+e.getMessage());
 			return ExitCode.ERROR;
@@ -107,14 +108,14 @@ static int run(String[] args) {
 			return ExitCode.ERROR;
 		}
 
-		if (matchingLicenseIds == null || matchingLicenseIds.length == 0) {
+		if (matchingLicenseIds == null || matchingLicenseIds.isEmpty()) {
 			System.out.println("No standard licenses matched.");
 		} else {
 			StringBuilder sb = new StringBuilder("The following license id(s) match: ");
-			sb.append(matchingLicenseIds[0]);
-			for (int i = 1; i < matchingLicenseIds.length; i++) {
+			sb.append(matchingLicenseIds.get(0));
+			for (int i = 1; i < matchingLicenseIds.size(); i++) {
 				sb.append(", ");
-				sb.append(matchingLicenseIds[i]);
+				sb.append(matchingLicenseIds.get(i));
 			}
 			System.out.println(sb.toString());
 		}
diff --git a/src/test/java/org/spdx/tools/MatchingStandardLicensesTest.java b/src/test/java/org/spdx/tools/MatchingStandardLicensesTest.java
new file mode 100644
index 0000000..012157c
--- /dev/null
+++ b/src/test/java/org/spdx/tools/MatchingStandardLicensesTest.java
@@ -0,0 +1,70 @@
+/**
+ * SPDX-FileCopyrightText: 2026 SPDX Contributors
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.spdx.tools;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import org.spdx.core.DefaultModelStore;
+import org.spdx.core.ModelRegistry;
+import org.spdx.library.ModelCopyManager;
+import org.spdx.library.model.v2.SpdxModelInfoV2_X;
+import org.spdx.library.model.v3_0_1.SpdxModelInfoV3_0;
+import org.spdx.storage.simple.InMemSpdxStore;
+
+import junit.framework.TestCase;
+
+/**
+ * Test cases for MatchingStandardLicenses
+ *
+ * @author Arthit Suriyawongkul
+ */
+public class MatchingStandardLicensesTest extends TestCase {
+
+	static final String TEST_DIR = "testResources";
+
+	protected void setUp() throws Exception {
+		super.setUp();
+		// Force local JAR-cached listed licenses,
+		// so tests don't access network - avoids slow/flaky runs.
+		System.setProperty("org.spdx.useJARLicenseInfoOnly", "true");
+		ModelRegistry.getModelRegistry().registerModel(new SpdxModelInfoV3_0());
+		ModelRegistry.getModelRegistry().registerModel(new SpdxModelInfoV2_X());
+		DefaultModelStore.initialize(new InMemSpdxStore(), "http://default/namespace",
+				new ModelCopyManager());
+	}
+
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+	public void testMatch() throws Exception {
+		File licenseFile = File.createTempFile("apache20", ".txt");
+		licenseFile.deleteOnExit();
+		Files.write(licenseFile.toPath(),
+				"Apache License Version 2.0, January 2004".getBytes(StandardCharsets.UTF_8));
+		int result = MatchingStandardLicenses.run(new String[] {licenseFile.getAbsolutePath()});
+		assertEquals(ExitCode.SUCCESS, result);
+	}
+
+	public void testFileNotFound() {
+		int result = MatchingStandardLicenses
+				.run(new String[] {TEST_DIR + File.separator + "doesNotExist.txt"});
+		assertEquals(ExitCode.ERROR, result);
+	}
+
+	public void testUsageError() {
+		int result = MatchingStandardLicenses.run(new String[] {});
+		assertEquals(ExitCode.USAGE_ERROR, result);
+
+		result = MatchingStandardLicenses.run(new String[] {"a.txt", "b.txt"});
+		assertEquals(ExitCode.USAGE_ERROR, result);
+
+		result = MatchingStandardLicenses.run(null);
+		assertEquals(ExitCode.USAGE_ERROR, result);
+	}
+}