Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
19 changes: 9 additions & 10 deletions ehr/test/src/org/labkey/test/util/ehr/EHRClientAPIHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String, Object> row, boolean expectFailure) throws CommandException
public RowsResponse insertRow(String schema, String query, Map<String, Object> 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");
Expand All @@ -137,14 +136,14 @@ public SaveRowsResponse insertRow(String schema, String query, Map<String, Objec
}
}

public SaveRowsResponse updateRow(String schema, String query, Map<String, Object> row, boolean expectFailure) throws CommandException
public RowsResponse updateRow(String schema, String query, Map<String, Object> 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");
Expand Down Expand Up @@ -172,14 +171,14 @@ public void deleteIfExists(String schema, String query, Map<String, Object> row,
}
}

public SaveRowsResponse deleteRow(String schema, String query, Map<String, Object> row, String pkCol, boolean expectFailure) throws CommandException
public RowsResponse deleteRow(String schema, String query, Map<String, Object> 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");

Expand Down Expand Up @@ -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();
}

Expand Down
8 changes: 4 additions & 4 deletions snd/test/src/org/labkey/test/tests/snd/SNDTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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();
Expand Down