From f37b84e625b0de69794d4852aa68dc401c4d4bd7 Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Mon, 21 Aug 2023 15:15:47 +0200
Subject: [PATCH] SSDM-13926: Made JsonObject parameter consistent with
package.
---
.../openbis/generic/asapi/v3/dto/exporter/data/AllFields.java | 2 +-
.../openbis/generic/asapi/v3/dto/exporter/data/Attribute.java | 2 +-
.../openbis/generic/asapi/v3/dto/exporter/data/ExportData.java | 2 +-
.../generic/asapi/v3/dto/exporter/data/ExportableKind.java | 2 +-
.../generic/asapi/v3/dto/exporter/data/ExportablePermId.java | 2 +-
.../generic/asapi/v3/dto/exporter/data/IExportableFields.java | 2 +-
.../generic/asapi/v3/dto/exporter/data/SelectedFields.java | 2 +-
.../generic/asapi/v3/dto/exporter/options/ExportFormat.java | 2 +-
.../generic/asapi/v3/dto/exporter/options/ExportOptions.java | 2 +-
.../generic/asapi/v3/dto/exporter/options/XLSTextFormat.java | 2 +-
.../generic/asapi/v3/dto/importer/ImportOperationResult.java | 2 +-
.../openbis/generic/asapi/v3/dto/importer/data/IImportData.java | 2 +-
.../generic/asapi/v3/dto/importer/data/ImportFormat.java | 2 +-
.../generic/asapi/v3/dto/importer/data/ImportScript.java | 2 +-
.../asapi/v3/dto/importer/data/UncompressedImportData.java | 2 +-
.../generic/asapi/v3/dto/importer/data/ZipImportData.java | 2 +-
.../generic/asapi/v3/dto/importer/options/ImportMode.java | 2 +-
.../generic/asapi/v3/dto/importer/options/ImportOptions.java | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
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 b1ca6edd3ab..96c084415e5 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
@@ -23,7 +23,7 @@ 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;
-@JsonObject("as.dto.exporter.AllFields")
+@JsonObject("as.dto.exporter.data.AllFields")
public class AllFields implements Serializable, IExportableFields
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java
index 5a93265ed9b..5b5828e5b37 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/Attribute.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.Attribute")
+@JsonObject("as.dto.exporter.data.Attribute")
public enum Attribute
{
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 1450b3b17f6..42b22c7101e 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
@@ -22,7 +22,7 @@ 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")
+@JsonObject("as.dto.exporter.data.ExportData")
public class ExportData implements Serializable
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java
index 332bddd52fe..593cc58d532 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportableKind.java
@@ -17,7 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.ExportableKind")
+@JsonObject("as.dto.exporter.data.ExportableKind")
public enum ExportableKind
{
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 34a0438905b..3d5766ea04f 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
@@ -23,7 +23,7 @@ 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;
-@JsonObject("as.dto.exporter.ExportablePermId")
+@JsonObject("as.dto.exporter.data.ExportablePermId")
public class ExportablePermId implements Serializable
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
index 77a31d865f2..ac3de5262e4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/IExportableFields.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.IExportableFields")
+@JsonObject("as.dto.exporter.data.IExportableFields")
public interface IExportableFields extends Serializable
{
}
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 79c8535cb61..425713b1983 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
@@ -23,7 +23,7 @@ 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;
-@JsonObject("as.dto.exporter.SelectedFields")
+@JsonObject("as.dto.exporter.data.SelectedFields")
public class SelectedFields implements Serializable, IExportableFields
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java
index 347c5b6f169..23e2fefd4cf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportFormat.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.ExportFormat")
+@JsonObject("as.dto.exporter.options.ExportFormat")
public enum ExportFormat
{
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 be2058c7dc6..d38dabbc0db 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
@@ -22,7 +22,7 @@ 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")
+@JsonObject("as.dto.exporter.options.ExportOptions")
public class ExportOptions implements Serializable
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java
index 11a055a8b1a..58b62c2ca1b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/XLSTextFormat.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.XLSTextFormat")
+@JsonObject("as.dto.exporter.options.XLSTextFormat")
public enum XLSTextFormat
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java
index 0f29c07c3e5..a28b89ee5f3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperationResult.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.ImportOperationResult")
+@JsonObject("as.dto.importer.ImportOperationResult")
public class ImportOperationResult implements Serializable, IOperationResult
{
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
index f85d5b01578..394d190679f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/IImportData.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.importer.IImportData")
+@JsonObject("as.dto.importer.data.IImportData")
public abstract interface IImportData extends Serializable
{
}
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java
index aabad99f72a..3bd858e1271 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportFormat.java
@@ -18,7 +18,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.ImportFormat")
+@JsonObject("as.dto.importer.data.ImportFormat")
public enum ImportFormat
{
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 818b3f84aa8..9f8e3a19a41 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
@@ -21,7 +21,7 @@ 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")
+@JsonObject("as.dto.importer.data.ImportScript")
public class ImportScript implements Serializable
{
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 ea74c57454c..bb9c3156e16 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
@@ -22,7 +22,7 @@ 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")
+@JsonObject("as.dto.importer.data.UncompressedImportData")
public class UncompressedImportData implements Serializable, IImportData
{
private static final long serialVersionUID = 1L;
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 4538c06d458..f66df6534b4 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
@@ -21,7 +21,7 @@ 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")
+@JsonObject("as.dto.importer.data.ZipImportData")
public class ZipImportData implements Serializable, IImportData
{
private static final long serialVersionUID = 1L;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java
index fa73e45cd0c..35997c1faca 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportMode.java
@@ -17,7 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options;
import ch.systemsx.cisd.base.annotation.JsonObject;
-@JsonObject("as.dto.exporter.ImportMode")
+@JsonObject("as.dto.importer.options.ImportMode")
public enum ImportMode
{
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 db0ca76cdea..ef81093db79 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
@@ -21,7 +21,7 @@ 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")
+@JsonObject("as.dto.importer.options.ImportOptions")
public class ImportOptions implements Serializable
{
--
GitLab