Code comment fixes

wimvelzeboer · wimvelzeboer · commit 5220da622df7 · 2022-04-07T22:18:16.000+01:00
diff --git a/sfdx-source/apex-common/main/classes/fflib_SObjects.cls b/sfdx-source/apex-common/main/classes/fflib_SObjects.cls
@@ -90,40 +90,40 @@ public virtual class fflib_SObjects
 	/**
 	 * Adds an error message to the a field records in the domain
 	 *
-	 * @param sObjectField The field where the error should be reported
+	 * @param field The field where the error should be reported
 	 * @param message The error message to add to the given field on each record
 	 */
 	@TestVisible
-	protected virtual void addError(Schema.SObjectField sObjectField, String message)
+	protected virtual void addError(Schema.SObjectField field, String message)
 	{
 		for (SObject record : getRecords())
 		{
-			record.addError(sObjectField, error(message, record, sObjectField));
+			record.addError(field, error(message, record, field));
 		}
 	}
 
 	/**
 	 * Clear the field value on all the records of the domain
-	 * @param sObjectField The field to nullify
+	 * @param field The field to nullify
 	 */
 	@TestVisible
-	protected virtual void clearField(Schema.SObjectField sObjectField)
+	protected virtual void clearField(Schema.SObjectField field)
 	{
-		clearFields(new Set<Schema.SObjectField>{ sObjectField });
+		clearFields(new Set<Schema.SObjectField>{ field });
 	}
 
 	/**
 	 * Clear the field values on all the records of the domain
-	 * @param sObjectFields The fields to nullify
+	 * @param fields The fields to nullify
 	 */
 	@TestVisible
-	protected virtual void clearFields(Set<Schema.SObjectField> sObjectFields)
+	protected virtual void clearFields(Set<Schema.SObjectField> fields)
 	{
 		for (SObject record : getRecords())
 		{
-			for (SObjectField sObjectField : sObjectFields)
+			for (SObjectField field : fields)
 			{
-				record.put(sObjectField, null);
+				record.put(field, null);
 			}
 		}
 	}
@@ -156,76 +156,76 @@ public virtual class fflib_SObjects
 	}
 
 	/**
-	 * @param sObjectField The SObjectField reference of the type Id
+	 * @param field The SObjectField reference of the type Id
 	 *
 	 * @return Return a set with all the Id values of the given field
 	 */
 	@TestVisible
-	protected Set<Id> getIdFieldValues(Schema.SObjectField sObjectField)
+	protected Set<Id> getIdFieldValues(Schema.SObjectField field)
 	{
 		Set<Id> result = new Set<Id>();
 		for (SObject record : getRecords())
 		{
-			result.add((Id) record.get(sObjectField));
+			result.add((Id) record.get(field));
 		}
 		return result;
 	}
 
 	/**
-	 * @param sObjectField The SObjectField reference of the type String
+	 * @param field The SObjectField reference of the type String
 	 *
 	 * @return Return a set with all the String values of the given field
 	 */
 	@TestVisible
-	protected Set<String> getStringFieldValues(Schema.SObjectField sObjectField)
+	protected Set<String> getStringFieldValues(Schema.SObjectField field)
 	{
 		Set<String> result = new Set<String>();
 		for (SObject record : getRecords())
 		{
-			result.add((String) record.get(sObjectField));
+			result.add((String) record.get(field));
 		}
 		return result;
 	}
 
 	/**
-	 * @param sObjectField The SObjectField reference
+	 * @param field The SObjectField reference
 	 *
 	 * @return Return a set with all the values of the given field
 	 */
 	@TestVisible
-	protected virtual Set<Object> getFieldValues(Schema.SObjectField sObjectField)
+	protected virtual Set<Object> getFieldValues(Schema.SObjectField field)
 	{
 		Set<Object> result = new Set<Object>();
 		for (SObject record : getRecords())
 		{
-			result.add(record.get(sObjectField));
+			result.add(record.get(field));
 		}
 		return result;
 	}
 
 	/**
-	 * @param sObjectField The Schema.SObjectField to compare against the given value
-	 * @param value The given value of the records sObjectField to include in the return
+	 * @param field The Schema.SObjectField to compare against the given value
+	 * @param value The given value of the records field to include in the return
 	 *
-	 * @return A list with only the SObjects where the given sObjectField has the provided value
+	 * @return A list with only the SObjects where the given field has the provided value
 	 */
-	protected virtual List<SObject> getRecordsByFieldValue(Schema.SObjectField sObjectField, Object value)
+	protected virtual List<SObject> getRecordsByFieldValue(Schema.SObjectField field, Object value)
 	{
-		return getRecordsByFieldValues(sObjectField, new Set<Object>{value});
+		return getRecordsByFieldValues(field, new Set<Object>{value});
 	}
 
 	/**
-	 * @param sObjectField The Schema.SObjectField to compare against the given value
-	 * @param values The given values of the records sObjectField to include in the return
+	 * @param field The Schema.SObjectField to compare against the given value
+	 * @param values The given values of the records field to include in the return
 	 *
-	 * @return A list with only the SObjects where the given sObjectField value is part of the provided values
+	 * @return A list with only the SObjects where the given field value is part of the provided values
 	 */
-	protected virtual List<SObject> getRecordsByFieldValues(Schema.SObjectField sObjectField, Set<Object> values)
+	protected virtual List<SObject> getRecordsByFieldValues(Schema.SObjectField field, Set<Object> values)
 	{
 		List<SObject> result = new List<SObject>();
 		for (SObject record : getRecords())
 		{
-			if (values?.contains(record.get(sObjectField)))
+			if (values?.contains(record.get(field)))
 			{
 				result.add(record);
 			}
@@ -234,30 +234,30 @@ public virtual class fflib_SObjects
 	}
 
 	/**
-	 * @param sObjectField The Schema.SObjectField to check its value for a Blank value
+	 * @param field The Schema.SObjectField to check its value for a Blank value
 	 *
-	 * @return A list with only the SObjects where the given sObjectField value is either null or '')
+	 * @return A list with only the SObjects where the given field value is either null or '')
 	 */
-	protected virtual List<SObject> getRecordsWithBlankFieldValues(Schema.SObjectField sObjectField)
+	protected virtual List<SObject> getRecordsWithBlankFieldValues(Schema.SObjectField field)
 	{
 		return getRecordsWithBlankFieldValues(
-				new Set<Schema.SObjectField> {sObjectField}
+				new Set<Schema.SObjectField> {field}
 		);
 	}
 
 	/**
-	 * @param sObjectFields The Schema.SObjectFields to check their value for a Blank value
+	 * @param fields The Schema.SObjectFields to check their value for a Blank value
 	 *
-	 * @return A list with only the SObjects where the at least one given sObjectField value is either null or '')
+	 * @return A list with only the SObjects where the at least one given field value is either null or '')
 	 */
-	protected virtual List<SObject> getRecordsWithBlankFieldValues(Set<Schema.SObjectField> sObjectFields)
+	protected virtual List<SObject> getRecordsWithBlankFieldValues(Set<Schema.SObjectField> fields)
 	{
 		List<SObject> result = new List<SObject>();
 		for (SObject record : getRecords())
 		{
-			for (SObjectField sObjectField : sObjectFields)
+			for (SObjectField field : fields)
 			{
-				if (String.isNotBlank((String) record.get(sObjectField))) continue;
+				if (String.isNotBlank((String) record.get(field))) continue;
 
 				result.add(record);
 				break;
@@ -267,19 +267,19 @@ public virtual class fflib_SObjects
 	}
 
 	/**
-	 * @param sObjectFields The Schema.SObjectFields to check their value for a Blank value
+	 * @param fields The Schema.SObjectFields to check their value for a Blank value
 	 *
-	 * @return A list with only the SObjects where all given sObjectField values are either null or ''
+	 * @return A list with only the SObjects where all given field values are either null or ''
 	 */
-	protected virtual List<SObject> getRecordsWithAllBlankFieldValues(Set<Schema.SObjectField> sObjectFields)
+	protected virtual List<SObject> getRecordsWithAllBlankFieldValues(Set<Schema.SObjectField> fields)
 	{
 		List<SObject> result = new List<SObject>();
 		for (SObject record : getRecords())
 		{
 			Boolean allBlank = true;
-			for (SObjectField sObjectField : sObjectFields)
+			for (SObjectField field : fields)
 			{
-				if (String.isNotBlank((String) record.get(sObjectField)))
+				if (String.isNotBlank((String) record.get(field)))
 				{
 					allBlank = false;
 					break;
@@ -291,30 +291,30 @@ public virtual class fflib_SObjects
 	}
 
 	/**
-	 * @param sObjectField The Schema.SObjectField to check its value for a Non-Blank value
+	 * @param field The Schema.SObjectField to check its value for a Non-Blank value
 	 *
-	 * @return A list with only the SObjects where the given sObjectField value is not null or ''
+	 * @return A list with only the SObjects where the given field value is not null or ''
 	 */
-	protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Schema.SObjectField sObjectField)
+	protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Schema.SObjectField field)
 	{
 		return getRecordsWithNotBlankFieldValues(
-				new Set<Schema.SObjectField> {sObjectField}
+				new Set<Schema.SObjectField> {field}
 		);
 	}
 
 	/**
-	 * @param sObjectFields The Schema.SObjectFields to check their value for a Non-Blank value
+	 * @param fields The Schema.SObjectFields to check their value for a Non-Blank value
 	 *
-	 * @return A list with only the SObjects where the at least one given sObjectField value not null or ''
+	 * @return A list with only the SObjects where the at least one given field value not null or ''
 	 */
-	protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Set<Schema.SObjectField> sObjectFields)
+	protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Set<Schema.SObjectField> fields)
 	{
 		List<SObject> result = new List<SObject>();
 		for (SObject record : getRecords())
 		{
-			for (SObjectField sObjectField : sObjectFields)
+			for (SObjectField field : fields)
 			{
-				if (String.isNotBlank((String) record.get(sObjectField)))
+				if (String.isNotBlank((String) record.get(field)))
 				{
 					result.add(record);
 					break;
@@ -325,19 +325,19 @@ public virtual class fflib_SObjects
 	}
 
 	/**
-	 * @param sObjectFields The Schema.SObjectFields to check their value for a Non-Blank value
+	 * @param fields The Schema.SObjectFields to check their value for a Non-Blank value
 	 *
-	 * @return A list with only the SObjects where all given sObjectField values are not null or ''
+	 * @return A list with only the SObjects where all given field values are not null or ''
 	 */
-	protected virtual List<SObject> getRecordsWithAllNotBlankFieldValues(Set<Schema.SObjectField> sObjectFields)
+	protected virtual List<SObject> getRecordsWithAllNotBlankFieldValues(Set<Schema.SObjectField> fields)
 	{
 		List<SObject> result = new List<SObject>();
 		for (SObject record : getRecords())
 		{
 			Boolean allNonBlank = true;
-			for (SObjectField sObjectField : sObjectFields)
+			for (SObjectField field : fields)
 			{
-				if (String.isBlank((String) record.get(sObjectField)))
+				if (String.isBlank((String) record.get(field)))
 				{
 					allNonBlank = false;
 					break;
@@ -351,33 +351,33 @@ public virtual class fflib_SObjects
 	/**
 	 * Modifies a value of a field for all records in the domain
 	 *
-	 * @param sObjectField The reference to the SObjectField to be modified
+	 * @param field The reference to the SObjectField to be modified
 	 * @param value The value to store in the given SObjectField
 	 */
-	protected virtual void setFieldValue(Schema.SObjectField sObjectField, Object value)
+	protected virtual void setFieldValue(Schema.SObjectField field, Object value)
 	{
 		for (SObject record : getRecords())
 		{
-			record.put(sObjectField, value);
+			record.put(field, value);
 		}
 	}
 
 	/**
-	 * @param sObjectFieldToCheck The SObjectField to match the key against in the provided map
-	 * @param sObjectFieldToUpdate The SObjectField to store the mapped value when the key matches the value in the sObjectFieldToUpdate field
-	 * @param values Map of values to store by the sObjectFieldToCheck fields value
+	 * @param fieldToCheck The SObjectField to match the key against in the provided map
+	 * @param fieldToUpdate The SObjectField to store the mapped value when the key matches the value in the fieldToUpdate field
+	 * @param values Map of values to store by the fieldToCheck fields value
 	 */
 	protected virtual void setFieldValueByMap(
-			Schema.SObjectField sObjectFieldToCheck,
-			Schema.SObjectField sObjectFieldToUpdate,
+			Schema.SObjectField fieldToCheck,
+			Schema.SObjectField fieldToUpdate,
 			Map<Object, Object> values)
 	{
 		for (SObject record : getRecords())
 		{
-			Object keyValue = record.get(sObjectFieldToCheck);
+			Object keyValue = record.get(fieldToCheck);
 			if (values?.containsKey(keyValue))
 			{
-				record.put(sObjectFieldToUpdate, values.get(keyValue));
+				record.put(fieldToUpdate, values.get(keyValue));
 			}
 		}
 	}
diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls
@@ -77,12 +77,12 @@ private class fflib_SObjectsTest
 
 		Set<Id> recordIds = new Set<Id> {idA, idB, idC};
 		System.assert(
-				domain.getRecordIds().containsAll(recordIds),
+				domain.getRecordIds().equals(recordIds),
 				'The domain should return all the record Ids'
 		);
 
 		System.assert(
-				domain.getIdFieldValues(Schema.Account.Id).containsAll(recordIds),
+				domain.getIdFieldValues(Schema.Account.Id).equals(recordIds),
 				'The domain should return all the record Ids'
 		);
 	}
@@ -132,28 +132,22 @@ private class fflib_SObjectsTest
 	{
 		DomainAccounts domain = generateDomain();
 
+		final Set<String> expected = new Set<String>
+		{
+				null,
+				'',
+				'Canada',
+				'Ireland',
+				'UK',
+				'USA'
+		};
 		System.assert(
-				domain.getStringFieldValues(Schema.Account.ShippingCountry)
-						.containsAll(
-						new Set<String>{
-								'USA',
-								'Ireland',
-								'UK',
-								''
-						}
-				)
+				domain.getStringFieldValues(Schema.Account.ShippingCountry).equals(expected)
 		);
 
 		System.assert(
 				domain.getFieldValues(Schema.Account.ShippingCountry)
-						.containsAll(
-						new Set<Object>{
-								'USA',
-								'Ireland',
-								'UK',
-								''
-						}
-				)
+						.equals(expected)
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -90,40 +90,40 @@ public virtual class fflib_SObjects`
`90`	`90`	`/**`
`91`	`91`	`* Adds an error message to the a field records in the domain`
`92`	`92`	`*`
`93`		`- * @param sObjectField The field where the error should be reported`
	`93`	`+ * @param field The field where the error should be reported`
`94`	`94`	`* @param message The error message to add to the given field on each record`
`95`	`95`	`*/`
`96`	`96`	`@TestVisible`
`97`		`- protected virtual void addError(Schema.SObjectField sObjectField, String message)`
	`97`	`+ protected virtual void addError(Schema.SObjectField field, String message)`
`98`	`98`	`{`
`99`	`99`	`for (SObject record : getRecords())`
`100`	`100`	`{`
`101`		`- record.addError(sObjectField, error(message, record, sObjectField));`
	`101`	`+ record.addError(field, error(message, record, field));`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
`106`	`106`	`* Clear the field value on all the records of the domain`
`107`		`- * @param sObjectField The field to nullify`
	`107`	`+ * @param field The field to nullify`
`108`	`108`	`*/`
`109`	`109`	`@TestVisible`
`110`		`- protected virtual void clearField(Schema.SObjectField sObjectField)`
	`110`	`+ protected virtual void clearField(Schema.SObjectField field)`
`111`	`111`	`{`
`112`		`- clearFields(new Set<Schema.SObjectField>{ sObjectField });`
	`112`	`+ clearFields(new Set<Schema.SObjectField>{ field });`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`116`	`116`	`* Clear the field values on all the records of the domain`
`117`		`- * @param sObjectFields The fields to nullify`
	`117`	`+ * @param fields The fields to nullify`
`118`	`118`	`*/`
`119`	`119`	`@TestVisible`
`120`		`- protected virtual void clearFields(Set<Schema.SObjectField> sObjectFields)`
	`120`	`+ protected virtual void clearFields(Set<Schema.SObjectField> fields)`
`121`	`121`	`{`
`122`	`122`	`for (SObject record : getRecords())`
`123`	`123`	`{`
`124`		`- for (SObjectField sObjectField : sObjectFields)`
	`124`	`+ for (SObjectField field : fields)`
`125`	`125`	`{`
`126`		`- record.put(sObjectField, null);`
	`126`	`+ record.put(field, null);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -156,76 +156,76 @@ public virtual class fflib_SObjects`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
`159`		`- * @param sObjectField The SObjectField reference of the type Id`
	`159`	`+ * @param field The SObjectField reference of the type Id`
`160`	`160`	`*`
`161`	`161`	`* @return Return a set with all the Id values of the given field`
`162`	`162`	`*/`
`163`	`163`	`@TestVisible`
`164`		`- protected Set<Id> getIdFieldValues(Schema.SObjectField sObjectField)`
	`164`	`+ protected Set<Id> getIdFieldValues(Schema.SObjectField field)`
`165`	`165`	`{`
`166`	`166`	`Set<Id> result = new Set<Id>();`
`167`	`167`	`for (SObject record : getRecords())`
`168`	`168`	`{`
`169`		`- result.add((Id) record.get(sObjectField));`
	`169`	`+ result.add((Id) record.get(field));`
`170`	`170`	`}`
`171`	`171`	`return result;`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`/**`
`175`		`- * @param sObjectField The SObjectField reference of the type String`
	`175`	`+ * @param field The SObjectField reference of the type String`
`176`	`176`	`*`
`177`	`177`	`* @return Return a set with all the String values of the given field`
`178`	`178`	`*/`
`179`	`179`	`@TestVisible`
`180`		`- protected Set<String> getStringFieldValues(Schema.SObjectField sObjectField)`
	`180`	`+ protected Set<String> getStringFieldValues(Schema.SObjectField field)`
`181`	`181`	`{`
`182`	`182`	`Set<String> result = new Set<String>();`
`183`	`183`	`for (SObject record : getRecords())`
`184`	`184`	`{`
`185`		`- result.add((String) record.get(sObjectField));`
	`185`	`+ result.add((String) record.get(field));`
`186`	`186`	`}`
`187`	`187`	`return result;`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`/**`
`191`		`- * @param sObjectField The SObjectField reference`
	`191`	`+ * @param field The SObjectField reference`
`192`	`192`	`*`
`193`	`193`	`* @return Return a set with all the values of the given field`
`194`	`194`	`*/`
`195`	`195`	`@TestVisible`
`196`		`- protected virtual Set<Object> getFieldValues(Schema.SObjectField sObjectField)`
	`196`	`+ protected virtual Set<Object> getFieldValues(Schema.SObjectField field)`
`197`	`197`	`{`
`198`	`198`	`Set<Object> result = new Set<Object>();`
`199`	`199`	`for (SObject record : getRecords())`
`200`	`200`	`{`
`201`		`- result.add(record.get(sObjectField));`
	`201`	`+ result.add(record.get(field));`
`202`	`202`	`}`
`203`	`203`	`return result;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`/**`
`207`		`- * @param sObjectField The Schema.SObjectField to compare against the given value`
`208`		`- * @param value The given value of the records sObjectField to include in the return`
	`207`	`+ * @param field The Schema.SObjectField to compare against the given value`
	`208`	`+ * @param value The given value of the records field to include in the return`
`209`	`209`	`*`
`210`		`- * @return A list with only the SObjects where the given sObjectField has the provided value`
	`210`	`+ * @return A list with only the SObjects where the given field has the provided value`
`211`	`211`	`*/`
`212`		`- protected virtual List<SObject> getRecordsByFieldValue(Schema.SObjectField sObjectField, Object value)`
	`212`	`+ protected virtual List<SObject> getRecordsByFieldValue(Schema.SObjectField field, Object value)`
`213`	`213`	`{`
`214`		`- return getRecordsByFieldValues(sObjectField, new Set<Object>{value});`
	`214`	`+ return getRecordsByFieldValues(field, new Set<Object>{value});`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`/**`
`218`		`- * @param sObjectField The Schema.SObjectField to compare against the given value`
`219`		`- * @param values The given values of the records sObjectField to include in the return`
	`218`	`+ * @param field The Schema.SObjectField to compare against the given value`
	`219`	`+ * @param values The given values of the records field to include in the return`
`220`	`220`	`*`
`221`		`- * @return A list with only the SObjects where the given sObjectField value is part of the provided values`
	`221`	`+ * @return A list with only the SObjects where the given field value is part of the provided values`
`222`	`222`	`*/`
`223`		`- protected virtual List<SObject> getRecordsByFieldValues(Schema.SObjectField sObjectField, Set<Object> values)`
	`223`	`+ protected virtual List<SObject> getRecordsByFieldValues(Schema.SObjectField field, Set<Object> values)`
`224`	`224`	`{`
`225`	`225`	`List<SObject> result = new List<SObject>();`
`226`	`226`	`for (SObject record : getRecords())`
`227`	`227`	`{`
`228`		`- if (values?.contains(record.get(sObjectField)))`
	`228`	`+ if (values?.contains(record.get(field)))`
`229`	`229`	`{`
`230`	`230`	`result.add(record);`
`231`	`231`	`}`
`@@ -234,30 +234,30 @@ public virtual class fflib_SObjects`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`/**`
`237`		`- * @param sObjectField The Schema.SObjectField to check its value for a Blank value`
	`237`	`+ * @param field The Schema.SObjectField to check its value for a Blank value`
`238`	`238`	`*`
`239`		`- * @return A list with only the SObjects where the given sObjectField value is either null or '')`
	`239`	`+ * @return A list with only the SObjects where the given field value is either null or '')`
`240`	`240`	`*/`
`241`		`- protected virtual List<SObject> getRecordsWithBlankFieldValues(Schema.SObjectField sObjectField)`
	`241`	`+ protected virtual List<SObject> getRecordsWithBlankFieldValues(Schema.SObjectField field)`
`242`	`242`	`{`
`243`	`243`	`return getRecordsWithBlankFieldValues(`
`244`		`- new Set<Schema.SObjectField> {sObjectField}`
	`244`	`+ new Set<Schema.SObjectField> {field}`
`245`	`245`	`);`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`/**`
`249`		`- * @param sObjectFields The Schema.SObjectFields to check their value for a Blank value`
	`249`	`+ * @param fields The Schema.SObjectFields to check their value for a Blank value`
`250`	`250`	`*`
`251`		`- * @return A list with only the SObjects where the at least one given sObjectField value is either null or '')`
	`251`	`+ * @return A list with only the SObjects where the at least one given field value is either null or '')`
`252`	`252`	`*/`
`253`		`- protected virtual List<SObject> getRecordsWithBlankFieldValues(Set<Schema.SObjectField> sObjectFields)`
	`253`	`+ protected virtual List<SObject> getRecordsWithBlankFieldValues(Set<Schema.SObjectField> fields)`
`254`	`254`	`{`
`255`	`255`	`List<SObject> result = new List<SObject>();`
`256`	`256`	`for (SObject record : getRecords())`
`257`	`257`	`{`
`258`		`- for (SObjectField sObjectField : sObjectFields)`
	`258`	`+ for (SObjectField field : fields)`
`259`	`259`	`{`
`260`		`- if (String.isNotBlank((String) record.get(sObjectField))) continue;`
	`260`	`+ if (String.isNotBlank((String) record.get(field))) continue;`
`261`	`261`
`262`	`262`	`result.add(record);`
`263`	`263`	`break;`
`@@ -267,19 +267,19 @@ public virtual class fflib_SObjects`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`/**`
`270`		`- * @param sObjectFields The Schema.SObjectFields to check their value for a Blank value`
	`270`	`+ * @param fields The Schema.SObjectFields to check their value for a Blank value`
`271`	`271`	`*`
`272`		`- * @return A list with only the SObjects where all given sObjectField values are either null or ''`
	`272`	`+ * @return A list with only the SObjects where all given field values are either null or ''`
`273`	`273`	`*/`
`274`		`- protected virtual List<SObject> getRecordsWithAllBlankFieldValues(Set<Schema.SObjectField> sObjectFields)`
	`274`	`+ protected virtual List<SObject> getRecordsWithAllBlankFieldValues(Set<Schema.SObjectField> fields)`
`275`	`275`	`{`
`276`	`276`	`List<SObject> result = new List<SObject>();`
`277`	`277`	`for (SObject record : getRecords())`
`278`	`278`	`{`
`279`	`279`	`Boolean allBlank = true;`
`280`		`- for (SObjectField sObjectField : sObjectFields)`
	`280`	`+ for (SObjectField field : fields)`
`281`	`281`	`{`
`282`		`- if (String.isNotBlank((String) record.get(sObjectField)))`
	`282`	`+ if (String.isNotBlank((String) record.get(field)))`
`283`	`283`	`{`
`284`	`284`	`allBlank = false;`
`285`	`285`	`break;`
`@@ -291,30 +291,30 @@ public virtual class fflib_SObjects`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
`294`		`- * @param sObjectField The Schema.SObjectField to check its value for a Non-Blank value`
	`294`	`+ * @param field The Schema.SObjectField to check its value for a Non-Blank value`
`295`	`295`	`*`
`296`		`- * @return A list with only the SObjects where the given sObjectField value is not null or ''`
	`296`	`+ * @return A list with only the SObjects where the given field value is not null or ''`
`297`	`297`	`*/`
`298`		`- protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Schema.SObjectField sObjectField)`
	`298`	`+ protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Schema.SObjectField field)`
`299`	`299`	`{`
`300`	`300`	`return getRecordsWithNotBlankFieldValues(`
`301`		`- new Set<Schema.SObjectField> {sObjectField}`
	`301`	`+ new Set<Schema.SObjectField> {field}`
`302`	`302`	`);`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`/**`
`306`		`- * @param sObjectFields The Schema.SObjectFields to check their value for a Non-Blank value`
	`306`	`+ * @param fields The Schema.SObjectFields to check their value for a Non-Blank value`
`307`	`307`	`*`
`308`		`- * @return A list with only the SObjects where the at least one given sObjectField value not null or ''`
	`308`	`+ * @return A list with only the SObjects where the at least one given field value not null or ''`
`309`	`309`	`*/`
`310`		`- protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Set<Schema.SObjectField> sObjectFields)`
	`310`	`+ protected virtual List<SObject> getRecordsWithNotBlankFieldValues(Set<Schema.SObjectField> fields)`
`311`	`311`	`{`
`312`	`312`	`List<SObject> result = new List<SObject>();`
`313`	`313`	`for (SObject record : getRecords())`
`314`	`314`	`{`
`315`		`- for (SObjectField sObjectField : sObjectFields)`
	`315`	`+ for (SObjectField field : fields)`
`316`	`316`	`{`
`317`		`- if (String.isNotBlank((String) record.get(sObjectField)))`
	`317`	`+ if (String.isNotBlank((String) record.get(field)))`
`318`	`318`	`{`
`319`	`319`	`result.add(record);`
`320`	`320`	`break;`
`@@ -325,19 +325,19 @@ public virtual class fflib_SObjects`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`/**`
`328`		`- * @param sObjectFields The Schema.SObjectFields to check their value for a Non-Blank value`
	`328`	`+ * @param fields The Schema.SObjectFields to check their value for a Non-Blank value`
`329`	`329`	`*`
`330`		`- * @return A list with only the SObjects where all given sObjectField values are not null or ''`
	`330`	`+ * @return A list with only the SObjects where all given field values are not null or ''`
`331`	`331`	`*/`
`332`		`- protected virtual List<SObject> getRecordsWithAllNotBlankFieldValues(Set<Schema.SObjectField> sObjectFields)`
	`332`	`+ protected virtual List<SObject> getRecordsWithAllNotBlankFieldValues(Set<Schema.SObjectField> fields)`
`333`	`333`	`{`
`334`	`334`	`List<SObject> result = new List<SObject>();`
`335`	`335`	`for (SObject record : getRecords())`
`336`	`336`	`{`
`337`	`337`	`Boolean allNonBlank = true;`
`338`		`- for (SObjectField sObjectField : sObjectFields)`
	`338`	`+ for (SObjectField field : fields)`
`339`	`339`	`{`
`340`		`- if (String.isBlank((String) record.get(sObjectField)))`
	`340`	`+ if (String.isBlank((String) record.get(field)))`
`341`	`341`	`{`
`342`	`342`	`allNonBlank = false;`
`343`	`343`	`break;`
`@@ -351,33 +351,33 @@ public virtual class fflib_SObjects`
`351`	`351`	`/**`
`352`	`352`	`* Modifies a value of a field for all records in the domain`
`353`	`353`	`*`
`354`		`- * @param sObjectField The reference to the SObjectField to be modified`
	`354`	`+ * @param field The reference to the SObjectField to be modified`
`355`	`355`	`* @param value The value to store in the given SObjectField`
`356`	`356`	`*/`
`357`		`- protected virtual void setFieldValue(Schema.SObjectField sObjectField, Object value)`
	`357`	`+ protected virtual void setFieldValue(Schema.SObjectField field, Object value)`
`358`	`358`	`{`
`359`	`359`	`for (SObject record : getRecords())`
`360`	`360`	`{`
`361`		`- record.put(sObjectField, value);`
	`361`	`+ record.put(field, value);`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`/**`
`366`		`- * @param sObjectFieldToCheck The SObjectField to match the key against in the provided map`
`367`		`- * @param sObjectFieldToUpdate The SObjectField to store the mapped value when the key matches the value in the sObjectFieldToUpdate field`
`368`		`- * @param values Map of values to store by the sObjectFieldToCheck fields value`
	`366`	`+ * @param fieldToCheck The SObjectField to match the key against in the provided map`
	`367`	`+ * @param fieldToUpdate The SObjectField to store the mapped value when the key matches the value in the fieldToUpdate field`
	`368`	`+ * @param values Map of values to store by the fieldToCheck fields value`
`369`	`369`	`*/`
`370`	`370`	`protected virtual void setFieldValueByMap(`
`371`		`- Schema.SObjectField sObjectFieldToCheck,`
`372`		`- Schema.SObjectField sObjectFieldToUpdate,`
	`371`	`+ Schema.SObjectField fieldToCheck,`
	`372`	`+ Schema.SObjectField fieldToUpdate,`
`373`	`373`	`Map<Object, Object> values)`
`374`	`374`	`{`
`375`	`375`	`for (SObject record : getRecords())`
`376`	`376`	`{`
`377`		`- Object keyValue = record.get(sObjectFieldToCheck);`
	`377`	`+ Object keyValue = record.get(fieldToCheck);`
`378`	`378`	`if (values?.containsKey(keyValue))`
`379`	`379`	`{`
`380`		`- record.put(sObjectFieldToUpdate, values.get(keyValue));`
	`380`	`+ record.put(fieldToUpdate, values.get(keyValue));`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`	`}`