CC review

Author: XingY

api/src/org/labkey/api/audit/AuditHandler.java

@@ -14,7 +14,6 @@
 import org.labkey.api.exp.api.ExpData;
 import org.labkey.api.exp.api.ExpMaterial;
 import org.labkey.api.exp.api.ExperimentService;
-import org.labkey.api.exp.query.ExpMaterialTable;
 import org.labkey.api.gwt.client.AuditBehaviorType;
 import org.labkey.api.query.QueryService;
 import org.labkey.api.security.User;

api/src/org/labkey/api/dataiterator/DataClassUpdateAddColumnsDataIterator.java

@@ -35,7 +35,6 @@
 public class DataClassUpdateAddColumnsDataIterator extends WrapperDataIterator
 {
     private final Container _targetContainer;
-    private final TableInfo _tableInfo;
     final CachingDataIterator _unwrapped;
 
     private final long _dataClassId;
@@ -52,7 +51,6 @@ public DataClassUpdateAddColumnsDataIterator(DataIterator in, @NotNull DataItera
         super(in);
         this._unwrapped = (CachingDataIterator)in;
         _context = context;
-        _tableInfo = target;
         _targetContainer = container;
         _dataClassId = dataClassId;
 

experiment/src/client/test/integration/DataClassCrud.ispec.ts

@@ -445,7 +445,7 @@ describe('Duplicate IDs', () => {
             expect(errorResp['exception']).toBe('Duplicate key provided: ' + data2RowId);
         });
 
-        // update date twice specifying the name across multiple partitions
+        // update data twice specifying the name across multiple partitions
         await server.post('query', 'updateRows', {
             schemaName: 'exp.data',
             queryName: dataType,
@@ -464,7 +464,7 @@ describe('Duplicate IDs', () => {
             expect(errorResp['exception']).toBe('Duplicate key provided: ' + dataName1);
         });
 
-        // update date twice specifying the rowId across multiple partitions
+        // update data twice specifying the rowId across multiple partitions
         await server.post('query', 'updateRows', {
             schemaName: 'exp.data',
             queryName: dataType,

experiment/src/org/labkey/experiment/api/ExpDataClassDataTableImpl.java

@@ -21,14 +21,9 @@
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
-import org.apache.logging.log4j.Level;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.labkey.api.attachments.AttachmentFile;
-import org.labkey.api.attachments.AttachmentParent;
 import org.labkey.api.attachments.AttachmentParentFactory;
-import org.labkey.api.attachments.AttachmentService;
-import org.labkey.api.audit.TransactionAuditProvider;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
 import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.collections.Sets;
@@ -125,7 +120,6 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.StringExpressionFactory;
-import org.labkey.api.util.UnexpectedException;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.UnauthorizedException;
 import org.labkey.api.view.ViewContext;
@@ -138,7 +132,6 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.Path;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -149,7 +142,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -159,7 +151,7 @@
 import static org.labkey.api.exp.query.ExpDataClassDataTable.Column.Name;
 import static org.labkey.api.exp.query.ExpDataClassDataTable.Column.QueryableInputs;
 import static org.labkey.api.exp.query.ExpDataClassDataTable.Column.RowId;
-import static org.labkey.api.exp.query.ExpMaterialTable.Column.LSID;
+import static org.labkey.api.exp.query.ExpDataClassDataTable.Column.LSID;
 import static org.labkey.api.query.DefaultQueryUpdateService.getKeyColumnAliasForUpdate;
 import static org.labkey.experiment.ExpDataIterators.incrementCounts;
 
@@ -1439,7 +1431,7 @@ public List<Map<String, Object>> updateRows(User user, Container container, List
 
             List<Map<String, Object>> results;
             Map<Enum, Object> finalConfigParameters = configParameters == null ? new HashMap<>() : configParameters;
-            recordDataIteratorUsed(configParameters);
+            recordDataIteratorUsed(finalConfigParameters);
 
             try
             {

experiment/src/org/labkey/experiment/api/SampleTypeUpdateServiceDI.java

@@ -535,7 +535,7 @@ public List<Map<String, Object>> updateRows(
 
         List<Map<String, Object>> results;
         Map<Enum, Object> finalConfigParameters = configParameters == null ? new HashMap<>() : configParameters;
-        recordDataIteratorUsed(configParameters);
+        recordDataIteratorUsed(finalConfigParameters);
 
         try
         {