From ebc63871ee645ddc58c41e4f3b257d4fa62653a0 Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Mon, 21 Aug 2023 16:37:54 +0200
Subject: [PATCH] SSDM-13926: Fixing the failing JS vs Java API test.
---
.../asapi/v3/dto/exporter/options/ExportOptions.java | 4 ++--
.../src/v3/as/dto/exporter/data/AllFields.js | 6 +++---
.../src/v3/as/dto/exporter/data/SelectedFields.js | 6 +++---
.../src/v3/as/dto/exporter/options/ExportOptions.js | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
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 b8cbdeedd5e..5e2d97adaa2 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
@@ -55,12 +55,12 @@ public class ExportOptions implements Serializable
return xlsTextFormat;
}
- public boolean isWithReferredTypes()
+ public Boolean isWithReferredTypes()
{
return withReferredTypes;
}
- public boolean isWithImportCompatibility()
+ public Boolean isWithImportCompatibility()
{
return withImportCompatibility;
}
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js
index 916c19ff492..0fa209af160 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/AllFields.js
@@ -15,14 +15,14 @@
*
*/
-define(["stjs", "as/dto/exporter/data/IExportableFields"], function (stjs, ExportableFields) {
+define(["stjs", "as/dto/exporter/data/IExportableFields"], function (stjs, IExportableFields) {
var AllFields = function() {
}
stjs.extend(
AllFields,
- ExportableFields,
- [ExportableFields],
+ IExportableFields,
+ [IExportableFields],
function (constructor, prototype) {
prototype["@type"] = "as.dto.exporter.data.AllFields";
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js b/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
index 3ca4a85c0e6..6503d84cbc8 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/data/SelectedFields.js
@@ -15,7 +15,7 @@
*
*/
-define(["stjs", "as/dto/exporter/IExportableFields"], function (stjs, ExportableFields) {
+define(["stjs", "as/dto/exporter/IExportableFields"], function (stjs, IExportableFields) {
var SelectedFields = function(attributes, properties) {
this.attributes = attributes;
this.properties = properties;
@@ -23,8 +23,8 @@ define(["stjs", "as/dto/exporter/IExportableFields"], function (stjs, Exportable
stjs.extend(
SelectedFields,
- ExportableFields,
- [ExportableFields],
+ IExportableFields,
+ [IExportableFields],
function (constructor, prototype) {
prototype["@type"] = "as.dto.exporter.data.SelectedFields";
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js b/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
index 58592d20a16..a881999fbce 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/options/ExportOptions.js
@@ -40,11 +40,11 @@ define(["stjs"], function (stjs) {
return this.xlsTextFormat;
};
- prototype.getWithReferredTypes = function() {
+ prototype.isWithReferredTypes = function() {
return this.withReferredTypes;
};
- prototype.getWithImportCompatibility = function() {
+ prototype.isWithImportCompatibility = function() {
return this.withImportCompatibility;
};
},
--
GitLab