Fix spelling

Author: dwalluck

src/main/java/org/spdx/library/SpdxModelFactory.java

@@ -217,7 +217,7 @@ public static Stream<?> getSpdxObjects(IModelStore store, @Nullable IModelCopyMa
 			@Nullable String typeFilter, @Nullable String objectUriPrefixFilter, @Nullable String idPrefix) throws InvalidSPDXAnalysisException {
 		Objects.requireNonNull(store, "Store must not be null");
 		return store.getAllItems(objectUriPrefixFilter, typeFilter).map(tv -> {
-			//TODO: Change this a null namespace and filtering on anonomous or startswith document URI - this will catch the anon. types
+			//TODO: Change this a null namespace and filtering on anonymous or startswith document URI - this will catch the anon. types
 			try {
 				return inflateModelObject(store, tv.getObjectUri(), tv.getType(), copyManager, tv.getSpecVersion(), false, idPrefix);
 			} catch (InvalidSPDXAnalysisException e) {

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

@@ -101,7 +101,7 @@ public List<PropertyDescriptor> getPropertyValueDescriptors() {
 	 * @param value Value to set
 	 * @throws InvalidSpdxPropertyException on SPDX parsing errors
 	 */
-	public void setPrimativeValue(PropertyDescriptor propertyDescriptor, Object value) throws InvalidSpdxPropertyException {
+	public void setPrimitiveValue(PropertyDescriptor propertyDescriptor, Object value) throws InvalidSpdxPropertyException {
 		switch (propertyDescriptor.getName()) {
 			case "match": if (!(value instanceof String)) {
 					throw new InvalidSpdxPropertyException("Expected string type for "+propertyDescriptor);

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

@@ -150,7 +150,7 @@ public void setTypedProperty(String propertyName, String valueId, String type) t
 	 * @param value value to set
 	 * @throws InvalidSpdxPropertyException on invalid property
 	 */
-	public void setPrimativeValue(PropertyDescriptor propertyDescriptor, Object value) throws InvalidSpdxPropertyException {
+	public void setPrimitiveValue(PropertyDescriptor propertyDescriptor, Object value) throws InvalidSpdxPropertyException {
 		String propertyName = PROPERTY_DESCRIPTOR_TO_VALUE_NAME.get(propertyDescriptor);
 		if (Objects.isNull(propertyName)) {
 			throw new InvalidSpdxPropertyException("Invalid property for SPDX listed exception:"+propertyDescriptor.getName());

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

@@ -140,7 +140,7 @@ public void setTypedProperty(String propertyName, String valueId, String type) t
 		throw new InvalidSpdxPropertyException("Invalid type for Listed License SPDX Property: "+type);
 	}
 
-	public void setPrimativeValue(PropertyDescriptor propertyDescriptor, Object value) throws InvalidSpdxPropertyException {
+	public void setPrimitiveValue(PropertyDescriptor propertyDescriptor, Object value) throws InvalidSpdxPropertyException {
 		String propertyName = PROPERTY_DESCRIPTOR_TO_VALUE_NAME.get(propertyDescriptor);
 		if (Objects.isNull(propertyName)) {
 			throw new InvalidSpdxPropertyException("Invalid property for SPDX listed license:"+propertyDescriptor.getName());

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

@@ -489,12 +489,12 @@ public void setValue(String objectUri, PropertyDescriptor propertyDescriptor, Ob
 		}
 		if (isLicenseId) {
 			LicenseJson license = fetchLicenseJson(id);
-			license.setPrimativeValue(propertyDescriptor, value);
+			license.setPrimitiveValue(propertyDescriptor, value);
 		} else if (isExceptionId) {
 			ExceptionJson exc = fetchExceptionJson(id);
-			exc.setPrimativeValue(propertyDescriptor, value);
+			exc.setPrimitiveValue(propertyDescriptor, value);
 		} else if (Objects.nonNull(crossRef)) {
-			crossRef.setPrimativeValue(propertyDescriptor, value);
+			crossRef.setPrimitiveValue(propertyDescriptor, value);
 		} else {
             logger.error("ID {} is not a listed license ID, crossRef ID nor a listed exception ID", id);
 			throw new SpdxIdNotFoundException("ID "+id+" is not a listed license ID, crossRef ID nor a listed exception ID");

src/main/java/org/spdx/utility/compare/SpdxComparer.java

@@ -95,7 +95,7 @@ public class SpdxComparer {
 	 */
 	private final Map<SpdxDocument, Map<SpdxDocument, List<ExtractedLicenseInfo>>> uniqueExtractedLicenses = new HashMap<>();
 	/**
-	 * Map of any SPDX documents that have extraced license infos with equivalent text but different comments, objectUri's or other fields
+	 * Map of any SPDX documents that have extracted license infos with equivalent text but different comments, objectUri's or other fields
 	 */
 	private final Map<SpdxDocument, Map<SpdxDocument, List<SpdxLicenseDifference>>> licenseDifferences = new HashMap<>();
 	/**
@@ -359,7 +359,7 @@ private void compareExternalDocumentRefs() throws InvalidSPDXAnalysisException {
 				this.uniqueExternalDocumentRefs.put(spdxDocs.get(i), uniqueAMap);
 			}
 		}
-		if (!this._isExternalDcoumentRefsEqualsNoCheck()) {
+		if (!this._isExternalDocumentRefsEqualsNoCheck()) {
 			this.differenceFound = true;
 		}	
 	}
@@ -579,7 +579,7 @@ static List<SpdxFileDifference> findFileDifferences(SpdxDocument docA, SpdxDocum
 	 * same if they have the same package name and the same package version.
 	 * NOTE: The arrays must be sorted by file name
 	 * @param pkgsA source packages
-	 * @param pkgsB packages to compaer
+	 * @param pkgsB packages to compare
 	 * @return any packages in A that are not in B
 	 */
 	static List<SpdxPackage> findUniquePackages(List<SpdxPackage> pkgsA, List<SpdxPackage> pkgsB) {
@@ -786,7 +786,7 @@ private void comparePackages() throws SpdxCompareException {
 
 	/**
 	 * add all the document packages to the multi-comparer
-	 * @param spdxDocument document containing the packges
+	 * @param spdxDocument document containing the packages
 	 * @param pkgs package to add
 	 * @param extractedLicenseIdMap map of documents to extracted licenses and ids
 	 * @throws SpdxCompareException on compare errors
@@ -823,8 +823,8 @@ private void addPackageComparers(SpdxDocument spdxDocument,
 
 	/**
 	 * Compares two licenses from two different SPDX documents taking into account
-	 * the extracted license infos who's ID's may be different between the two documents
-	 * Note: The ExtracedLicenseIDMap must be initialized before this method is invoked
+	 * the extracted license infos whose ID's may be different between the two documents
+	 * Note: The ExtractedLicenseIDMap must be initialized before this method is invoked
 	 * @param doc1 Index of the SPDX document for license1
 	 * @param license1 license to compare
 	 * @param doc2 Index of the SPDX document for license2
@@ -882,7 +882,7 @@ static boolean compareVerificationCodes(
 	private void compareDocumentFields() throws SpdxCompareException {
 		compareDataLicense();
 		compareDocumentComments();
-		compareSpdxVerions();
+		compareSpdxVersions();
 		compareDocumentContents();
 		if (!this.dataLicenseEqual || !this.spdxVersionsEqual || !this.documentCommentsEqual) {
 			this.differenceFound = true;
@@ -912,7 +912,7 @@ private void compareDocumentContents() throws SpdxCompareException {
 	 * @throws SpdxCompareException on compare errors
 	 * 
 	 */
-	private void compareSpdxVerions() throws SpdxCompareException {
+	private void compareSpdxVersions() throws SpdxCompareException {
 		try {
 			String docVer1;
 			docVer1 = spdxDocs.get(0).getSpecVersion();
@@ -1377,7 +1377,7 @@ private void checkInProgress() throws SpdxCompareException {
 	}
 
 	/**
-	 * Validates that the spdx dcouments field has been initialized
+	 * Validates that the spdx documents field has been initialized
 	 * @throws SpdxCompareException on compare errors
 	 */
 	private void checkDocsField() throws SpdxCompareException {
@@ -1440,7 +1440,7 @@ public boolean isDocumentCommentsEqual() throws SpdxCompareException {
 		return this.documentCommentsEqual;
 	}
 
-	private boolean _isExternalDcoumentRefsEqualsNoCheck() {
+	private boolean _isExternalDocumentRefsEqualsNoCheck() {
         for (Entry<SpdxDocument, Map<SpdxDocument, List<ExternalDocumentRef>>> spdxDocumentMapEntry : this.uniqueExternalDocumentRefs.entrySet()) {
             for (List<ExternalDocumentRef> externalDocumentRefs : spdxDocumentMapEntry.getValue().values()) {
                 if (!externalDocumentRefs.isEmpty()) {
@@ -1456,10 +1456,10 @@ private boolean _isExternalDcoumentRefsEqualsNoCheck() {
 	 * @return true if the external document refs are equal
 	 * @throws SpdxCompareException on compare errors
 	 */
-	public boolean isExternalDcoumentRefsEquals() throws SpdxCompareException {
+	public boolean isExternalDocumentRefsEquals() throws SpdxCompareException {
 		checkInProgress();
 		checkDocsField();
-		return _isExternalDcoumentRefsEqualsNoCheck();
+		return _isExternalDocumentRefsEqualsNoCheck();
 	}
 
 	/**
@@ -1476,7 +1476,7 @@ public boolean isExtractedLicensingInfosEqual() throws SpdxCompareException {
 	 * @return true if the extracted licensing infos are equal
 	 */
 	private boolean _isExtractedLicensingInfoEqualsNoCheck() {
-		// check for unique extraced license infos
+		// check for unique extracted license infos
         for (Entry<SpdxDocument, Map<SpdxDocument, List<ExtractedLicenseInfo>>> entry : this.uniqueExtractedLicenses.entrySet()) {
             for (Entry<SpdxDocument, List<ExtractedLicenseInfo>> spdxDocumentListEntry : entry.getValue().entrySet()) {
                 List<ExtractedLicenseInfo> licenses = spdxDocumentListEntry.getValue();
@@ -1498,7 +1498,7 @@ private boolean _isExtractedLicensingInfoEqualsNoCheck() {
 	}
 
 	/**
-	 * Retrieves any unique extracted licenses fromt the first SPDX document index
+	 * Retrieves any unique extracted licenses from the first SPDX document index
 	 * relative to the second - unique is determined by the license text matching
 	 * @param docIndexA source document index
 	 * @param docIndexB index of the compare document
@@ -1605,7 +1605,7 @@ public List<String> getUniqueCreators(int doc1index, int doc2index) throws SpdxC
 	 * @return true if the files are equal
 	 * @throws SpdxCompareException on compare errors
 	 */
-	public boolean isfilesEquals() throws SpdxCompareException {
+	public boolean isFilesEquals() throws SpdxCompareException {
 		this.checkDocsField();
 		this.checkInProgress();
 		return this._isFilesEqualsNoCheck();
@@ -1870,7 +1870,7 @@ public int getNumSpdxDocs() {
 	}
 
 	/**
-	 * @return true if the licens list version is equal
+	 * @return true if the license list version is equal
 	 * @throws SpdxCompareException On error in comparison
 	 */
 	public boolean isLicenseListVersionEqual() throws SpdxCompareException {
@@ -1914,7 +1914,7 @@ public static List<Checksum> findUniqueChecksums(Collection<Checksum> checksumsA
 	/**
 	 * Find any SPDX annotations which are in annotationsA but not in annotationsB
 	 * @param annotationsA source annotations
-	 * @param annotationsB annotations to be compared agains
+	 * @param annotationsB annotations to be compared against
 	 * @return list of unique annotations in annotationsB
 	 * @throws InvalidSPDXAnalysisException On SPDX parsing errors
 	 */

src/main/java/org/spdx/utility/compare/SpdxItemComparer.java

@@ -340,9 +340,9 @@ public boolean isCopyrightsEquals() throws SpdxCompareException {
 	}
 
 	/**
-	 * @return the licenseCommmentsEquals
+	 * @return the licenseCommentsEquals
 	 */
-	public boolean isLicenseCommmentsEquals() throws SpdxCompareException {
+	public boolean isLicenseCommentsEquals() throws SpdxCompareException {
 		checkInProgress();
 		checkCompareMade();
 		return licenseCommentsEquals;

src/test/java/org/spdx/library/ListedLicensesTest.java

@@ -12,7 +12,7 @@
 
 import junit.framework.TestCase;
 
-/**
+/*
  * Copyright (c) 2019 Source Auditor Inc.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -116,7 +116,7 @@ public void testGetListedExceptionByIdReturnsNull() throws InvalidSPDXAnalysisEx
 		assertNull(result);
 	}
 
-	public void testGetExceptionbyIdLocal() throws InvalidSPDXAnalysisException {
+	public void testGetExceptionByIdLocal() throws InvalidSPDXAnalysisException {
 		System.setProperty("SPDXParser.OnlyUseLocalLicenses", "true");
 		ListedLicenses.resetListedLicenses();
 		try {

src/test/java/org/spdx/library/ModelSpecConverterTest.java

@@ -17,8 +17,6 @@
  */
 package org.spdx.library;
 
-import static org.junit.Assert.*;
-
 import java.util.Arrays;
 import java.util.HashSet;