Skip to content

Rename getCaseSensisitiveId -> getCaseSensitiveId #297

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 1 commit into from
Feb 27, 2025
Merged

Rename getCaseSensisitiveId -> getCaseSensitiveId #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseModelStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,12 +1246,12 @@ public Optional<String> listedExceptionIdCaseSensitive(String exceptionId) {
}

@Override
public Optional<String> getCaseSensisitiveId(String documentUri, String caseInsensisitiveId) {
Optional<String> retval = listedLicenseIdCaseSensitive(caseInsensisitiveId);
public Optional<String> getCaseSensitiveId(String documentUri, String caseInsensitiveId) {
Optional<String> retval = listedLicenseIdCaseSensitive(caseInsensitiveId);
if (retval.isPresent()) {
return retval;
}
return listedExceptionIdCaseSensitive(caseInsensisitiveId);
return listedExceptionIdCaseSensitive(caseInsensitiveId);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/spdx/storage/listedlicense/SpdxV2ListedLicenseModelStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,12 @@ public IdType getIdType(String objectUri) {
}

/* (non-Javadoc)
* @see org.spdx.storage.IModelStore#getCaseSensisitiveId(java.lang.String, java.lang.String)
* @see org.spdx.storage.IModelStore#getCaseSensitiveId(java.lang.String, java.lang.String)
*/
@Override
public Optional<String> getCaseSensisitiveId(String nameSpace,
String caseInsensisitiveId) {
return baseStore.getCaseSensisitiveId(nameSpace, caseInsensisitiveId);
public Optional<String> getCaseSensitiveId(String nameSpace,
String caseInsensitiveId) {
return baseStore.getCaseSensitiveId(nameSpace, caseInsensitiveId);
}

/* (non-Javadoc)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/spdx/storage/listedlicense/SpdxV3ListedLicenseModelStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,12 @@ public IdType getIdType(String objectUri) {
}

/* (non-Javadoc)
* @see org.spdx.storage.IModelStore#getCaseSensisitiveId(java.lang.String, java.lang.String)
* @see org.spdx.storage.IModelStore#getCaseSensitiveId(java.lang.String, java.lang.String)
*/
@Override
public Optional<String> getCaseSensisitiveId(String nameSpace,
String caseInsensisitiveId) {
return baseStore.getCaseSensisitiveId(nameSpace, caseInsensisitiveId);
public Optional<String> getCaseSensitiveId(String nameSpace,
String caseInsensitiveId) {
return baseStore.getCaseSensitiveId(nameSpace, caseInsensitiveId);
}

/* (non-Javadoc)
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/spdx/storage/simple/ExtendedSpdxStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ public boolean isAnon(String objectUri) {
}

/* (non-Javadoc)
* @see org.spdx.storage.IModelStore#getCaseSensisitiveId(java.lang.String, java.lang.String)
* @see org.spdx.storage.IModelStore#getCaseSensitiveId(java.lang.String, java.lang.String)
*/
@Override
public Optional<String> getCaseSensisitiveId(String documentUri, String caseInsensisitiveId) {
return baseStore.getCaseSensisitiveId(documentUri, caseInsensisitiveId);
public Optional<String> getCaseSensitiveId(String documentUri, String caseInsensitiveId) {
return baseStore.getCaseSensitiveId(documentUri, caseInsensitiveId);
}

/* (non-Javadoc)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/spdx/utility/license/LicenseExpressionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ private static org.spdx.library.model.v2.license.AnyLicenseInfo parseSimpleLicen
licenseId.get(), SpdxConstantsCompatV2.CLASS_SPDX_LISTED_LICENSE, copyManager, true);
} else {
// LicenseRef
Optional<String> caseSensitiveId = store.getCaseSensisitiveId(documentUri, token);
Optional<String> caseSensitiveId = store.getCaseSensitiveId(documentUri, token);
ExtractedLicenseInfo localLicense;
if (caseSensitiveId.isPresent()) {
localLicense = new ExtractedLicenseInfo(store, documentUri, caseSensitiveId.get(), copyManager, false);
Expand Down
19 changes: 18 additions & 1 deletion src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,8 @@ public void testIdType() throws Exception {
}
}

public void testGetCaseSensisitiveId() throws Exception {
@SuppressWarnings("deprecation")
public void testGetCaseSensisitiveId() throws Exception {
try (InMemSpdxStore store = new InMemSpdxStore()) {
String expected = "TestIdOne";
String lower = expected.toLowerCase();
Expand All @@ -596,6 +597,22 @@ public void testGetCaseSensisitiveId() throws Exception {
}
}
}

public void testGetCaseSensitiveId() throws Exception {
try (InMemSpdxStore store = new InMemSpdxStore()) {
String expected = "TestIdOne";
String lower = expected.toLowerCase();
store.create(new TypedValue(TEST_NAMESPACE1 + "#" + expected, SpdxConstantsCompatV2.CLASS_ANNOTATION, "SPDX-2.3"));
assertEquals(expected, store.getCaseSensitiveId(TEST_NAMESPACE1, lower).get());
assertFalse(store.getCaseSensitiveId(TEST_NAMESPACE1, "somethingNotThere").isPresent());
try {
store.create(new TypedValue(TEST_NAMESPACE1 + "#" + lower, SpdxConstantsCompatV2.CLASS_ANNOTATION, "SPDX-2.3"));
fail("This should be a duplicate ID failure");
} catch (InvalidSPDXAnalysisException e) {
// expected
}
}
}

public void testGetTypedValue() throws Exception {
try (InMemSpdxStore store = new InMemSpdxStore()) {
Expand Down