From f15e9608a37c5ac6bf7e1e1280c041454067b489 Mon Sep 17 00:00:00 2001 From: vkovtun <viktor.kovtun@id.ethz.ch> Date: Mon, 21 Aug 2023 10:57:11 +0200 Subject: [PATCH] SSDM-13926: Added missing toString() methods to fix the api-openbis-java Jenkins build. --- .../generic/asapi/v3/dto/exporter/ExportResult.java | 7 +++++++ .../generic/asapi/v3/dto/exporter/data/AllFields.java | 7 +++++++ .../generic/asapi/v3/dto/exporter/data/ExportData.java | 7 +++++++ .../asapi/v3/dto/exporter/data/ExportablePermId.java | 7 +++++++ .../asapi/v3/dto/exporter/data/SelectedFields.java | 7 +++++++ .../asapi/v3/dto/exporter/options/ExportOptions.java | 8 ++++++++ .../generic/asapi/v3/dto/importer/ImportOperation.java | 7 +++++++ .../generic/asapi/v3/dto/importer/data/ImportScript.java | 7 +++++++ .../v3/dto/importer/data/UncompressedImportData.java | 7 +++++++ .../generic/asapi/v3/dto/importer/data/ZipImportData.java | 7 +++++++ .../asapi/v3/dto/importer/options/ImportOptions.java | 7 +++++++ 11 files changed, 78 insertions(+) diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportResult.java index 558b55cc177..cf076159c00 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportResult.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportResult.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter; import java.io.Serializable; import java.util.Collection; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.exporter.ExportResult") @@ -47,4 +48,10 @@ public class ExportResult implements Serializable return warnings; } + @Override + public String toString() + { + return new ObjectToString(this).append("downloadURL", downloadURL).append("warnings", warnings).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java index 4bf7716da97..6359ec96d47 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data; import java.io.Serializable; import java.util.List; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId; import ch.systemsx.cisd.base.annotation.JsonObject; @@ -38,4 +39,10 @@ public class AllFields implements Serializable, ExportableFields return null; } + @Override + public String toString() + { + return new ObjectToString(this).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java index ca1f48d758d..7799d0fa1ec 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data; import java.io.Serializable; import java.util.List; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.exporter.ExportData") @@ -47,4 +48,10 @@ public class ExportData implements Serializable return fields; } + @Override + public String toString() + { + return new ObjectToString(this).append("permIds", permIds).append("fields", fields).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java index 2193b7148e1..34a0438905b 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data; import java.io.Serializable; import java.util.Objects; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId; import ch.systemsx.cisd.base.annotation.JsonObject; @@ -48,4 +49,10 @@ public class ExportablePermId implements Serializable return permId; } + @Override + public String toString() + { + return new ObjectToString(this).append("exportableKind", exportableKind).append("permId", permId).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java index bf59141e7e5..a414a646eac 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data; import java.io.Serializable; import java.util.List; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId; import ch.systemsx.cisd.base.annotation.JsonObject; @@ -48,4 +49,10 @@ public class SelectedFields implements Serializable, ExportableFields return properties; } + @Override + public String toString() + { + return new ObjectToString(this).append("attributes", attributes).append("properties", properties).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java index f337d0b307f..be2058c7dc6 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options; import java.io.Serializable; import java.util.Set; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.exporter.ExportOptions") @@ -64,4 +65,11 @@ public class ExportOptions implements Serializable return withImportCompatibility; } + @Override + public String toString() + { + return new ObjectToString(this).append("formats", formats).append("xlsTextFormat", xlsTextFormat) + .append("withReferredTypes", withReferredTypes).append("withImportCompatibility", withImportCompatibility).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java index 5cdf385f20a..3ff22ead935 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer; import java.io.Serializable; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation; import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportData; import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions; @@ -56,4 +57,10 @@ public class ImportOperation implements Serializable, IOperation return importOptions; } + @Override + public String toString() + { + return new ObjectToString(this).append("importData", importData).append("importOptions", importOptions).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java index a7746593f67..818b3f84aa8 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java @@ -18,6 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data; import java.io.Serializable; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.exporter.ImportScript") @@ -46,4 +47,10 @@ public class ImportScript implements Serializable return source; } + @Override + public String toString() + { + return new ObjectToString(this).append("name", name).append("source", source).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java index 0305a2d2690..fb23e9e9e8a 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java @@ -19,6 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data; import java.io.Serializable; import java.util.Collection; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.importer.UncompressedImportData") @@ -54,4 +55,10 @@ public class UncompressedImportData implements Serializable, ImportData return scripts; } + @Override + public String toString() + { + return new ObjectToString(this).append("format", format).append("scripts", scripts).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java index 53b91d15ecf..822b09d9c41 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java @@ -18,6 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data; import java.io.Serializable; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.importer.ZipImportData") @@ -45,4 +46,10 @@ public class ZipImportData implements Serializable, ImportData return file; } + @Override + public String toString() + { + return new ObjectToString(this).append("format", format).toString(); + } + } diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java index 9b20fd1bb94..db0ca76cdea 100644 --- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java +++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java @@ -18,6 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options; import java.io.Serializable; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString; import ch.systemsx.cisd.base.annotation.JsonObject; @JsonObject("as.dto.importer.ImportOptions") @@ -38,4 +39,10 @@ public class ImportOptions implements Serializable return mode; } + @Override + public String toString() + { + return new ObjectToString(this).append("mode", mode).toString(); + } + } -- GitLab