From 5628609902bb9ebda28f0f5d1f140ae9878f5cdc Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Thu, 17 Jul 2025 09:55:20 -0700 Subject: [PATCH] SaveRowsResponse -> RowsResponse --- .../test/tests/search/DataClassSearchTest.java | 6 +++--- .../test/tests/study/StudyDatasetLsidTest.java | 14 +++++++------- .../src/org/labkey/test/tests/study/StudyTest.java | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/study/test/src/org/labkey/test/tests/search/DataClassSearchTest.java b/study/test/src/org/labkey/test/tests/search/DataClassSearchTest.java index 848b15be7eb..f200a9ef836 100644 --- a/study/test/src/org/labkey/test/tests/search/DataClassSearchTest.java +++ b/study/test/src/org/labkey/test/tests/search/DataClassSearchTest.java @@ -26,7 +26,7 @@ import org.labkey.remoteapi.SimplePostCommand; import org.labkey.remoteapi.query.DeleteRowsCommand; import org.labkey.remoteapi.query.InsertRowsCommand; -import org.labkey.remoteapi.query.SaveRowsResponse; +import org.labkey.remoteapi.query.RowsResponse; import org.labkey.remoteapi.query.UpdateRowsCommand; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; @@ -217,7 +217,7 @@ private void addSearchableDataClasses() throws Exception row2.put("foodColor", "white"); row2.put("sequence", "ichi\nni\nsan"); insertRowsCommand.setRows(new ArrayList<>(Arrays.asList(row1, row2))); - SaveRowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath()); + RowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath()); List> responseRows = insertResponse.getRows(); dataClassRowIds[0] = (int)responseRows.get(0).get("rowid"); @@ -272,7 +272,7 @@ private void modifySearchableDataClasses() throws Exception row1.put("name", DATA_CLASS_3_NAME); row1.put("iceCreamFlavor", "raspberry"); insertRowsCommand.addRow(row1); - SaveRowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath()); + RowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath()); List> responseRows = insertResponse.getRows(); dataClassRowIds[2] = (int)responseRows.get(0).get("rowid"); diff --git a/study/test/src/org/labkey/test/tests/study/StudyDatasetLsidTest.java b/study/test/src/org/labkey/test/tests/study/StudyDatasetLsidTest.java index 66b9b1c5f00..7ce4ac20481 100644 --- a/study/test/src/org/labkey/test/tests/study/StudyDatasetLsidTest.java +++ b/study/test/src/org/labkey/test/tests/study/StudyDatasetLsidTest.java @@ -9,7 +9,7 @@ import org.labkey.remoteapi.CommandException; import org.labkey.remoteapi.Connection; 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.UpdateRowsCommand; @@ -202,7 +202,7 @@ public void testMVIndicator() throws Exception .create(conn, containerPath); log("Validate inserting into the MV indicator dataset"); - SaveRowsResponse response = expectSuccess(conn, MV_INDICATOR_DATASET, containerPath, + RowsResponse response = expectSuccess(conn, MV_INDICATOR_DATASET, containerPath, List.of( Map.of("Ptid", "111", "Visit", 1, "IntField", "N", "StringField", "Q"), Map.of("Ptid", "222", "Visit", 2, "IntField", 1, "StringField", "StringValue"), @@ -224,7 +224,7 @@ public void testMVIndicator() throws Exception cmd.setRows(updated); try { - SaveRowsResponse resp = cmd.execute(conn, containerPath); + RowsResponse resp = cmd.execute(conn, containerPath); List> updatedRows = resp.getRows(); validateValuesPresent(updatedRows.get(0), Map.of("IntFieldMvIndicator", "Z", "StringFieldMvIndicator", "Q")); validateValuesPresent(updatedRows.get(1), Map.of("IntField", 1, "StringFieldMvIndicator", "Q")); @@ -365,19 +365,19 @@ public void testDateBasedStudy() throws Exception validateUpdateOfGeneratedColumns(conn, containerPath, TIME_PORTION_OF_DATE); } - private SaveRowsResponse expectSuccess(Connection conn, String datasetName, String containerPath, List> rows) throws Exception + private RowsResponse expectSuccess(Connection conn, String datasetName, String containerPath, List> rows) throws Exception { return validateInsertRows(conn, datasetName, containerPath, rows, false); } - private SaveRowsResponse expectFail(Connection conn, String datasetName, String containerPath, List> rows) throws Exception + private RowsResponse expectFail(Connection conn, String datasetName, String containerPath, List> rows) throws Exception { return validateInsertRows(conn, datasetName, containerPath, rows, true); } - private SaveRowsResponse validateInsertRows(Connection conn, String datasetName, String containerPath, List> rows, boolean fail) throws Exception + private RowsResponse validateInsertRows(Connection conn, String datasetName, String containerPath, List> rows, boolean fail) throws Exception { - SaveRowsResponse resp = null; + RowsResponse resp = null; InsertRowsCommand cmd = new InsertRowsCommand("Study", datasetName); cmd.setRows(rows); try diff --git a/study/test/src/org/labkey/test/tests/study/StudyTest.java b/study/test/src/org/labkey/test/tests/study/StudyTest.java index 8eae18bd172..ea04e9672c2 100644 --- a/study/test/src/org/labkey/test/tests/study/StudyTest.java +++ b/study/test/src/org/labkey/test/tests/study/StudyTest.java @@ -22,7 +22,7 @@ import org.labkey.remoteapi.query.ContainerFilter; 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.Sort; @@ -151,7 +151,7 @@ public void runApiTests() throws Exception try { - SaveRowsResponse saveResp = insertCmd.execute(cn, getProjectName() + "/" + getFolderName()); + RowsResponse saveResp = insertCmd.execute(cn, getProjectName() + "/" + getFolderName()); // Spot check return values for inserted values and user defined and built-in columns in response assertEquals("Save rows return has incorrect value for: MouseId", "92104", saveResp.getRows().get(0).get("MouseId")); @@ -192,7 +192,7 @@ public void runApiTests() throws Exception try { - SaveRowsResponse updateResp = updateCmd.execute(cn, getProjectName() + "/" + getFolderName()); + RowsResponse updateResp = updateCmd.execute(cn, getProjectName() + "/" + getFolderName()); // Spot check response values for updated values and user defined and built-in columns assertEquals("Save rows return has incorrect value for: MouseId", "92104", updateResp.getRows().get(0).get("MouseId"));