Skip to content

Compare listed licenses by IDs only #44

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
merged 3 commits into from
Mar 9, 2021
Merged

Compare listed licenses by IDs only #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
974353a
Compare listed licenses by IDs only
goneall Mar 9, 2021
e4613af
Change fix for compare to override the equiv method in the subclasses…
goneall Mar 9, 2021
60a7875
Remove unused import
goneall Mar 9, 2021
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
4 changes: 2 additions & 2 deletions src/main/java/org/spdx/library/model/license/License.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,11 @@ public ModelUpdate updateSetDeprecated(Boolean deprecated) throws InvalidSPDXAna
}

@Override
public boolean equivalent(ModelObject compare) throws InvalidSPDXAnalysisException {
public boolean equivalent(ModelObject compare, boolean ignoreExternalReferences) throws InvalidSPDXAnalysisException {
if (compare instanceof License) {
return LicenseCompareHelper.isLicenseTextEquivalent(this.getLicenseText(), ((License)compare).getLicenseText());
} else {
return super.equivalent(compare);
return super.equivalent(compare, ignoreExternalReferences);
}
}
}
10 changes: 10 additions & 0 deletions src/main/java/org/spdx/library/model/license/ListedLicenseException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.spdx.library.InvalidSPDXAnalysisException;
import org.spdx.library.ModelCopyManager;
import org.spdx.library.SpdxConstants;
import org.spdx.library.model.ModelObject;
import org.spdx.licenseTemplate.LicenseTemplateRuleException;
import org.spdx.licenseTemplate.SpdxLicenseTemplateHelper;
import org.spdx.storage.IModelStore;
Expand Down Expand Up @@ -119,5 +120,14 @@ public String getExceptionTextHtml() throws InvalidSPDXAnalysisException {
}
}
}

@Override
public boolean equivalent(ModelObject compare, boolean ignoreRelatedElements) throws InvalidSPDXAnalysisException {
if (compare instanceof ListedLicenseException) {
return this.getId().equals(((ListedLicenseException)compare).getId()); // for listed license, the license ID is the only thing that matters
} else {
return super.equivalent(compare, ignoreRelatedElements);
}
}

}
4 changes: 2 additions & 2 deletions src/main/java/org/spdx/library/model/license/SpdxListedLicense.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ public String getType() {
}

@Override
public boolean equivalent(ModelObject compare) throws InvalidSPDXAnalysisException {
public boolean equivalent(ModelObject compare, boolean ignoreRelatedElements) throws InvalidSPDXAnalysisException {
if (compare instanceof SpdxListedLicense) {
return this.getLicenseId().equals(((SpdxListedLicense)compare).getLicenseId()); // for listed license, the license ID is the only thing that matters
} else {
return super.equivalent(compare);
return super.equivalent(compare, ignoreRelatedElements);
}
}

Expand Down
5 changes: 5 additions & 0 deletions src/test/java/org/spdx/library/model/license/LicenseExpressionParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,9 @@ public void testExternalLicenseRef() throws InvalidSPDXAnalysisException {
assertTrue(result instanceof ExternalExtractedLicenseInfo);
assertEquals(externalExtractedId, ((ExternalExtractedLicenseInfo)result).getId());
}

public void regressionMitWith() throws InvalidSPDXAnalysisException, InvalidLicenseStringException {
AnyLicenseInfo result = LicenseInfoFactory.parseSPDXLicenseString("MIT WITH Autoconf-exception-2.0");
assertEquals("MIT WITH Autoconf-exception-2.0",result.toString());
}
}