SSDM-127 : GENERAL - Delete project/experiment/sample/dataset - fix failing tests

SVN: 32555

openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java

@@ -18,7 +18,11 @@ package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import ch.systemsx.cisd.base.annotation.JsonObject;
+import ch.systemsx.cisd.openbis.generic.shared.api.v1.util.JsonPropertyUtil;
 
 /**
  * @author pkupczyk
@@ -41,16 +45,30 @@ public class DeletedEntity implements Serializable
 
     private EntityKind entityKind;
 
+    @JsonIgnore
     public Long getId()
     {
         return id;
     }
 
+    @JsonIgnore
     public void setId(Long id)
     {
         this.id = id;
     }
 
+    @JsonProperty("id")
+    private String getIdAsString()
+    {
+        return JsonPropertyUtil.toStringOrNull(id);
+    }
+
+    @JsonProperty("id")
+    private void setIdAsString(String id)
+    {
+        this.id = JsonPropertyUtil.toLongOrNull(id);
+    }
+
     public String getCode()
     {
         return code;

openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java

@@ -20,7 +20,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import ch.systemsx.cisd.base.annotation.JsonObject;
+import ch.systemsx.cisd.openbis.generic.shared.api.v1.util.JsonPropertyUtil;
 
 /**
  * @author pkupczyk
@@ -43,16 +47,30 @@ public class Deletion implements Serializable
 
     private List<DeletedEntity> deletedEntities = new ArrayList<DeletedEntity>();
 
+    @JsonIgnore
     public Long getId()
     {
         return id;
     }
 
+    @JsonIgnore
     public void setId(Long id)
     {
         this.id = id;
     }
 
+    @JsonProperty("id")
+    private String getIdAsString()
+    {
+        return JsonPropertyUtil.toStringOrNull(id);
+    }
+
+    @JsonProperty("id")
+    private void setIdAsString(String id)
+    {
+        this.id = JsonPropertyUtil.toLongOrNull(id);
+    }
+
     public int getTotalSamplesCount()
     {
         return totalSamplesCount;