Skip to content

Commit

Permalink
Minor cleanup to member variables and visibility levels
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamessimone
jamessimone committed Jul 3, 2024
1 parent e879ff0 commit b4740bc
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 135 deletions.
4 changes: 2 additions & 2 deletions force-app/main/default/classes/collection/ObjectCollection.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ public with sharing class ObjectCollection {

public List<Object> asList(Type listType) {
List<Object> typedObjects = (List<Object>) listType.newInstance();
typedObjects.addAll(objects);
typedObjects.addAll(this.objects);
return typedObjects;
}

public Set<Object> asSet(Type setType) {
Set<Object> typedObjects = (Set<Object>) setType.newInstance();
typedObjects.addAll(objects);
typedObjects.addAll(this.objects);
return typedObjects;
}
}
97 changes: 48 additions & 49 deletions force-app/main/default/classes/collection/SObjectCollection.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,51 +10,50 @@ public with sharing class SObjectCollection {
private SObjectCollection(Iterable<SObject> records) {
this.records = new List<SObject>();
this.fieldReader = new SObjectFieldReader();
Iterator<SObject> iter = records.iterator();
while (iter.hasNext()) {
this.records.add(iter.next());
for (SObject record : records) {
this.records.add(record);
}
}

public Integer size() {
return records.size();
return this.records.size();
}

public List<SObject> asList() {
return new List<SObject>(records);
return new List<SObject>(this.records);
}

public List<SObject> asList(Type listType) {
List<SObject> typedList = (List<SObject>) listType.newInstance();
typedList.addAll(records);
typedList.addAll(this.records);
return typedList;
}

public Set<SObject> asSet() {
return new Set<SObject>(records);
return new Set<SObject>(this.records);
}

public Set<SObject> asSet(Type setType) {
Set<SObject> typedSet = (Set<SObject>) setType.newInstance();
typedSet.addAll(records);
typedSet.addAll(this.records);
return typedSet;
}

public Map<Id, SObject> asMap() {
return new Map<Id, SObject>(records);
return new Map<Id, SObject>(this.records);
}

public Map<Id, SObject> asMap(Type mapType) {
Map<Id, SObject> typedMap = (Map<Id, SObject>) mapType.newInstance();
typedMap.putAll(records);
typedMap.putAll(this.records);
return typedMap;
}

public SObjectCollection difference(SObjectCollection other, Set<Schema.SObjectField> comparisonFields) {
List<SObject> different = new List<SObject>();
if (other != null && !other.isEmpty() && !this.isEmpty()) {
Map<Id, SObject> otherMap = new Map<Id, SObject>(other.records);
for (SObject record : records) {
for (SObject record : this.records) {
SObject counterpart = otherMap.get(record.Id);
if (counterpart == null) {
different.add(record);
Expand All @@ -72,12 +71,12 @@ public with sharing class SObjectCollection {
}

public Boolean isEmpty() {
return records.isEmpty();
return this.records.isEmpty();
}

public SObjectCollection filter(SObjectPredicate predicate) {
List<SObject> filtered = new List<SObject>();
for (SObject record : records) {
for (SObject record : this.records) {
if (predicate.call(record)) {
filtered.add(record);
}
Expand All @@ -87,7 +86,7 @@ public with sharing class SObjectCollection {

public SObjectCollection remove(SObjectPredicate predicate) {
List<SObject> remaining = new List<SObject>();
for (SObject record : records) {
for (SObject record : this.records) {
if (!predicate.call(record)) {
remaining.add(record);
}
Expand All @@ -97,111 +96,111 @@ public with sharing class SObjectCollection {

public List<Boolean> pluckBooleans(Schema.SObjectField field) {
List<Boolean> results = new List<Boolean>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add((Boolean) rec.get(field));
}
return results;
}

public List<Boolean> pluckBooleans(String relation) {
List<Boolean> results = new List<Boolean>();
for (SObject rec : records) {
results.add((Boolean) fieldReader.read(rec, relation));
for (SObject rec : this.records) {
results.add((Boolean) this.fieldReader.read(rec, relation));
}
return results;
}

public List<Date> pluckDates(Schema.SObjectField field) {
List<Date> results = new List<Date>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add((Date) rec.get(field));
}
return results;
}

public List<Date> pluckDates(String relation) {
List<Date> results = new List<Date>();
for (SObject rec : records) {
results.add((Date) fieldReader.read(rec, relation));
for (SObject rec : this.records) {
results.add((Date) this.fieldReader.read(rec, relation));
}
return results;
}

public List<Datetime> pluckDatetimes(Schema.SObjectField field) {
List<Datetime> results = new List<Datetime>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add((Datetime) rec.get(field));
}
return results;
}

public List<Datetime> pluckDatetimes(String relation) {
List<Datetime> results = new List<Datetime>();
for (SObject rec : records) {
results.add((Datetime) fieldReader.read(rec, relation));
for (SObject rec : this.records) {
results.add((Datetime) this.fieldReader.read(rec, relation));
}
return results;
}

public List<Decimal> pluckDecimals(Schema.SObjectField field) {
List<Decimal> results = new List<Decimal>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add((Decimal) rec.get(field));
}
return results;
}

public List<Decimal> pluckDecimals(String relation) {
List<Decimal> results = new List<Decimal>();
for (SObject rec : records) {
results.add((Decimal) fieldReader.read(rec, relation));
for (SObject rec : this.records) {
results.add((Decimal) this.fieldReader.read(rec, relation));
}
return results;
}

public List<Id> pluckIds() {
List<Id> results = new List<Id>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add(rec.Id);
}
return results;
}

public List<Id> pluckIds(Schema.SObjectField field) {
List<Id> results = new List<Id>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add((Id) rec.get(field));
}
return results;
}

public List<Id> pluckIds(String relation) {
List<Id> results = new List<Id>();
for (SObject rec : records) {
results.add((Id) fieldReader.read(rec, relation));
for (SObject rec : this.records) {
results.add((Id) this.fieldReader.read(rec, relation));
}
return results;
}

public List<String> pluckStrings(Schema.SObjectField field) {
List<String> results = new List<String>();
for (SObject rec : records) {
for (SObject rec : this.records) {
results.add((String) rec.get(field));
}
return results;
}

public List<String> pluckStrings(String relation) {
List<String> results = new List<String>();
for (SObject rec : records) {
results.add((String) fieldReader.read(rec, relation));
for (SObject rec : this.records) {
results.add((String) this.fieldReader.read(rec, relation));
}
return results;
}

public Map<Boolean, List<SObject>> groupByBooleans(String apiFieldName, Type listType) {
Map<Boolean, List<SObject>> grouped = new Map<Boolean, List<SObject>>();
for (SObject rec : records) {
for (SObject rec : this.records) {
Boolean key = (Boolean) rec.get(apiFieldName);
if (!grouped.containsKey(key)) {
grouped.put(key, (List<SObject>) listType.newInstance());
Expand All @@ -225,7 +224,7 @@ public with sharing class SObjectCollection {

public Map<Date, List<SObject>> groupByDates(String apiFieldName, Type listType) {
Map<Date, List<SObject>> grouped = new Map<Date, List<SObject>>();
for (SObject rec : records) {
for (SObject rec : this.records) {
Date key = (Date) rec.get(apiFieldName);
if (!grouped.containsKey(key)) {
grouped.put(key, (List<SObject>) listType.newInstance());
Expand All @@ -249,7 +248,7 @@ public with sharing class SObjectCollection {

public Map<Datetime, List<SObject>> groupByDatetimes(String apiFieldName, Type listType) {
Map<Datetime, List<SObject>> grouped = new Map<Datetime, List<SObject>>();
for (SObject rec : records) {
for (SObject rec : this.records) {
Datetime key = (Datetime) rec.get(apiFieldName);
if (!grouped.containsKey(key)) {
grouped.put(key, (List<SObject>) listType.newInstance());
Expand All @@ -273,7 +272,7 @@ public with sharing class SObjectCollection {

public Map<Decimal, List<SObject>> groupByDecimals(String apiFieldName, Type listType) {
Map<Decimal, List<SObject>> grouped = new Map<Decimal, List<SObject>>();
for (SObject rec : records) {
for (SObject rec : this.records) {
Decimal key = (Decimal) rec.get(apiFieldName);
if (!grouped.containsKey(key)) {
grouped.put(key, (List<SObject>) listType.newInstance());
Expand All @@ -297,7 +296,7 @@ public with sharing class SObjectCollection {

public Map<Id, List<SObject>> groupByIds(String apiFieldName, Type listType) {
Map<Id, List<SObject>> grouped = new Map<Id, List<SObject>>();
for (SObject rec : records) {
for (SObject rec : this.records) {
Id key = (Id) rec.get(apiFieldName);
if (!grouped.containsKey(key)) {
grouped.put(key, (List<SObject>) listType.newInstance());
Expand All @@ -321,7 +320,7 @@ public with sharing class SObjectCollection {

public Map<String, List<SObject>> groupByStrings(String apiFieldName, Type listType) {
Map<String, List<SObject>> grouped = new Map<String, List<SObject>>();
for (SObject rec : records) {
for (SObject rec : this.records) {
String key = (String) rec.get(apiFieldName);
if (!grouped.containsKey(key)) {
grouped.put(key, (List<SObject>) listType.newInstance());
Expand Down Expand Up @@ -358,7 +357,7 @@ public with sharing class SObjectCollection {

public SObjectCollection pick(Set<String> apiFieldNames) {
List<SObject> picked = new List<SObject>();
for (SObject record : records) {
for (SObject record : this.records) {
SObject result = record.getSObjectType().newSObject();
Map<String, Object> fieldMap = record.getPopulatedFieldsAsMap();
for (String fieldName : apiFieldNames) {
Expand All @@ -377,23 +376,23 @@ public with sharing class SObjectCollection {

public SObjectCollection mapAll(SObjectToSObjectFunction fn) {
List<SObject> mapped = new List<SObject>();
for (SObject record : records) {
for (SObject record : this.records) {
mapped.add(fn.call(record));
}
return SObjectCollection.of(mapped);
}

public ObjectCollection mapAll(SObjectToObjectFunction fn) {
List<Object> mapped = new List<Object>();
for (SObject record : records) {
for (SObject record : this.records) {
mapped.add(fn.call(record));
}
return ObjectCollection.of(mapped);
}

public SObjectCollection mapSome(SObjectPredicate predicate, SObjectToSObjectFunction fn) {
List<SObject> transformed = new List<SObject>();
for (SObject record : records) {
for (SObject record : this.records) {
if (predicate.call(record)) {
transformed.add(fn.call(record));
} else {
Expand All @@ -409,8 +408,8 @@ public with sharing class SObjectCollection {

public DecimalCollection mapToDecimal(String relation) {
List<Decimal> decimals = new List<Decimal>();
for (SObject record : records) {
decimals.add((Decimal) fieldReader.read(record, relation));
for (SObject record : this.records) {
decimals.add((Decimal) this.fieldReader.read(record, relation));
}
return DecimalCollection.of(decimals);
}
Expand All @@ -421,14 +420,14 @@ public with sharing class SObjectCollection {

public DoubleCollection mapToDouble(String relation) {
List<Double> doubles = new List<Double>();
for (SObject record : records) {
doubles.add((Double) fieldReader.read(record, relation));
for (SObject record : this.records) {
doubles.add((Double) this.fieldReader.read(record, relation));
}
return DoubleCollection.of(doubles);
}

public OptionalSObject find(SObjectPredicate predicate) {
for (SObject record : records) {
for (SObject record : this.records) {
if (predicate.call(record)) {
return OptionalSObject.of(record);
}
Expand All @@ -437,7 +436,7 @@ public with sharing class SObjectCollection {
}

public SObjectCollection forEach(SObjectFunction fn) {
for (SObject record : records) {
for (SObject record : this.records) {
fn.call(record);
}
return this;
Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/classes/function/DebugSObject.cls
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
public with sharing class DebugSObject {
private LoggingLevel logLevel = LoggingLevel.DEBUG;
private System.LoggingLevel logLevel = System.LoggingLevel.DEBUG;

public DebugSObject logLevel(LoggingLevel logLevel) {
this.logLevel = logLevel;
Expand Down
4 changes: 2 additions & 2 deletions force-app/main/default/classes/function/FieldsMatch.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class FieldsMatch implements SObjectPredicate {
}

private Boolean conditionSatisfied(FieldMatchCondition condition, SObject record) {
Object fieldValue = fieldReader.read(record, condition.fieldPath);
Object fieldValue = this.fieldReader.read(record, condition.fieldPath);
if (setComparisons.contains(condition.relation)) {
return setConditionSatisfied(condition, fieldValue);
} else {
Expand Down Expand Up @@ -82,7 +82,7 @@ public class FieldsMatch implements SObjectPredicate {
}
}
}
Integer result = primitiveComparer.compare(fieldValue, condition.value);
Integer result = this.primitiveComparer.compare(fieldValue, condition.value);
switch on condition.relation {
when EQUALS {
return result == 0;
Expand Down
4 changes: 2 additions & 2 deletions force-app/main/default/classes/function/IncompleteFieldsMatch.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class IncompleteFieldsMatch {

// helper for all other methods
private FieldsMatch filterWith(BinaryRelation relation, Object value) {
baseMatch.addCondition(new FieldMatchCondition(fieldPath, relation, value));
return baseMatch;
this.baseMatch.addCondition(new FieldMatchCondition(this.fieldPath, relation, value));
return this.baseMatch;
}

public FieldsMatch equals(Object value) {
Expand Down
Loading

0 comments on commit b4740bc

Please sign in to comment.