Skip to content

Handle InvalidLicenseExpression types converting from SPDX 2 to 3 #407

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
Apr 1, 2026
Merged

Handle InvalidLicenseExpression types converting from SPDX 2 to 3 #407

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31e187
Handle InvalidLicenseExpression types converting from SPDX 2 to 3
goneall Mar 31, 2026
22cf492
Use consistent parameter name per review feedback
goneall Mar 31, 2026
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
47 changes: 39 additions & 8 deletions src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
import org.spdx.library.model.v3_0_1.expandedlicensing.OrLaterOperator;
import org.spdx.library.model.v3_0_1.expandedlicensing.WithAdditionOperator;
import org.spdx.library.model.v3_0_1.simplelicensing.AnyLicenseInfo;
import org.spdx.library.model.v3_0_1.simplelicensing.InvalidLicenseExpression;
import org.spdx.library.model.v3_0_1.simplelicensing.LicenseExpression;
import org.spdx.library.model.v3_0_1.software.ContentIdentifierType;
import org.spdx.library.model.v3_0_1.software.Snippet;
Expand Down Expand Up @@ -844,6 +845,34 @@ public OrLaterOperator convertAndStore(org.spdx.library.model.v2.license.OrLater
toOrLaterOperator.setSubjectLicense((License)convertAndStore(fromOrLaterOperator.getLicense()));
return toOrLaterOperator;
}

/**
* Converts an SPDX spec version 2 SPDX InvalidLicenseExpression to an SPDX spec version 3 SPDX InvalidLicenseExpression and store the result
* @param fromInvalidLicenseExpression an SPDX spec version 2 InvalidLicenseExpression
* @return an SPDX spec version 3 InvalidLicenseExpression
* @throws InvalidSPDXAnalysisException on any errors converting
*/
public InvalidLicenseExpression convertAndStore(org.spdx.library.model.v2.license.InvalidLicenseExpression fromInvalidLicenseExpression)
throws InvalidSPDXAnalysisException {
Optional<ModelObjectV3> existing = getExistingObject(fromInvalidLicenseExpression.getObjectUri(),
"SimpleLicensing.InvalidLicenseExpression"); //TODO: This should be included in the SPDXV3 Constants file
if (existing.isPresent()) {
return (InvalidLicenseExpression)existing.get();
}
String toObjectUri = toModelStore.getNextId(IdType.Anonymous);
String existingUri = this.alreadyConverted.putIfAbsent(fromInvalidLicenseExpression.getObjectUri(), toObjectUri);
if (Objects.nonNull(existingUri)) {
// small window if conversion occurred since the last check already converted
return (InvalidLicenseExpression)getExistingObject(fromInvalidLicenseExpression.getObjectUri(),
"SimpleLicensing.InvalidLicenseExpression").get();
}
InvalidLicenseExpression toInvalidLicExpression = (InvalidLicenseExpression)SpdxModelClassFactoryV3.getModelObject(toModelStore,
toObjectUri, "SimpleLicensing.InvalidLicenseExpression", copyManager, true, defaultUriPrefix);
toInvalidLicExpression.setCreationInfo(defaultCreationInfo);
toInvalidLicExpression.setMessage(fromInvalidLicenseExpression.getMessage());
toInvalidLicExpression.setLicenseExpression(fromInvalidLicenseExpression.getMessage());
return toInvalidLicExpression;
}

/**
* Converts an SPDX spec version 2 SPDX SpdxListedLicense to an SPDX spec version 3 SPDX ListedLicense and store the result
Expand Down Expand Up @@ -1043,26 +1072,28 @@ public AnyLicenseInfo convertAndStore(org.spdx.library.model.v2.license.AnyLicen
if (!complexLicenses) {
return convertToLicenseExpression(fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.ConjunctiveLicenseSet) {
return convertAndStore((org.spdx.library.model.v2.license.ConjunctiveLicenseSet)fromLicense);
return convertAndStore((org.spdx.library.model.v2.license.ConjunctiveLicenseSet) fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.DisjunctiveLicenseSet) {
return convertAndStore((org.spdx.library.model.v2.license.DisjunctiveLicenseSet)fromLicense);
return convertAndStore((org.spdx.library.model.v2.license.DisjunctiveLicenseSet) fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.ExternalExtractedLicenseInfo) {
String externalUri = ((org.spdx.library.model.v2.license.ExternalExtractedLicenseInfo)fromLicense).getIndividualURI();
logger.warn("Referencing an external SPDX 2 element with URI {} while converting from SPDX 2 to 3", externalUri);
String externalUri = ((org.spdx.library.model.v2.license.ExternalExtractedLicenseInfo) fromLicense).getIndividualURI();
logger.warn("Referencing an external SPDX 2 element with URI {} while converting from SPDX 2 to 3", externalUri);
addExternalMapInfo(externalUri);
return new ExternalCustomLicense(externalUri);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.ExtractedLicenseInfo) {
return convertAndStore((org.spdx.library.model.v2.license.ExtractedLicenseInfo)fromLicense);
return convertAndStore((org.spdx.library.model.v2.license.ExtractedLicenseInfo) fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.OrLaterOperator) {
return convertAndStore((org.spdx.library.model.v2.license.OrLaterOperator)fromLicense);
return convertAndStore((org.spdx.library.model.v2.license.OrLaterOperator) fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.SpdxListedLicense) {
return convertAndStore((org.spdx.library.model.v2.license.SpdxListedLicense)fromLicense);
return convertAndStore((org.spdx.library.model.v2.license.SpdxListedLicense) fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.SpdxNoneLicense) {
return new NoneLicense();
} else if (fromLicense instanceof org.spdx.library.model.v2.license.SpdxNoAssertionLicense) {
return new NoAssertionLicense();
} else if (fromLicense instanceof org.spdx.library.model.v2.license.WithExceptionOperator) {
return convertAndStore((org.spdx.library.model.v2.license.WithExceptionOperator)fromLicense);
return convertAndStore((org.spdx.library.model.v2.license.WithExceptionOperator) fromLicense);
} else if (fromLicense instanceof org.spdx.library.model.v2.license.InvalidLicenseExpression) {
return convertAndStore((org.spdx.library.model.v2.license.InvalidLicenseExpression) fromLicense);
} else {
throw new InvalidSPDXAnalysisException("Can not convert the from AnyLicenseInfo type "+fromLicense.getType());
}
Expand Down
Loading