Skip to content

Rename SaveRowsResponse to RowsResponse #6860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 1 commit into from
Jul 18, 2025
Merged

Rename SaveRowsResponse to RowsResponse #6860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions study/test/src/org/labkey/test/tests/search/DataClassSearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<Map<String, Object>> responseRows = insertResponse.getRows();
dataClassRowIds[0] = (int)responseRows.get(0).get("rowid");
Expand Down Expand Up @@ -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<Map<String, Object>> responseRows = insertResponse.getRows();
dataClassRowIds[2] = (int)responseRows.get(0).get("rowid");

Expand Down
14 changes: 7 additions & 7 deletions study/test/src/org/labkey/test/tests/study/StudyDatasetLsidTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"),
Expand All @@ -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<Map<String, Object>> updatedRows = resp.getRows();
validateValuesPresent(updatedRows.get(0), Map.of("IntFieldMvIndicator", "Z", "StringFieldMvIndicator", "Q"));
validateValuesPresent(updatedRows.get(1), Map.of("IntField", 1, "StringFieldMvIndicator", "Q"));
Expand Down Expand Up @@ -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<Map<String, Object>> rows) throws Exception
private RowsResponse expectSuccess(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
{
return validateInsertRows(conn, datasetName, containerPath, rows, false);
}

private SaveRowsResponse expectFail(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
private RowsResponse expectFail(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
{
return validateInsertRows(conn, datasetName, containerPath, rows, true);
}

private SaveRowsResponse validateInsertRows(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows, boolean fail) throws Exception
private RowsResponse validateInsertRows(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows, boolean fail) throws Exception
{
SaveRowsResponse resp = null;
RowsResponse resp = null;
InsertRowsCommand cmd = new InsertRowsCommand("Study", datasetName);
cmd.setRows(rows);
try
Expand Down
6 changes: 3 additions & 3 deletions study/test/src/org/labkey/test/tests/study/StudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down