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

Author: XingY

src/org/labkey/remoteapi/query/ImportExperimentDataCommand.java

@@ -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)
@@ -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);
@@ -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
         {

src/org/labkey/test/util/query/QueryApiHelper.java

@@ -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);