Trigger interface changes

Author: labkey-nicka

api/src/org/labkey/api/data/triggers/ScriptTrigger.java

@@ -182,7 +182,7 @@ public void beforeInsert(TableInfo table, Container c,
 
     @Override
     public void beforeUpdate(TableInfo table, Container c,
-                             User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow,
+                             User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow,
                              ValidationException errors, Map<String, Object> extraContext)
     {
         invokeTableScript(table, c, user, "beforeUpdate", errors, extraContext, filterErrorDetailByPhi(table, () -> "New row: " + newRow + ". Old row: "  + oldRow), newRow, oldRow);

api/src/org/labkey/api/data/triggers/Trigger.java

@@ -209,7 +209,7 @@ default void rowTrigger(TableInfo table, Container c, User user, TableInfo.Trigg
                     beforeInsert(table, c, user, insertOption, newRow, errors, extraContext, existingRecord);
                     break;
                 case UPDATE:
-                    beforeUpdate(table, c, user, newRow, oldRow, errors, extraContext);
+                    beforeUpdate(table, c, user, insertOption, newRow, oldRow, errors, extraContext);
                     break;
                 case DELETE:
                     beforeDelete(table, c, user, oldRow, errors, extraContext);
@@ -247,7 +247,7 @@ default void beforeInsert(TableInfo table, Container c,
     }
 
     default void beforeUpdate(TableInfo table, Container c,
-                              User user, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow,
+                              User user, @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow, @Nullable Map<String, Object> oldRow,
                               ValidationException errors, Map<String, Object> extraContext) throws ValidationException
     {
     }

assay/src/org/labkey/assay/plate/AssayPlateTriggerFactory.java

@@ -21,6 +21,7 @@
 import org.labkey.api.qc.DataState;
 import org.labkey.api.query.BatchValidationException;
 import org.labkey.api.query.FieldKey;
+import org.labkey.api.query.QueryUpdateService;
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.security.User;
 import org.labkey.api.util.UnexpectedException;
@@ -163,6 +164,7 @@ public void beforeUpdate(
             TableInfo table,
             Container c,
             User user,
+            @Nullable QueryUpdateService.InsertOption insertOption,
             @Nullable Map<String, Object> newRow,
             @Nullable Map<String, Object> oldRow,
             ValidationException errors,

assay/src/org/labkey/assay/plate/data/WellTriggerFactory.java

@@ -54,13 +54,13 @@ private class ValidateRunImportedPlateTrigger implements Trigger
 
         @Override
         public void beforeUpdate(
-            TableInfo table,
-            Container c,
-            User user,
-            @Nullable Map<String, Object> newRow,
-            @Nullable Map<String, Object> oldRow,
-            ValidationException errors,
-            Map<String, Object> extraContext
+                TableInfo table,
+                Container c,
+                User user,
+                @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow,
+                @Nullable Map<String, Object> oldRow,
+                ValidationException errors,
+                Map<String, Object> extraContext
         ) throws ValidationException
         {
             if (oldRow == null || errors.hasErrors() || !oldRow.containsKey(WellTable.Column.PlateId.name()))
@@ -165,6 +165,7 @@ public void beforeUpdate(
             TableInfo table,
             Container c,
             User user,
+            @Nullable QueryUpdateService.InsertOption insertOption,
             @Nullable Map<String, Object> newRow,
             @Nullable Map<String, Object> oldRow,
             ValidationException errors,