Merge pull request #143 from spdx/issue142

Don't store filesAnalyzed if not present

Author: goneall

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

@@ -787,7 +787,7 @@ public boolean equivalent(ModelObject compare, boolean ignoreRelatedElements) th
 			    Optional<Object> propertyValueOptional = this.getObjectPropertyValue(propertyName);
 				if (propertyValueOptional.isPresent()) {
 					Object propertyValue = propertyValueOptional.get();
-					if (isEquivalentToNull(propertyValue)) {
+					if (isEquivalentToNull(propertyValue, propertyName)) {
 						continue;
 					}
 					lastNotEquivalentReason = new NotEquivalentReason(
@@ -805,7 +805,7 @@ public boolean equivalent(ModelObject compare, boolean ignoreRelatedElements) th
 				continue;
 			}
 			Object comparePropertyValue = comparePropertyValueOptional.get();
-			if (isEquivalentToNull(comparePropertyValue)) {
+			if (isEquivalentToNull(comparePropertyValue, propertyName)) {
 				continue;
 			}
 			lastNotEquivalentReason = new NotEquivalentReason(
@@ -816,12 +816,16 @@ public boolean equivalent(ModelObject compare, boolean ignoreRelatedElements) th
 	}
 
 	// Some values are treated like null in comparisons - in particular empty model collections and 
-	// "no assertion" values.
-	private boolean isEquivalentToNull(Object propertyValue) {
+	// "no assertion" values and a filesAnalyzed filed with a value of true
+	private boolean isEquivalentToNull(Object propertyValue, String propertyName) {
 		if (propertyValue instanceof ModelCollection) {
 			return ((ModelCollection<?>) propertyValue).size() == 0;
+		} else if (isNoAssertion(propertyValue)) {
+			return true;
+		} else if (SpdxConstants.PROP_PACKAGE_FILES_ANALYZED.equals(propertyName)) {
+			return propertyValue instanceof Boolean && (Boolean)(propertyValue);
 		} else {
-			return isNoAssertion(propertyValue);
+			return false;
 		}
 	}
 

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

@@ -57,9 +57,6 @@ public class SpdxPackage extends SpdxItem implements Comparable<SpdxPackage> {
 	public SpdxPackage() throws InvalidSPDXAnalysisException {
 		super();
 		files = new RelatedElementCollection(this, RelationshipType.CONTAINS, SpdxConstants.CLASS_SPDX_FILE);
-		if (!getBooleanPropertyValue(SpdxConstants.PROP_PACKAGE_FILES_ANALYZED).isPresent()) {
-			this.setFilesAnalyzed(true);	// Set default value
-		}
 	}
 
 	/**
@@ -75,9 +72,6 @@ public SpdxPackage(IModelStore modelStore, String documentUri, String id,
 			throws InvalidSPDXAnalysisException {
 		super(modelStore, documentUri, id, copyManager, create);
 		files = new RelatedElementCollection(this, RelationshipType.CONTAINS, SpdxConstants.CLASS_SPDX_FILE);
-		if (!getBooleanPropertyValue(SpdxConstants.PROP_PACKAGE_FILES_ANALYZED).isPresent()) {
-			this.setFilesAnalyzed(true);	// Set default value
-		}
 	}
 
 	/**
@@ -87,9 +81,6 @@ public SpdxPackage(IModelStore modelStore, String documentUri, String id,
 	public SpdxPackage(String id) throws InvalidSPDXAnalysisException {
 		super(id);
 		files = new RelatedElementCollection(this, RelationshipType.CONTAINS, SpdxConstants.CLASS_SPDX_FILE);
-		if (!getBooleanPropertyValue(SpdxConstants.PROP_PACKAGE_FILES_ANALYZED).isPresent()) {
-			this.setFilesAnalyzed(true);	// Set default value
-		}
 	}
 
 	protected SpdxPackage(SpdxPackageBuilder spdxPackageBuilder) throws InvalidSPDXAnalysisException {