From 0b7e32e14ebeab04954e3ced45e5c026742a7a9c Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 25 May 2023 14:24:30 +0200
Subject: [PATCH] SSDM-13524: Fixed import for the proper UserFailureException
in the executors.
---
.../material/CreateMaterialTypesOperationExecutor.java | 7 ++++---
.../material/UpdateMaterialTypesOperationExecutor.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
index 87946966e32..a09e6037c47 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
@@ -19,7 +19,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyAssignme
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.ObjectNotFoundException;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IMapPropertyTypeByIdExecutor;
-import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,8 @@ public class CreateMaterialTypesOperationExecutor
{
private static final List<DataTypeCode> INVALID_TYPES =
- Arrays.asList(DataTypeCode.ARRAY_INTEGER, DataTypeCode.ARRAY_STRING, DataTypeCode.ARRAY_REAL,
+ Arrays.asList(DataTypeCode.ARRAY_INTEGER, DataTypeCode.ARRAY_STRING,
+ DataTypeCode.ARRAY_REAL,
DataTypeCode.ARRAY_TIMESTAMP, DataTypeCode.JSON);
@Autowired
@@ -82,7 +83,7 @@ public class CreateMaterialTypesOperationExecutor
{
for (MaterialTypeCreation materialTypeCreation : materialTypeCreations)
{
- if(materialTypeCreation.getPropertyAssignments() != null)
+ if (materialTypeCreation.getPropertyAssignments() != null)
{
for (PropertyAssignmentCreation propertyAssignmentCreation : materialTypeCreation.getPropertyAssignments())
{
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
index 064cd81ab01..de0dbb2a168 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
@@ -19,7 +19,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyAssignme
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.ObjectNotFoundException;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IMapPropertyTypeByIdExecutor;
-import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
import org.springframework.beans.factory.annotation.Autowired;
--
GitLab