From 135453a9f0ae75e5085c8416e494192df09b738f Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Sun, 8 Apr 2018 19:18:49 +0200
Subject: [PATCH] SSDM-6205 : V3 AS API Batch Imports - Expose legacy methods
using AS service - fix dependencies
---
.../generic/server/asapi/v3/helper/service/ImportService.java | 4 ++--
.../generic/client/web/server/CommonClientService.java | 2 +-
.../generic/{server => shared}/ICustomImportService.java | 2 +-
.../generic/{server => shared}/IEntityImportService.java | 2 +-
.../generic/client/web/server/GenericClientService.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{server => shared}/ICustomImportService.java (94%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{server => shared}/IEntityImportService.java (98%)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
index 1866d55cff7..1371cd7537f 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
@@ -24,8 +24,8 @@ import org.springframework.stereotype.Component;
import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.IImportService;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.openbis.generic.server.ICustomImportService;
-import ch.systemsx.cisd.openbis.generic.server.IEntityImportService;
+import ch.systemsx.cisd.openbis.generic.shared.ICustomImportService;
+import ch.systemsx.cisd.openbis.generic.shared.IEntityImportService;
import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BatchRegistrationResult;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index 6eb4083dcc9..5e40a49e48f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -123,8 +123,8 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.translator.SearchableE
import ch.systemsx.cisd.openbis.generic.client.web.server.translator.SearchableSearchDomainTranslator;
import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailureExceptionTranslator;
import ch.systemsx.cisd.openbis.generic.client.web.server.util.TSVRenderer;
-import ch.systemsx.cisd.openbis.generic.server.ICustomImportService;
import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
+import ch.systemsx.cisd.openbis.generic.shared.ICustomImportService;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchDomain;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchDomainSearchOption;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ICustomImportService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ICustomImportService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
index 1a2a9e0cb6b..9a36b36f53a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ICustomImportService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.server;
+package ch.systemsx.cisd.openbis.generic.shared;
import java.util.List;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityImportService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityImportService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
index f3015cc1eee..effab330fc8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityImportService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.server;
+package ch.systemsx.cisd.openbis.generic.shared;
import java.util.List;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index c86812246e5..2e25dc08210 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -49,10 +49,10 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.UploadedFilesBean;
import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue;
import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerTask;
import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailureExceptionTranslator;
-import ch.systemsx.cisd.openbis.generic.server.IEntityImportService;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.exception.SampleUniqueCodeViolationException;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.exception.SampleUniqueCodeViolationExceptionAbstract;
import ch.systemsx.cisd.openbis.generic.shared.Constants;
+import ch.systemsx.cisd.openbis.generic.shared.IEntityImportService;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
--
GitLab