more lyft fixes

Make an inner class static in ModelObject
Fix a possible timing window in the ListedLicenseModelStore

Signed-off-by: Gary O'Neall <[email protected]>

Author: goneall

src/main/java/org/spdx/library/model/ModelObject.java

@@ -111,7 +111,7 @@ public abstract class ModelObject {
 	// the following fields are for debugging when equivalent returns false
 	enum NotEquivalent {
 		DIFFERENT_CLASS, MISSING_PROPERTY, PROPERTY_NOT_EQUIVALENT, COMPARE_PROPERTY_MISSING};
-	class NotEquivalentReason {
+	static class NotEquivalentReason {
 		NotEquivalent reason;
 		String property = null;
 
@@ -782,7 +782,7 @@ public boolean equivalent(ModelObject compare, boolean ignoreRelatedElements) th
 			    Optional<Object> propertyValue = this.getObjectPropertyValue(propertyName);
 				if (propertyValue.isPresent()) {
 					if (propertyValue.get() instanceof ModelCollection) {
-						if (((ModelCollection<?>)(propertyValue.get())).size() > 0) {
+						if (((ModelCollection<?>)propertyValue.get()).size() > 0) {
 							lastNotEquivalentReason = new NotEquivalentReason(
 									NotEquivalent.COMPARE_PROPERTY_MISSING, propertyName);
 							return false;

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

@@ -833,14 +833,19 @@ public boolean isSpdxListedExceptionId(String listedLicenseDocumentUri, String e
 
 	@Override
 	public Optional<TypedValue> getTypedValue(String documentUri, String id) throws InvalidSPDXAnalysisException {
-		if (isSpdxListedLicenseId(documentUri, id)) {
-			return Optional.of(new TypedValue(id, SpdxConstants.CLASS_SPDX_LISTED_LICENSE));
-		} else if (isSpdxListedExceptionId(documentUri, id)) {
-			return Optional.of(new TypedValue(id, SpdxConstants.CLASS_SPDX_LICENSE_EXCEPTION));
-		} else if (crossRefs.containsKey(id)) {
-			return Optional.of(new TypedValue(id, SpdxConstants.CLASS_CROSS_REF));
-		} else {
-			return Optional.empty();
+		listedLicenseModificationLock.readLock().lock();
+		try {
+			if (licenseIds.containsKey(id.toLowerCase())) {
+				return Optional.of(new TypedValue(id, SpdxConstants.CLASS_SPDX_LISTED_LICENSE));
+			} else if (exceptionIds.containsKey(id.toLowerCase())) {
+				return Optional.of(new TypedValue(id, SpdxConstants.CLASS_SPDX_LICENSE_EXCEPTION));
+			} else if (crossRefs.containsKey(id)) {
+				return Optional.of(new TypedValue(id, SpdxConstants.CLASS_CROSS_REF));
+			} else {
+				return Optional.empty();
+			}
+		} finally {
+			listedLicenseModificationLock.readLock().unlock();
 		}
 	}