From 2817f9c2a9135596123654c6fd0eb3dabb1631a9 Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Tue, 5 Dec 2023 13:08:00 +0100
Subject: [PATCH] BIS-772: Added missing fields and methods to a JS DTO.
---
.../asapi/v3/dto/exporter/ExportOperationResult.java | 5 +++++
.../src/v3/as/dto/exporter/ExportOperationResult.js | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportOperationResult.java
index c665dd19b48..c2a86cb7f60 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportOperationResult.java
@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter;
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.operation.IOperationResult;
import ch.systemsx.cisd.base.annotation.JsonObject;
@@ -28,6 +31,7 @@ public class ExportOperationResult implements Serializable, IOperationResult
private static final long serialVersionUID = 1L;
+ @JsonProperty
private ExportResult exportResult;
public ExportOperationResult()
@@ -39,6 +43,7 @@ public class ExportOperationResult implements Serializable, IOperationResult
this.exportResult = exportResult;
}
+ @JsonIgnore
public ExportResult getExportResult()
{
return exportResult;
diff --git a/api-openbis-javascript/src/v3/as/dto/exporter/ExportOperationResult.js b/api-openbis-javascript/src/v3/as/dto/exporter/ExportOperationResult.js
index cd638fb3990..cb4c8be8ece 100644
--- a/api-openbis-javascript/src/v3/as/dto/exporter/ExportOperationResult.js
+++ b/api-openbis-javascript/src/v3/as/dto/exporter/ExportOperationResult.js
@@ -17,7 +17,8 @@
define(["stjs", "as/dto/common/operation/IOperationResult"],
function (stjs, IOperationResult) {
- var ExportOperationResult = function() {
+ var ExportOperationResult = function(exportResult) {
+ this.exportResult = exportResult;
}
stjs.extend(
@@ -29,9 +30,15 @@ define(["stjs", "as/dto/common/operation/IOperationResult"],
constructor.serialVersionUID = 1;
+ prototype.exportResult = null;
+
prototype.getMessage = function() {
return "ExportOperationResult";
};
+
+ prototype.getExportResult = function() {
+ return this.exportResult;
+ }
},
{}
);
--
GitLab