Additional 260 updates

Author: jamessimone

force-app/repository/Cursor.cls

@@ -1,12 +1,22 @@
 public virtual without sharing class Cursor {
-  @TestVisible
-  private static Integer maxFetchSize = 2000;
+  public static final Integer MAX_FETCH_SIZE {
+    get {
+      MAX_FETCH_SIZE = MAX_FETCH_SIZE ?? maxRecordsPerFetchCall;
+      return MAX_FETCH_SIZE;
+    }
+    private set;
+  }
+
   private static final Integer MAX_FETCHES_PER_TRANSACTION = Limits.getLimitFetchCallsOnApexCursor();
+
+  @TestVisible
+  private static Integer maxRecordsPerFetchCall = 2000;
+
   @TestVisible
   private static Integer localFetchesMade;
 
   private Integer cursorNumRecords;
-  private Integer fetchesPerTransaction = 1;
+  private Integer fetchesPerTransaction = MAX_FETCHES_PER_TRANSACTION;
   private final Database.Cursor cursor;
 
   public Cursor(String finalQuery, Map<String, Object> bindVars, System.AccessLevel accessLevel) {
@@ -66,24 +76,22 @@ public virtual without sharing class Cursor {
   }
 
   public virtual Integer getNumRecords() {
-    // cache the value for now, as changes made to Apex Cursors currently have calling getNumRecords()
-    // consume a SOQL query each time
     this.cursorNumRecords = this.cursorNumRecords ?? this.cursor?.getNumRecords() ?? 0;
     return this.cursorNumRecords;
   }
 
   protected Integer getAdvanceBy(Integer start, Integer advanceBy) {
     Integer possibleFetchSize = Math.min(advanceBy, this.getNumRecords() - start);
-    if (possibleFetchSize > maxFetchSize) {
+    if (possibleFetchSize > maxRecordsPerFetchCall) {
       System.debug(
         System.LoggingLevel.DEBUG,
         'Fetch size: ' +
           possibleFetchSize +
           ' exceeded platform max fetch size of ' +
-          maxFetchSize +
+          maxRecordsPerFetchCall +
           ', defaulting to max fetch size'
       );
-      possibleFetchSize = maxFetchSize;
+      possibleFetchSize = maxRecordsPerFetchCall;
     } else if (possibleFetchSize < 0) {
       possibleFetchSize = 0;
     }

force-app/repository/CursorTest.cls

@@ -15,15 +15,16 @@ private class CursorTest {
   }
 
   @IsTest
-  static void itCapsMaxFetchSize() {
-    Cursor.maxFetchSize = 20;
+  static void itCapsmaxRecordsPerFetchCall() {
+    Cursor.maxRecordsPerFetchCall = 20;
+    Integer oneMoreThanMaxFetch = Cursor.maxRecordsPerFetchCall + 1;
+
     List<Account> accounts = new List<Account>();
-    for (Integer i = 0; i < Cursor.maxFetchSize + 1; i++) {
+    for (Integer i = 0; i < oneMoreThanMaxFetch; i++) {
       accounts.add(new Account(Name = 'Fetch ' + i));
     }
     insert accounts;
 
-    Integer oneMoreThanMaxFetch = Cursor.maxFetchSize + 1;
     Exception ex;
     List<SObject> results;
     Cursor instance = new Cursor('SELECT Id FROM Account', new Map<String, Object>(), System.AccessLevel.SYSTEM_MODE);
@@ -34,27 +35,27 @@ private class CursorTest {
     }
 
     Assert.areEqual(null, ex?.getMessage());
-    Assert.areEqual(Cursor.maxFetchSize, results.size());
-    Assert.areEqual(1, Cursor.localFetchesMade);
+    Assert.areEqual(2, Cursor.localFetchesMade);
+    Assert.areEqual(oneMoreThanMaxFetch, results.size());
   }
 
   @IsTest
   static void itFetchesMultipleTimesPerTransactionWhenMoreThanMaxFetch() {
-    Cursor.maxFetchSize = 20;
+    Cursor.maxRecordsPerFetchCall = 20;
     List<Account> accounts = new List<Account>();
     Set<String> expectedFetchNames = new Set<String>();
-    for (Integer i = 0; i < Cursor.maxFetchSize + 1; i++) {
+    for (Integer i = 0; i < Cursor.maxRecordsPerFetchCall + 1; i++) {
       String accountName = 'Fetch' + i;
       expectedFetchNames.add(accountName);
       accounts.add(new Account(Name = accountName));
     }
     insert accounts;
 
-    Integer oneMoreThanMaxFetch = Cursor.maxFetchSize + 1;
+    Integer oneMoreThanMaxFetch = Cursor.maxRecordsPerFetchCall + 1;
     Cursor instance = new Cursor('SELECT Name FROM Account', new Map<String, Object>(), System.AccessLevel.SYSTEM_MODE);
     List<SObject> results = instance.setFetchesPerTransaction(2).fetch(0, oneMoreThanMaxFetch);
 
-    Assert.areEqual(Cursor.maxFetchSize + 1, results.size());
+    Assert.areEqual(Cursor.maxRecordsPerFetchCall + 1, results.size());
     Assert.areEqual(2, Cursor.localFetchesMade);
     Set<String> actuallyFetchedNames = new Set<String>();
     for (Account account : (List<Account>) results) {
@@ -65,7 +66,7 @@ private class CursorTest {
 
   @IsTest
   static void itFetchesMultipleTimesPerTransaction() {
-    Cursor.maxFetchSize = 1;
+    Cursor.maxRecordsPerFetchCall = 1;
     insert new List<Account>{ new Account(Name = 'One'), new Account(Name = 'Two') };
 
     Cursor instance = new Cursor('SELECT Id FROM Account', new Map<String, Object>(), System.AccessLevel.SYSTEM_MODE)