From c80682a2b8514ab26ca5c2521dc673ee34c1117b Mon Sep 17 00:00:00 2001 From: fedoreno <fedoreno> Date: Fri, 26 Feb 2016 14:56:59 +0000 Subject: [PATCH] SSDM-2780: json-ignoring getFetchOptionsStringBuilder's in DTOs SVN: 35750 --- .../v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java | 3 +++ .../generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java | 2 ++ .../asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java | 3 +++ .../v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java | 3 +++ .../dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java | 3 +++ .../v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java | 3 +++ .../v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java | 3 +++ .../v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java | 3 +++ .../v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java | 3 +++ .../v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java | 3 +++ .../v3/dto/deletion/fetchoptions/DeletionFetchOptions.java | 3 +++ .../v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java | 3 +++ .../experiment/fetchoptions/ExperimentTypeFetchOptions.java | 3 +++ .../dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java | 3 +++ .../global/fetchoptions/GlobalSearchObjectFetchOptions.java | 3 +++ .../v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java | 3 +++ .../v3/dto/material/fetchoptions/MaterialFetchOptions.java | 3 +++ .../v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java | 3 +++ .../fetchoptions/ObjectKindModificationFetchOptions.java | 3 +++ .../asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java | 3 +++ .../asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java | 3 +++ .../asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java | 3 +++ .../v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java | 3 +++ .../dto/service/fetchoptions/CustomASServiceFetchOptions.java | 3 +++ .../asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java | 3 +++ .../generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java | 3 +++ .../v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java | 3 +++ 27 files changed, 80 insertions(+) diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java index a94e57c8da8..7e256d7a242 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment; @@ -129,6 +130,8 @@ public class AttachmentFetchOptions extends FetchOptions<Attachment> implements { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java index 5623178a7c7..f8b905138d2 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java @@ -3,6 +3,8 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions; import java.io.Serializable; import java.util.HashSet; +import com.fasterxml.jackson.annotation.JsonIgnore; + import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.common.fetchoptions.FetchOptions") diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java index 2513c9fa77a..0ffbfce16e9 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -460,6 +461,8 @@ public class DataSetFetchOptions extends FetchOptions<DataSet> implements Serial { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java index 33e5803f48f..d14bb6d9ed5 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class DataSetTypeFetchOptions extends FetchOptions<DataSetType> implement { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java index 9653c34d6ce..a6501d76a53 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class FileFormatTypeFetchOptions extends FetchOptions<FileFormatType> imp { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java index 92f8d210dc4..894d0287e2f 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -78,6 +79,8 @@ public class LinkedDataFetchOptions extends FetchOptions<LinkedData> implements { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java index 5101c60bfaf..5284d5c4dbf 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class LocatorTypeFetchOptions extends FetchOptions<LocatorType> implement { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java index 46cfd8ebf2d..c3540aa41be 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -127,6 +128,8 @@ public class PhysicalDataFetchOptions extends FetchOptions<PhysicalData> impleme { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java index b69a381a1f9..08b3ececcc2 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class StorageFormatFetchOptions extends FetchOptions<StorageFormat> imple { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java index a0aaf1c2ae2..28c840c09ad 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class DataStoreFetchOptions extends FetchOptions<DataStore> implements Se { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java index 926654ba813..1ee2fa864d2 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -77,6 +78,8 @@ public class DeletionFetchOptions extends FetchOptions<Deletion> implements Seri { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java index 9eff0d2e9c5..5b9a0a847e0 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions; @@ -336,6 +337,8 @@ public class ExperimentFetchOptions extends FetchOptions<Experiment> implements { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java index d0394225b65..6ce94b02d96 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class ExperimentTypeFetchOptions extends FetchOptions<ExperimentType> imp { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java index 9f0cfd568c8..e76d9fade0f 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class ExternalDmsFetchOptions extends FetchOptions<ExternalDms> implement { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java index b64850d03ce..9a68937dbfb 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.global.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -156,6 +157,8 @@ public class GlobalSearchObjectFetchOptions extends FetchOptions<GlobalSearchObj { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java index c9b27b92b00..419c9660fce 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -78,6 +79,8 @@ public class HistoryEntryFetchOptions extends FetchOptions<HistoryEntry> impleme { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java index 4d81e7ff65e..0bb5164ab71 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -206,6 +207,8 @@ public class MaterialFetchOptions extends FetchOptions<Material> implements Seri { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java index 0907ac7251d..5a862b1fffb 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class MaterialTypeFetchOptions extends FetchOptions<MaterialType> impleme { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java index c4ea4dbf395..7665d91147d 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.objectkindmodification.fetchopt import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class ObjectKindModificationFetchOptions extends FetchOptions<ObjectKindM { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java index 881c418b716..0852d3adc6a 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -103,6 +104,8 @@ public class PersonFetchOptions extends FetchOptions<Person> implements Serializ { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java index fad32687453..0ec19b15961 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.project.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions; @@ -232,6 +233,8 @@ public class ProjectFetchOptions extends FetchOptions<Project> implements Serial { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java index 0821c926d1e..4f3df2c8272 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.fetchoptions.AttachmentFetchOptions; @@ -436,6 +437,8 @@ public class SampleFetchOptions extends FetchOptions<Sample> implements Serializ { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java index ace7cf64a2f..02532d3fe61 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class SampleTypeFetchOptions extends FetchOptions<SampleType> implements { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java index ffe67a66322..58a8f86da3f 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -52,6 +53,8 @@ public class CustomASServiceFetchOptions extends FetchOptions<CustomASService> i { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java index 1fc983912af..63491547875 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -130,6 +131,8 @@ public class SpaceFetchOptions extends FetchOptions<Space> implements Serializab { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java index f5f461d69e9..b7f7303ca43 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -78,6 +79,8 @@ public class TagFetchOptions extends FetchOptions<Tag> implements Serializable { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java index 9b9ea8b389d..0c8aeaf3395 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions; @@ -78,6 +79,8 @@ public class VocabularyFetchOptions extends FetchOptions<Vocabulary> implements { return sort; } + + @JsonIgnore @Override public FetchOptionsToStringBuilder getFetchOptionsStringBuilder() { -- GitLab