Skip to content

update isSingleToken to return false for null and empty strings #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goneall merged 2 commits into from
Jun 17, 2025
Merged

update isSingleToken to return false for null and empty strings #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136a12b
isSingleToken return false for null and empty strings
goneall Jun 17, 2025
0645a20
Update javadocs for isSingleTokenText
goneall Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,19 +227,19 @@ public static String locateOriginalText(String fullLicenseText, int startToken,
/**
* Check whether the given text contains only a single token
* <p>
* A single token string is a string that contains zero or one token,
* A single token string is a string that contains exactly one token,
* as identified by the {@link LicenseTextHelper#TOKEN_SPLIT_PATTERN}.
* Whitespace and punctuation such as dots, commas, question marks,
* and quotation marks are ignored.
* </p>
*
* @param text The text to test.
* @return {@code true} if the text contains zero or one token,
* @return {@code true} if the text contains exactly one token,
* {@code false} otherwise.
*/
public static boolean isSingleTokenString(@Nullable String text) {
if (text == null || text.isEmpty()) {
return true; // Zero tokens is considered a single token string
if (text == null || text.trim().isEmpty()) {
return false;
}
Matcher m = LicenseTextHelper.TOKEN_SPLIT_PATTERN.matcher(text);
boolean found = false;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/spdx/utility/compare/LicenseCompareHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,10 @@ public void testLicenseEqualsNoneLicense() throws InvalidSPDXAnalysisException,
}

public void testisSingleTokenString() {
assertTrue(LicenseCompareHelper.isSingleTokenString(null));
assertTrue(LicenseCompareHelper.isSingleTokenString(""));
assertTrue(LicenseCompareHelper.isSingleTokenString(" "));
assertTrue(LicenseCompareHelper.isSingleTokenString("\n"));
assertFalse(LicenseCompareHelper.isSingleTokenString(null));
assertFalse(LicenseCompareHelper.isSingleTokenString(""));
assertFalse(LicenseCompareHelper.isSingleTokenString(" "));
assertFalse(LicenseCompareHelper.isSingleTokenString("\n"));
assertTrue(LicenseCompareHelper.isSingleTokenString("'"));
assertTrue(LicenseCompareHelper.isSingleTokenString(" '"));
assertTrue(LicenseCompareHelper.isSingleTokenString("' "));
Expand Down