diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java index 2fed29f7fb78973b6f81a4033e8159d22a3006e3..b16b4070dad5d0d2f3fa2c5ae5a62ea3729fcbbe 100644 --- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java +++ b/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; diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java index d96f0e47e5aa1f6df283541db8d2b4025b6ca05b..f91f373c4d5e50264fa711fc888f228b4b9e4af3 100644 --- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java +++ b/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;