From 398769dad0eabbbfdf6c4eb6163bc52d04fb33e2 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Mon, 25 Sep 2023 10:05:22 +0200
Subject: [PATCH] SSDM-55: fixed properties initialization, cleaned up unused
imports
---
.../v3/dto/common/entity/AbstractEntityPropertyHolder.java | 2 +-
.../generic/asapi/v3/dto/sample/create/SampleCreation.java | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/entity/AbstractEntityPropertyHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/entity/AbstractEntityPropertyHolder.java
index 19a341d86d6..e1ada597066 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/entity/AbstractEntityPropertyHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/entity/AbstractEntityPropertyHolder.java
@@ -36,7 +36,7 @@ public abstract class AbstractEntityPropertyHolder implements Serializable, IPro
{
@JsonProperty
@JsonDeserialize(contentUsing = PropertiesDeserializer.class)
- protected Map<String, Serializable> properties;
+ protected Map<String, Serializable> properties = new HashMap<>();
@JsonIgnore
public abstract Map<String, Serializable> getProperties();
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
index 8621b9bc67b..cc9fe67b1d4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
@@ -15,15 +15,9 @@
*/
package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create;
-import java.io.Serializable;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.entity.AbstractEntityCreation;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.property.PropertiesDeserializer;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
--
GitLab