From 95f343ea82110fdcd9f82e8baca1813e24c1673b Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Thu, 17 Jul 2025 16:19:04 -0700 Subject: [PATCH] SaveRowsResponse -> RowsResponse --- .../labModules/ViralLoadAssayTest.java | 4 ++-- .../test/util/ehr/EHRClientAPIHelper.java | 19 +++++++++---------- .../org/labkey/test/tests/snd/SNDTest.java | 8 ++++---- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Viral_Load_Assay/test/src/org/labkey/test/tests/external/labModules/ViralLoadAssayTest.java b/Viral_Load_Assay/test/src/org/labkey/test/tests/external/labModules/ViralLoadAssayTest.java index 67ea26493..e9042c378 100644 --- a/Viral_Load_Assay/test/src/org/labkey/test/tests/external/labModules/ViralLoadAssayTest.java +++ b/Viral_Load_Assay/test/src/org/labkey/test/tests/external/labModules/ViralLoadAssayTest.java @@ -24,7 +24,7 @@ import org.labkey.remoteapi.Connection; import org.labkey.remoteapi.query.Filter; import org.labkey.remoteapi.query.InsertRowsCommand; -import org.labkey.remoteapi.query.SaveRowsResponse; +import org.labkey.remoteapi.query.RowsResponse; import org.labkey.remoteapi.query.SelectRowsCommand; import org.labkey.remoteapi.query.SelectRowsResponse; import org.labkey.test.Locator; @@ -394,7 +394,7 @@ private void ensureABI7500Records() throws CommandException, IOException rowMap.put("detector", DETECTOR_NAME); rowMap.put("reporter", "FAM"); insertCmd.addRow(rowMap); - SaveRowsResponse saveResp = insertCmd.execute(cn, getProjectName()); + RowsResponse saveResp = insertCmd.execute(cn, getProjectName()); assertEquals("Problem creating record", 1, saveResp.getRowsAffected()); } else diff --git a/ehr/test/src/org/labkey/test/util/ehr/EHRClientAPIHelper.java b/ehr/test/src/org/labkey/test/util/ehr/EHRClientAPIHelper.java index 2c34e8b4d..d2ececdaa 100644 --- a/ehr/test/src/org/labkey/test/util/ehr/EHRClientAPIHelper.java +++ b/ehr/test/src/org/labkey/test/util/ehr/EHRClientAPIHelper.java @@ -28,8 +28,7 @@ import org.labkey.remoteapi.query.DeleteRowsCommand; import org.labkey.remoteapi.query.Filter; import org.labkey.remoteapi.query.InsertRowsCommand; -import org.labkey.remoteapi.query.SaveRowsCommand; -import org.labkey.remoteapi.query.SaveRowsResponse; +import org.labkey.remoteapi.query.RowsResponse; import org.labkey.remoteapi.query.SelectRowsCommand; import org.labkey.remoteapi.query.SelectRowsResponse; import org.labkey.remoteapi.query.UpdateRowsCommand; @@ -110,13 +109,13 @@ public int getRowCount(String schema, String query) throws Exception return resp.getRowCount().intValue(); } - public SaveRowsResponse insertRow(String schema, String query, Map row, boolean expectFailure) throws CommandException + public RowsResponse insertRow(String schema, String query, Map row, boolean expectFailure) throws CommandException { try { InsertRowsCommand insertCmd = new InsertRowsCommand(schema, query); insertCmd.addRow(row); - SaveRowsResponse resp = insertCmd.execute(getConnection(), _containerPath); + RowsResponse resp = insertCmd.execute(getConnection(), _containerPath); if (expectFailure) throw new RuntimeException("Expected command to fail"); @@ -137,14 +136,14 @@ public SaveRowsResponse insertRow(String schema, String query, Map row, boolean expectFailure) throws CommandException + public RowsResponse updateRow(String schema, String query, Map row, boolean expectFailure) throws CommandException { try { - SaveRowsCommand cmd = new UpdateRowsCommand(schema, query); + UpdateRowsCommand cmd = new UpdateRowsCommand(schema, query); cmd.addRow(row); - SaveRowsResponse resp = cmd.execute(getConnection(), _containerPath); + RowsResponse resp = cmd.execute(getConnection(), _containerPath); if (expectFailure) throw new RuntimeException("Expected command to fail"); @@ -172,14 +171,14 @@ public void deleteIfExists(String schema, String query, Map row, } } - public SaveRowsResponse deleteRow(String schema, String query, Map row, String pkCol, boolean expectFailure) throws CommandException + public RowsResponse deleteRow(String schema, String query, Map row, String pkCol, boolean expectFailure) throws CommandException { try { DeleteRowsCommand cmd = new DeleteRowsCommand(schema, query); cmd.addRow(row); - SaveRowsResponse resp = cmd.execute(getConnection(), _containerPath); + RowsResponse resp = cmd.execute(getConnection(), _containerPath); if (expectFailure) throw new RuntimeException("Expected command to fail"); @@ -445,7 +444,7 @@ public int deleteAllRecords(String schemaName, String queryName, Filter filter) if (!dr.getRows().isEmpty()) { - SaveRowsResponse resp = dr.execute(getConnection(), _containerPath); + RowsResponse resp = dr.execute(getConnection(), _containerPath); return resp.getRowsAffected().intValue(); } diff --git a/snd/test/src/org/labkey/test/tests/snd/SNDTest.java b/snd/test/src/org/labkey/test/tests/snd/SNDTest.java index 3c9f2af30..fa457f025 100644 --- a/snd/test/src/org/labkey/test/tests/snd/SNDTest.java +++ b/snd/test/src/org/labkey/test/tests/snd/SNDTest.java @@ -28,7 +28,7 @@ import org.labkey.remoteapi.query.DeleteRowsCommand; import org.labkey.remoteapi.query.Filter; import org.labkey.remoteapi.query.InsertRowsCommand; -import org.labkey.remoteapi.query.SaveRowsResponse; +import org.labkey.remoteapi.query.RowsResponse; import org.labkey.remoteapi.query.SelectRowsCommand; import org.labkey.remoteapi.query.SelectRowsResponse; import org.labkey.remoteapi.query.TruncateTableCommand; @@ -1497,7 +1497,7 @@ public void deleteCategoryViaUI() throws Exception catMap.put("Active", true); catMap.put("Comment", "delete me"); cmd.addRow(catMap); - SaveRowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName()); + RowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName()); PackageListPage listPage = PackageListPage.beginAt(this , getProjectName()); EditCategoriesPage catPage = listPage.clickEditCategories(); @@ -1530,7 +1530,7 @@ public void editCategories() throws Exception catMap.put("Active", true); catMap.put("Comment", "edit me so hard!"); // comment is not shown in the UI cmd.addRow(catMap); - SaveRowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName()); + RowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName()); assertEquals(200, response.getStatusCode()); PackageListPage listPage = PackageListPage.beginAt(this , getProjectName()); @@ -1572,7 +1572,7 @@ public void testExtensibleColumns() throws Exception insertRowsCommand.addRow(TEST1ROW1MAP); insertRowsCommand.addRow(TEST1ROW2MAP); insertRowsCommand.addRow(TEST1ROW3MAP); - SaveRowsResponse resp = insertRowsCommand.execute(cn, getProjectName() + "/" + TEST1SUBFOLDER); + RowsResponse resp = insertRowsCommand.execute(cn, getProjectName() + "/" + TEST1SUBFOLDER); assertEquals(3, resp.getRowsAffected().intValue()); goToSchemaBrowser();