From 462012b9d7d87c9b4875584aefcc8408025a1c6f Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Mon, 21 Aug 2023 14:49:26 +0200
Subject: [PATCH] SSDM-13926: Added "I" at the beginning of the names of the
interfaces.
---
.../asapi/v3/IApplicationServerApi.java | 4 ++--
.../asapi/v3/dto/exporter/data/AllFields.java | 2 +-
.../v3/dto/exporter/data/ExportData.java | 6 +++---
...ableFields.java => IExportableFields.java} | 4 ++--
.../v3/dto/exporter/data/SelectedFields.java | 2 +-
.../v3/dto/importer/ImportOperation.java | 8 +++----
.../{ImportData.java => IImportData.java} | 4 ++--
.../importer/data/UncompressedImportData.java | 2 +-
.../v3/dto/importer/data/ZipImportData.java | 2 +-
.../server/asapi/v3/ApplicationServerApi.java | 4 ++--
.../asapi/v3/ApplicationServerApiLogger.java | 6 +++---
...iPersonalAccessTokenInvocationHandler.java | 4 ++--
.../v3/executor/importer/ImportExecutor.java | 4 ++--
.../asapi/v3/UncompressedImportTest.java | 19 +++++++----------
.../systemtest/asapi/v3/ZipImportTest.java | 21 +++++++------------
15 files changed, 40 insertions(+), 52 deletions(-)
rename api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/{ExportableFields.java => IExportableFields.java} (88%)
rename api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/{ImportData.java => IImportData.java} (88%)
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
index 976bf70c80f..50a3642462e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
@@ -86,7 +86,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.update.ExternalDmsUp
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.fetchoptions.GlobalSearchObjectFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchCriteria;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
@@ -2259,7 +2259,7 @@ public interface IApplicationServerApi extends IRpcService
*/
public List<String> createCodes(String sessionToken, String prefix, EntityKind entityKind, int count);
- public void executeImport(String sessionToken, ImportData importData, ImportOptions importOptions);
+ public void executeImport(String sessionToken, IImportData importData, ImportOptions importOptions);
// public ExportResult executeExport(String sessionToken, ExportData exportData, ExportOptions exportOptions);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
index 8fc5182893e..b1ca6edd3ab 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
@@ -24,7 +24,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.exporter.AllFields")
-public class AllFields implements Serializable, ExportableFields
+public class AllFields implements Serializable, IExportableFields
{
private static final long serialVersionUID = 1L;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
index 7799d0fa1ec..1450b3b17f6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
@@ -30,9 +30,9 @@ public class ExportData implements Serializable
private final List<ExportablePermId> permIds;
- private final ExportableFields fields;
+ private final IExportableFields fields;
- public ExportData(final List<ExportablePermId> permIds, final ExportableFields fields)
+ public ExportData(final List<ExportablePermId> permIds, final IExportableFields fields)
{
this.permIds = permIds;
this.fields = fields;
@@ -43,7 +43,7 @@ public class ExportData implements Serializable
return permIds;
}
- public ExportableFields getFields()
+ public IExportableFields getFields()
{
return fields;
}
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
similarity index 88%
rename from api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableFields.java
rename to api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
index 5c47d853845..77a31d865f2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.ExportableFields")
-public interface ExportableFields extends Serializable
+@JsonObject("as.dto.exporter.IExportableFields")
+public interface IExportableFields extends Serializable
{
}
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
index a414a646eac..79c8535cb61 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
@@ -24,7 +24,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.exporter.SelectedFields")
-public class SelectedFields implements Serializable, ExportableFields
+public class SelectedFields implements Serializable, IExportableFields
{
private static final long serialVersionUID = 1L;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java
index 3ff22ead935..d837f23a1cc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
import ch.systemsx.cisd.base.annotation.JsonObject;
@@ -31,11 +31,11 @@ public class ImportOperation implements Serializable, IOperation
private static final long serialVersionUID = 1L;
- private final ImportData importData;
+ private final IImportData importData;
private final ImportOptions importOptions;
- public ImportOperation(final ImportData importData, final ImportOptions importOptions)
+ public ImportOperation(final IImportData importData, final ImportOptions importOptions)
{
this.importData = importData;
this.importOptions = importOptions;
@@ -47,7 +47,7 @@ public class ImportOperation implements Serializable, IOperation
return toString();
}
- public ImportData getImportData()
+ public IImportData getImportData()
{
return importData;
}
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
similarity index 88%
rename from api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportData.java
rename to api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
index 35820a12b69..f85d5b01578 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.importer.ImportData")
-public abstract interface ImportData extends Serializable
+@JsonObject("as.dto.importer.IImportData")
+public abstract interface IImportData extends Serializable
{
}
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
index fb23e9e9e8a..ea74c57454c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
@@ -23,7 +23,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.importer.UncompressedImportData")
-public class UncompressedImportData implements Serializable, ImportData
+public class UncompressedImportData implements Serializable, IImportData
{
private static final long serialVersionUID = 1L;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
index 822b09d9c41..4538c06d458 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
@@ -22,7 +22,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.importer.ZipImportData")
-public class ZipImportData implements Serializable, ImportData
+public class ZipImportData implements Serializable, IImportData
{
private static final long serialVersionUID = 1L;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
index a13f3e4bb25..6aa3bd93402 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
@@ -168,7 +168,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchCriter
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.SearchGloballyOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.SearchGloballyOperationResult;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.ImportOperation;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
@@ -1813,7 +1813,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
}
@Override
- public void executeImport(final String sessionToken, final ImportData importData, final ImportOptions importOptions)
+ public void executeImport(final String sessionToken, final IImportData importData, final ImportOptions importOptions)
{
executeOperation(sessionToken, new ImportOperation(importData, importOptions));
}
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
index f22e5f58378..e2c20fbece7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
@@ -87,7 +87,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.update.ExternalDmsUp
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.fetchoptions.GlobalSearchObjectFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchCriteria;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
@@ -1366,9 +1366,9 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements
}
@Override
- public void executeImport(final String sessionToken, final ImportData importData, final ImportOptions importOptions)
+ public void executeImport(final String sessionToken, final IImportData importData, final ImportOptions importOptions)
{
- logAccess(sessionToken, "execute-import", "ImportData(%s) ImportOptions(%s)", importData, importOptions);
+ logAccess(sessionToken, "execute-import", "IImportData(%s) ImportOptions(%s)", importData, importOptions);
}
}
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java
index 7b13dffafa7..d7d792f889e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java
@@ -88,7 +88,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.update.ExternalDmsUp
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.fetchoptions.GlobalSearchObjectFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchCriteria;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
@@ -1255,7 +1255,7 @@ public class ApplicationServerApiPersonalAccessTokenInvocationHandler implements
}
@Override
- public void executeImport(final String sessionToken, final ImportData importData, final ImportOptions importOptions)
+ public void executeImport(final String sessionToken, final IImportData importData, final ImportOptions importOptions)
{
invocation.proceedWithNewFirstArgument(converter.convert(sessionToken));
}
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/importer/ImportExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/importer/ImportExecutor.java
index 8d8ca3e8b05..a7ca1800cd9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/importer/ImportExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/importer/ImportExecutor.java
@@ -28,7 +28,7 @@ import java.util.zip.ZipInputStream;
import org.springframework.stereotype.Component;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.ImportOperation;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportScript;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.UncompressedImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ZipImportData;
@@ -57,7 +57,7 @@ public class ImportExecutor implements IImportExecutor
@Override
public void doImport(final IOperationContext context, final ImportOperation operation)
{
- final ImportData importData = operation.getImportData();
+ final IImportData importData = operation.getImportData();
try
{
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java
index 6afe5631e1f..278bf1ac735 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UncompressedImportTest.java
@@ -19,20 +19,15 @@ package ch.ethz.sis.openbis.systemtest.asapi.v3;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportFormat;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportScript;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.UncompressedImportData;
@@ -58,7 +53,7 @@ public class UncompressedImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("import.xlsx"), null);
+ final IImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("import.xlsx"), null);
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -86,7 +81,7 @@ public class UncompressedImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
+ final IImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -118,7 +113,7 @@ public class UncompressedImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
+ final IImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
final ImportOptions importOptions = new ImportOptions(ImportMode.IGNORE_EXISTING);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -150,7 +145,7 @@ public class UncompressedImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
+ final IImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.xlsx"), null);
final ImportOptions importOptions = new ImportOptions(ImportMode.FAIL_IF_EXISTS);
try
@@ -169,7 +164,7 @@ public class UncompressedImportTest extends AbstractImportTest
final String name = "valid.py";
final String source = "print 'Test validation script'";
- final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("validation_script.xls"),
+ final IImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("validation_script.xls"),
List.of(new ImportScript(name, source)));
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
@@ -203,7 +198,7 @@ public class UncompressedImportTest extends AbstractImportTest
final String name = "dynamic.py";
final String source = "1+1";
- final ImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("dynamic_script.xls"),
+ final IImportData importData = new UncompressedImportData(ImportFormat.XLS, getFileContent("dynamic_script.xls"),
List.of(new ImportScript(name, source)));
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java
index ac570045563..f8938b68926 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ZipImportTest.java
@@ -19,23 +19,16 @@ package ch.ethz.sis.openbis.systemtest.asapi.v3;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportFormat;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportScript;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.UncompressedImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ZipImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportMode;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
@@ -59,7 +52,7 @@ public class ZipImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("import.zip"));
+ final IImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("import.zip"));
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -87,7 +80,7 @@ public class ZipImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
+ final IImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -119,7 +112,7 @@ public class ZipImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
+ final IImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
final ImportOptions importOptions = new ImportOptions(ImportMode.IGNORE_EXISTING);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -151,7 +144,7 @@ public class ZipImportTest extends AbstractImportTest
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
- final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
+ final IImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("existing_vocabulary.zip"));
final ImportOptions importOptions = new ImportOptions(ImportMode.FAIL_IF_EXISTS);
try
@@ -170,7 +163,7 @@ public class ZipImportTest extends AbstractImportTest
final String name = "valid.py";
final String source = "print 'Test validation script'";
- final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("validation_script.zip"));
+ final IImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("validation_script.zip"));
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
v3api.executeImport(sessionToken, importData, importOptions);
@@ -203,7 +196,7 @@ public class ZipImportTest extends AbstractImportTest
final String name = "dynamic.py";
final String source = "1+1";
- final ImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("dynamic_script.zip"));
+ final IImportData importData = new ZipImportData(ImportFormat.XLS, getFileContent("dynamic_script.zip"));
final ImportOptions importOptions = new ImportOptions(ImportMode.UPDATE_IF_EXISTS);
v3api.executeImport(sessionToken, importData, importOptions);
--
GitLab