Skip to content

GitHub Issue 903: Remove Cross-Container Sample and Data Class Import Feature #3017

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

Open
XingY wants to merge 1 commit into
base: develop
Choose a base branch
from
+1 −15
Open

GitHub Issue 903: Remove Cross-Container Sample and Data Class Import Feature #3017

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
13 changes: 0 additions & 13 deletions src/org/labkey/remoteapi/query/ImportExperimentDataCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class ImportExperimentDataCommand extends ImportDataCommand
{
private AuditLogHelper.AuditBehaviorType _auditBehavior;
private Boolean _crossTypeImport;
private Boolean _crossFolderImport;
private String _containerPath;

public ImportExperimentDataCommand(String schemaName, String queryName, String containerPath)
Expand Down Expand Up @@ -42,16 +41,6 @@ public void setCrossTypeImport(Boolean crossTypeImport)
_crossTypeImport = crossTypeImport;
}

public Boolean getCrossFolderImport()
{
return _crossFolderImport;
}

public void setCrossFolderImport(Boolean crossFolderImport)
{
_crossFolderImport = crossFolderImport;
}

@Override
protected HttpPost createRequest(URI uri) {
HttpPost post = super.createRequest(uri);
Expand All @@ -61,8 +50,6 @@ protected HttpPost createRequest(URI uri) {
params.put("auditBehavior", _auditBehavior.name());
if (_crossTypeImport)
params.put("crossTypeImport", "true");
if (_crossFolderImport)
params.put("crossFolderImport", "true");
String url = WebTestHelper.buildURL("experiment", _containerPath, action, params);
try
{
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/test/util/query/QueryApiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,11 @@ public ImportDataResponse importData(File file, boolean importByAlternateKey) th
return importDataCommand.execute(_connection, _containerPath);
}

public ImportDataResponse importExperimentData(String text, AuditLogHelper.AuditBehaviorType auditBehaviorType, ImportDataCommand.InsertOption insertOption, boolean isCrossType, boolean isCrossFolder, boolean isAsync) throws IOException, CommandException
public ImportDataResponse importExperimentData(String text, AuditLogHelper.AuditBehaviorType auditBehaviorType, ImportDataCommand.InsertOption insertOption, boolean isCrossType, boolean isAsync) throws IOException, CommandException
{
ImportExperimentDataCommand importDataCommand = new ImportExperimentDataCommand(_schema, _query, _containerPath);
importDataCommand.setAuditBehavior(auditBehaviorType);
importDataCommand.setUseAsync(isAsync);
importDataCommand.setCrossFolderImport(isCrossFolder);
importDataCommand.setCrossTypeImport(isCrossType);
importDataCommand.setText(text);
importDataCommand.setInsertOption(insertOption);
Expand Down