Skip to content

Commit 64890b2

Browse files
committed
Rename getCaseSensisitiveId -> getCaseSensitiveId
Fixes #266
1 parent 84d2aee commit 64890b2

6 files changed

Lines changed: 33 additions & 16 deletions

File tree

src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseModelStore.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,12 +1246,12 @@ public Optional<String> listedExceptionIdCaseSensitive(String exceptionId) {
12461246
}
12471247

12481248
@Override
1249-
public Optional<String> getCaseSensisitiveId(String documentUri, String caseInsensisitiveId) {
1250-
Optional<String> retval = listedLicenseIdCaseSensitive(caseInsensisitiveId);
1249+
public Optional<String> getCaseSensitiveId(String documentUri, String caseInsensitiveId) {
1250+
Optional<String> retval = listedLicenseIdCaseSensitive(caseInsensitiveId);
12511251
if (retval.isPresent()) {
12521252
return retval;
12531253
}
1254-
return listedExceptionIdCaseSensitive(caseInsensisitiveId);
1254+
return listedExceptionIdCaseSensitive(caseInsensitiveId);
12551255
}
12561256

12571257
@Override

src/main/java/org/spdx/storage/listedlicense/SpdxV2ListedLicenseModelStore.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,12 @@ public IdType getIdType(String objectUri) {
332332
}
333333

334334
/* (non-Javadoc)
335-
* @see org.spdx.storage.IModelStore#getCaseSensisitiveId(java.lang.String, java.lang.String)
335+
* @see org.spdx.storage.IModelStore#getCaseSensitiveId(java.lang.String, java.lang.String)
336336
*/
337337
@Override
338-
public Optional<String> getCaseSensisitiveId(String nameSpace,
339-
String caseInsensisitiveId) {
340-
return baseStore.getCaseSensisitiveId(nameSpace, caseInsensisitiveId);
338+
public Optional<String> getCaseSensitiveId(String nameSpace,
339+
String caseInsensitiveId) {
340+
return baseStore.getCaseSensitiveId(nameSpace, caseInsensitiveId);
341341
}
342342

343343
/* (non-Javadoc)

src/main/java/org/spdx/storage/listedlicense/SpdxV3ListedLicenseModelStore.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,12 @@ public IdType getIdType(String objectUri) {
342342
}
343343

344344
/* (non-Javadoc)
345-
* @see org.spdx.storage.IModelStore#getCaseSensisitiveId(java.lang.String, java.lang.String)
345+
* @see org.spdx.storage.IModelStore#getCaseSensitiveId(java.lang.String, java.lang.String)
346346
*/
347347
@Override
348-
public Optional<String> getCaseSensisitiveId(String nameSpace,
349-
String caseInsensisitiveId) {
350-
return baseStore.getCaseSensisitiveId(nameSpace, caseInsensisitiveId);
348+
public Optional<String> getCaseSensitiveId(String nameSpace,
349+
String caseInsensitiveId) {
350+
return baseStore.getCaseSensitiveId(nameSpace, caseInsensitiveId);
351351
}
352352

353353
/* (non-Javadoc)

src/main/java/org/spdx/storage/simple/ExtendedSpdxStore.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ public boolean isAnon(String objectUri) {
229229
}
230230

231231
/* (non-Javadoc)
232-
* @see org.spdx.storage.IModelStore#getCaseSensisitiveId(java.lang.String, java.lang.String)
232+
* @see org.spdx.storage.IModelStore#getCaseSensitiveId(java.lang.String, java.lang.String)
233233
*/
234234
@Override
235-
public Optional<String> getCaseSensisitiveId(String documentUri, String caseInsensisitiveId) {
236-
return baseStore.getCaseSensisitiveId(documentUri, caseInsensisitiveId);
235+
public Optional<String> getCaseSensitiveId(String documentUri, String caseInsensitiveId) {
236+
return baseStore.getCaseSensitiveId(documentUri, caseInsensitiveId);
237237
}
238238

239239
/* (non-Javadoc)

src/main/java/org/spdx/utility/license/LicenseExpressionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ private static org.spdx.library.model.v2.license.AnyLicenseInfo parseSimpleLicen
573573
licenseId.get(), SpdxConstantsCompatV2.CLASS_SPDX_LISTED_LICENSE, copyManager, true);
574574
} else {
575575
// LicenseRef
576-
Optional<String> caseSensitiveId = store.getCaseSensisitiveId(documentUri, token);
576+
Optional<String> caseSensitiveId = store.getCaseSensitiveId(documentUri, token);
577577
ExtractedLicenseInfo localLicense;
578578
if (caseSensitiveId.isPresent()) {
579579
localLicense = new ExtractedLicenseInfo(store, documentUri, caseSensitiveId.get(), copyManager, false);

src/test/java/org/spdx/storage/simple/InMemSpdxStoreTest.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,8 @@ public void testIdType() throws Exception {
581581
}
582582
}
583583

584-
public void testGetCaseSensisitiveId() throws Exception {
584+
@SuppressWarnings("deprecation")
585+
public void testGetCaseSensisitiveId() throws Exception {
585586
try (InMemSpdxStore store = new InMemSpdxStore()) {
586587
String expected = "TestIdOne";
587588
String lower = expected.toLowerCase();
@@ -596,6 +597,22 @@ public void testGetCaseSensisitiveId() throws Exception {
596597
}
597598
}
598599
}
600+
601+
public void testGetCaseSensitiveId() throws Exception {
602+
try (InMemSpdxStore store = new InMemSpdxStore()) {
603+
String expected = "TestIdOne";
604+
String lower = expected.toLowerCase();
605+
store.create(new TypedValue(TEST_NAMESPACE1 + "#" + expected, SpdxConstantsCompatV2.CLASS_ANNOTATION, "SPDX-2.3"));
606+
assertEquals(expected, store.getCaseSensitiveId(TEST_NAMESPACE1, lower).get());
607+
assertFalse(store.getCaseSensitiveId(TEST_NAMESPACE1, "somethingNotThere").isPresent());
608+
try {
609+
store.create(new TypedValue(TEST_NAMESPACE1 + "#" + lower, SpdxConstantsCompatV2.CLASS_ANNOTATION, "SPDX-2.3"));
610+
fail("This should be a duplicate ID failure");
611+
} catch (InvalidSPDXAnalysisException e) {
612+
// expected
613+
}
614+
}
615+
}
599616

600617
public void testGetTypedValue() throws Exception {
601618
try (InMemSpdxStore store = new InMemSpdxStore()) {

0 commit comments

Comments
 (0)