Skip to content

Commit 3b0a9f3

Browse files
authored
Rename SaveRowsResponse to RowsResponse (#6860)
1 parent d37f052 commit 3b0a9f3

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

study/test/src/org/labkey/test/tests/search/DataClassSearchTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.labkey.remoteapi.SimplePostCommand;
2727
import org.labkey.remoteapi.query.DeleteRowsCommand;
2828
import org.labkey.remoteapi.query.InsertRowsCommand;
29-
import org.labkey.remoteapi.query.SaveRowsResponse;
29+
import org.labkey.remoteapi.query.RowsResponse;
3030
import org.labkey.remoteapi.query.UpdateRowsCommand;
3131
import org.labkey.test.BaseWebDriverTest;
3232
import org.labkey.test.Locator;
@@ -217,7 +217,7 @@ private void addSearchableDataClasses() throws Exception
217217
row2.put("foodColor", "white");
218218
row2.put("sequence", "ichi\nni\nsan");
219219
insertRowsCommand.setRows(new ArrayList<>(Arrays.asList(row1, row2)));
220-
SaveRowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath());
220+
RowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath());
221221

222222
List<Map<String, Object>> responseRows = insertResponse.getRows();
223223
dataClassRowIds[0] = (int)responseRows.get(0).get("rowid");
@@ -272,7 +272,7 @@ private void modifySearchableDataClasses() throws Exception
272272
row1.put("name", DATA_CLASS_3_NAME);
273273
row1.put("iceCreamFlavor", "raspberry");
274274
insertRowsCommand.addRow(row1);
275-
SaveRowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath());
275+
RowsResponse insertResponse = insertRowsCommand.execute(connection, getCurrentContainerPath());
276276
List<Map<String, Object>> responseRows = insertResponse.getRows();
277277
dataClassRowIds[2] = (int)responseRows.get(0).get("rowid");
278278

study/test/src/org/labkey/test/tests/study/StudyDatasetLsidTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.labkey.remoteapi.CommandException;
1010
import org.labkey.remoteapi.Connection;
1111
import org.labkey.remoteapi.query.InsertRowsCommand;
12-
import org.labkey.remoteapi.query.SaveRowsResponse;
12+
import org.labkey.remoteapi.query.RowsResponse;
1313
import org.labkey.remoteapi.query.SelectRowsCommand;
1414
import org.labkey.remoteapi.query.SelectRowsResponse;
1515
import org.labkey.remoteapi.query.UpdateRowsCommand;
@@ -202,7 +202,7 @@ public void testMVIndicator() throws Exception
202202
.create(conn, containerPath);
203203

204204
log("Validate inserting into the MV indicator dataset");
205-
SaveRowsResponse response = expectSuccess(conn, MV_INDICATOR_DATASET, containerPath,
205+
RowsResponse response = expectSuccess(conn, MV_INDICATOR_DATASET, containerPath,
206206
List.of(
207207
Map.of("Ptid", "111", "Visit", 1, "IntField", "N", "StringField", "Q"),
208208
Map.of("Ptid", "222", "Visit", 2, "IntField", 1, "StringField", "StringValue"),
@@ -224,7 +224,7 @@ public void testMVIndicator() throws Exception
224224
cmd.setRows(updated);
225225
try
226226
{
227-
SaveRowsResponse resp = cmd.execute(conn, containerPath);
227+
RowsResponse resp = cmd.execute(conn, containerPath);
228228
List<Map<String, Object>> updatedRows = resp.getRows();
229229
validateValuesPresent(updatedRows.get(0), Map.of("IntFieldMvIndicator", "Z", "StringFieldMvIndicator", "Q"));
230230
validateValuesPresent(updatedRows.get(1), Map.of("IntField", 1, "StringFieldMvIndicator", "Q"));
@@ -365,19 +365,19 @@ public void testDateBasedStudy() throws Exception
365365
validateUpdateOfGeneratedColumns(conn, containerPath, TIME_PORTION_OF_DATE);
366366
}
367367

368-
private SaveRowsResponse expectSuccess(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
368+
private RowsResponse expectSuccess(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
369369
{
370370
return validateInsertRows(conn, datasetName, containerPath, rows, false);
371371
}
372372

373-
private SaveRowsResponse expectFail(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
373+
private RowsResponse expectFail(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows) throws Exception
374374
{
375375
return validateInsertRows(conn, datasetName, containerPath, rows, true);
376376
}
377377

378-
private SaveRowsResponse validateInsertRows(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows, boolean fail) throws Exception
378+
private RowsResponse validateInsertRows(Connection conn, String datasetName, String containerPath, List<Map<String, Object>> rows, boolean fail) throws Exception
379379
{
380-
SaveRowsResponse resp = null;
380+
RowsResponse resp = null;
381381
InsertRowsCommand cmd = new InsertRowsCommand("Study", datasetName);
382382
cmd.setRows(rows);
383383
try

study/test/src/org/labkey/test/tests/study/StudyTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.labkey.remoteapi.query.ContainerFilter;
2323
import org.labkey.remoteapi.query.Filter;
2424
import org.labkey.remoteapi.query.InsertRowsCommand;
25-
import org.labkey.remoteapi.query.SaveRowsResponse;
25+
import org.labkey.remoteapi.query.RowsResponse;
2626
import org.labkey.remoteapi.query.SelectRowsCommand;
2727
import org.labkey.remoteapi.query.SelectRowsResponse;
2828
import org.labkey.remoteapi.query.Sort;
@@ -151,7 +151,7 @@ public void runApiTests() throws Exception
151151

152152
try
153153
{
154-
SaveRowsResponse saveResp = insertCmd.execute(cn, getProjectName() + "/" + getFolderName());
154+
RowsResponse saveResp = insertCmd.execute(cn, getProjectName() + "/" + getFolderName());
155155

156156
// Spot check return values for inserted values and user defined and built-in columns in response
157157
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
192192

193193
try
194194
{
195-
SaveRowsResponse updateResp = updateCmd.execute(cn, getProjectName() + "/" + getFolderName());
195+
RowsResponse updateResp = updateCmd.execute(cn, getProjectName() + "/" + getFolderName());
196196

197197
// Spot check response values for updated values and user defined and built-in columns
198198
assertEquals("Save rows return has incorrect value for: MouseId", "92104", updateResp.getRows().get(0).get("MouseId"));

0 commit comments

Comments
 (0)