From 4be0ba753d7b1194e1f586655915e6748d06740a Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Fri, 26 May 2023 15:04:54 +0200
Subject: [PATCH] SSDM-13524: Fixed create and update material executors
---
.../material/CreateMaterialTypesOperationExecutor.java | 7 +------
.../material/UpdateMaterialTypesOperationExecutor.java | 9 ++-------
2 files changed, 3 insertions(+), 13 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 a09e6037c47..9194dfa09fa 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
@@ -90,7 +90,7 @@ public class CreateMaterialTypesOperationExecutor
PropertyTypePE type =
findPropertyType(context,
propertyAssignmentCreation.getPropertyTypeId());
- if (type.getType() != null && INVALID_TYPES.contains(type.getType().getCode()))
+ if (type != null && type.getType() != null && INVALID_TYPES.contains(type.getType().getCode()))
{
return false;
}
@@ -106,11 +106,6 @@ public class CreateMaterialTypesOperationExecutor
Map<IPropertyTypeId, PropertyTypePE> propertyTypePEMap =
mapPropertyTypeByIdExecutor.map(context, Arrays.asList(propertyTypeId));
PropertyTypePE propertyTypePE = propertyTypePEMap.get(propertyTypeId);
-
- if (propertyTypePE == null)
- {
- throw new ObjectNotFoundException(propertyTypeId);
- }
return propertyTypePE;
}
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 de0dbb2a168..f947c0ebafc 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
@@ -92,7 +92,7 @@ public class UpdateMaterialTypesOperationExecutor
{
PropertyTypePE type =
findPropertyType(context, addedAssignments.getPropertyTypeId());
- if (type.getType() != null && INVALID_TYPES.contains(
+ if (type != null && type.getType() != null && INVALID_TYPES.contains(
type.getType().getCode()))
{
return false;
@@ -106,7 +106,7 @@ public class UpdateMaterialTypesOperationExecutor
{
PropertyTypePE type =
findPropertyType(context, setAssignments.getPropertyTypeId());
- if (type.getType() != null && INVALID_TYPES.contains(
+ if (type != null && type.getType() != null && INVALID_TYPES.contains(
type.getType().getCode()))
{
return false;
@@ -124,11 +124,6 @@ public class UpdateMaterialTypesOperationExecutor
Map<IPropertyTypeId, PropertyTypePE> propertyTypePEMap =
mapPropertyTypeByIdExecutor.map(context, Arrays.asList(propertyTypeId));
PropertyTypePE propertyTypePE = propertyTypePEMap.get(propertyTypeId);
-
- if (propertyTypePE == null)
- {
- throw new ObjectNotFoundException(propertyTypeId);
- }
return propertyTypePE;
}
--
GitLab