code review changes

Author: XingY

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

@@ -51,8 +51,15 @@ public interface MapDataIterator extends DataIterator
         if (null == row)
             return null;
 
-        Map<String, Object> rowClean = new CaseInsensitiveHashMap<>(row);
-        rowClean.remove(ExistingRecordDataIterator.EXISTING_RECORD_COLUMN_NAME);
+        if (!row.containsKey(ExistingRecordDataIterator.EXISTING_RECORD_COLUMN_NAME))
+            return row;
+
+        Map<String, Object> rowClean = new CaseInsensitiveHashMap<>(row.size());
+        row.forEach((k, v) -> {
+            if (!ExistingRecordDataIterator.EXISTING_RECORD_COLUMN_NAME.equals(k))
+                rowClean.put(k, v);
+        });
+
         return rowClean;
     }
 

api/src/org/labkey/api/query/AbstractQueryImportAction.java

@@ -30,6 +30,7 @@
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.attachments.FileAttachmentFile;
 import org.labkey.api.audit.TransactionAuditProvider;
+import org.labkey.api.collections.LabKeyCollectors;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.DbScope;
@@ -56,6 +57,7 @@
 import org.labkey.api.util.CPUTimer;
 import org.labkey.api.util.FileStream;
 import org.labkey.api.util.FileUtil;
+import org.labkey.api.util.JsonUtil;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.Path;
@@ -76,6 +78,7 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -761,6 +764,14 @@ protected JSONObject createSuccessResponse(int rowCount)
         return response;
     }
 
+    public static JSONArray prepareRowsResponse(@NotNull Collection<Map<String, Object>> rows)
+    {
+        return rows.stream()
+                .map(JsonUtil::toMapPreserveNonFinite)
+                .map(JsonUtil::toJsonPreserveNulls)
+                .collect(LabKeyCollectors.toJSONArray());
+    }
+
     @Override
     protected ApiResponseWriter createResponseWriter() throws IOException
     {