From caa7826cbbdf31d6946de82d501c824a9a8a69a1 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Thu, 13 Apr 2023 09:16:40 +0200
Subject: [PATCH] SSDM-13256: Changing exception type to fix dependency test
---
.../xls/export/helper/AbstractXLSEntityTypeExportHelper.java | 2 +-
.../server/xls/export/helper/XLSVocabularyExportHelper.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
index 85930c3cff5..e58415f072f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
@@ -67,7 +67,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
{
if (permIds.size() != 1)
{
- throw new UserFailureException("For entity type export number of permIds should be equal to 1.");
+ throw new IllegalArgumentException("For entity type export number of permIds should be equal to 1.");
}
final ENTITY_TYPE entityType = getEntityType(api, sessionToken, permIds.get(0));
final Collection<String> warnings = new ArrayList<>();
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java
index 03e0edbd2de..e375a0d7298 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java
@@ -45,7 +45,6 @@ import ch.ethz.sis.openbis.generic.server.xls.export.FieldType;
import ch.ethz.sis.openbis.generic.server.xls.export.XLSExport;
import ch.ethz.sis.openbis.generic.server.xls.importer.enums.ImportTypes;
import ch.ethz.sis.openbis.generic.server.xls.importer.utils.VersionUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
public class XLSVocabularyExportHelper extends AbstractXLSExportHelper<IEntityType>
{
@@ -72,7 +71,7 @@ public class XLSVocabularyExportHelper extends AbstractXLSExportHelper<IEntityTy
{
if (permIds.size() != 1)
{
- throw new UserFailureException("For entity type export number of permIds should be equal to 1.");
+ throw new IllegalArgumentException("For entity type export number of permIds should be equal to 1.");
}
final Vocabulary vocabulary = getVocabulary(api, sessionToken, permIds.get(0));
final Collection<String> warnings = new ArrayList<>();
--
GitLab