Skip to content

Commit 8dabc44

Browse files
authored
Rename SaveRowsResponse to RowsResponse (#995)
1 parent e838ce5 commit 8dabc44

3 files changed

Lines changed: 15 additions & 16 deletions

File tree

Viral_Load_Assay/test/src/org/labkey/test/tests/external/labModules/ViralLoadAssayTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.labkey.remoteapi.Connection;
2525
import org.labkey.remoteapi.query.Filter;
2626
import org.labkey.remoteapi.query.InsertRowsCommand;
27-
import org.labkey.remoteapi.query.SaveRowsResponse;
27+
import org.labkey.remoteapi.query.RowsResponse;
2828
import org.labkey.remoteapi.query.SelectRowsCommand;
2929
import org.labkey.remoteapi.query.SelectRowsResponse;
3030
import org.labkey.test.Locator;
@@ -394,7 +394,7 @@ private void ensureABI7500Records() throws CommandException, IOException
394394
rowMap.put("detector", DETECTOR_NAME);
395395
rowMap.put("reporter", "FAM");
396396
insertCmd.addRow(rowMap);
397-
SaveRowsResponse saveResp = insertCmd.execute(cn, getProjectName());
397+
RowsResponse saveResp = insertCmd.execute(cn, getProjectName());
398398
assertEquals("Problem creating record", 1, saveResp.getRowsAffected());
399399
}
400400
else

ehr/test/src/org/labkey/test/util/ehr/EHRClientAPIHelper.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
import org.labkey.remoteapi.query.DeleteRowsCommand;
2929
import org.labkey.remoteapi.query.Filter;
3030
import org.labkey.remoteapi.query.InsertRowsCommand;
31-
import org.labkey.remoteapi.query.SaveRowsCommand;
32-
import org.labkey.remoteapi.query.SaveRowsResponse;
31+
import org.labkey.remoteapi.query.RowsResponse;
3332
import org.labkey.remoteapi.query.SelectRowsCommand;
3433
import org.labkey.remoteapi.query.SelectRowsResponse;
3534
import org.labkey.remoteapi.query.UpdateRowsCommand;
@@ -110,13 +109,13 @@ public int getRowCount(String schema, String query) throws Exception
110109
return resp.getRowCount().intValue();
111110
}
112111

113-
public SaveRowsResponse insertRow(String schema, String query, Map<String, Object> row, boolean expectFailure) throws CommandException
112+
public RowsResponse insertRow(String schema, String query, Map<String, Object> row, boolean expectFailure) throws CommandException
114113
{
115114
try
116115
{
117116
InsertRowsCommand insertCmd = new InsertRowsCommand(schema, query);
118117
insertCmd.addRow(row);
119-
SaveRowsResponse resp = insertCmd.execute(getConnection(), _containerPath);
118+
RowsResponse resp = insertCmd.execute(getConnection(), _containerPath);
120119

121120
if (expectFailure)
122121
throw new RuntimeException("Expected command to fail");
@@ -137,14 +136,14 @@ public SaveRowsResponse insertRow(String schema, String query, Map<String, Objec
137136
}
138137
}
139138

140-
public SaveRowsResponse updateRow(String schema, String query, Map<String, Object> row, boolean expectFailure) throws CommandException
139+
public RowsResponse updateRow(String schema, String query, Map<String, Object> row, boolean expectFailure) throws CommandException
141140
{
142141
try
143142
{
144-
SaveRowsCommand cmd = new UpdateRowsCommand(schema, query);
143+
UpdateRowsCommand cmd = new UpdateRowsCommand(schema, query);
145144
cmd.addRow(row);
146145

147-
SaveRowsResponse resp = cmd.execute(getConnection(), _containerPath);
146+
RowsResponse resp = cmd.execute(getConnection(), _containerPath);
148147

149148
if (expectFailure)
150149
throw new RuntimeException("Expected command to fail");
@@ -172,14 +171,14 @@ public void deleteIfExists(String schema, String query, Map<String, Object> row,
172171
}
173172
}
174173

175-
public SaveRowsResponse deleteRow(String schema, String query, Map<String, Object> row, String pkCol, boolean expectFailure) throws CommandException
174+
public RowsResponse deleteRow(String schema, String query, Map<String, Object> row, String pkCol, boolean expectFailure) throws CommandException
176175
{
177176
try
178177
{
179178
DeleteRowsCommand cmd = new DeleteRowsCommand(schema, query);
180179
cmd.addRow(row);
181180

182-
SaveRowsResponse resp = cmd.execute(getConnection(), _containerPath);
181+
RowsResponse resp = cmd.execute(getConnection(), _containerPath);
183182
if (expectFailure)
184183
throw new RuntimeException("Expected command to fail");
185184

@@ -445,7 +444,7 @@ public int deleteAllRecords(String schemaName, String queryName, Filter filter)
445444

446445
if (!dr.getRows().isEmpty())
447446
{
448-
SaveRowsResponse resp = dr.execute(getConnection(), _containerPath);
447+
RowsResponse resp = dr.execute(getConnection(), _containerPath);
449448
return resp.getRowsAffected().intValue();
450449
}
451450

snd/test/src/org/labkey/test/tests/snd/SNDTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.labkey.remoteapi.query.DeleteRowsCommand;
2929
import org.labkey.remoteapi.query.Filter;
3030
import org.labkey.remoteapi.query.InsertRowsCommand;
31-
import org.labkey.remoteapi.query.SaveRowsResponse;
31+
import org.labkey.remoteapi.query.RowsResponse;
3232
import org.labkey.remoteapi.query.SelectRowsCommand;
3333
import org.labkey.remoteapi.query.SelectRowsResponse;
3434
import org.labkey.remoteapi.query.TruncateTableCommand;
@@ -1497,7 +1497,7 @@ public void deleteCategoryViaUI() throws Exception
14971497
catMap.put("Active", true);
14981498
catMap.put("Comment", "delete me");
14991499
cmd.addRow(catMap);
1500-
SaveRowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName());
1500+
RowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName());
15011501

15021502
PackageListPage listPage = PackageListPage.beginAt(this , getProjectName());
15031503
EditCategoriesPage catPage = listPage.clickEditCategories();
@@ -1530,7 +1530,7 @@ public void editCategories() throws Exception
15301530
catMap.put("Active", true);
15311531
catMap.put("Comment", "edit me so hard!"); // comment is not shown in the UI
15321532
cmd.addRow(catMap);
1533-
SaveRowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName());
1533+
RowsResponse response = cmd.execute(createDefaultConnection(false), getProjectName());
15341534
assertEquals(200, response.getStatusCode());
15351535

15361536
PackageListPage listPage = PackageListPage.beginAt(this , getProjectName());
@@ -1572,7 +1572,7 @@ public void testExtensibleColumns() throws Exception
15721572
insertRowsCommand.addRow(TEST1ROW1MAP);
15731573
insertRowsCommand.addRow(TEST1ROW2MAP);
15741574
insertRowsCommand.addRow(TEST1ROW3MAP);
1575-
SaveRowsResponse resp = insertRowsCommand.execute(cn, getProjectName() + "/" + TEST1SUBFOLDER);
1575+
RowsResponse resp = insertRowsCommand.execute(cn, getProjectName() + "/" + TEST1SUBFOLDER);
15761576
assertEquals(3, resp.getRowsAffected().intValue());
15771577

15781578
goToSchemaBrowser();

0 commit comments

Comments
 (0)