Skip to content
Snippets Groups Projects
Commit eb95596a authored by vkovtun's avatar vkovtun
Browse files

SSDM-13926: Fixing the failing JS test.

parent 36af7917
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Hide whitespace changes
Inline Side-by-side
Showing
with 93 additions and 6 deletions
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/ExportResult.java
+ 7
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter;
import java.io.Serializable;
import java.util.Collection;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -28,8 +31,10 @@ public class ExportResult implements Serializable
private static final long serialVersionUID = 1L;
@JsonProperty
final String downloadURL;
@JsonProperty
final Collection<String> warnings;
public ExportResult(final String downloadURL, final Collection<String> warnings)
......@@ -38,11 +43,13 @@ public class ExportResult implements Serializable
this.warnings = warnings;
}
@JsonIgnore
public String getDownloadURL()
{
return downloadURL;
}
@JsonIgnore
public Collection<String> getWarnings()
{
return warnings;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/AllFields.java
+ 4
− 0
View file @ eb95596a
......@@ -19,6 +19,8 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
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;
......@@ -29,11 +31,13 @@ public class AllFields implements Serializable, IExportableFields
private static final long serialVersionUID = 1L;
@JsonIgnore
public List<Attribute> getAttributes()
{
return null;
}
@JsonIgnore
public List<PropertyTypePermId> getProperties()
{
return null;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportData.java
+ 7
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -28,8 +31,10 @@ public class ExportData implements Serializable
private static final long serialVersionUID = 1L;
@JsonProperty
private List<ExportablePermId> permIds;
@JsonProperty
private IExportableFields fields;
@SuppressWarnings("unused")
......@@ -43,11 +48,13 @@ public class ExportData implements Serializable
this.fields = fields;
}
@JsonIgnore
public List<ExportablePermId> getPermIds()
{
return permIds;
}
@JsonIgnore
public IExportableFields getFields()
{
return fields;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/ExportablePermId.java
+ 7
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
import java.io.Serializable;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
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;
......@@ -29,8 +32,10 @@ public class ExportablePermId implements Serializable
private static final long serialVersionUID = 1L;
@JsonProperty
private ExportableKind exportableKind;
@JsonProperty
private ObjectPermId permId;
@SuppressWarnings("unused")
......@@ -44,11 +49,13 @@ public class ExportablePermId implements Serializable
this.permId = Objects.requireNonNull(permId);
}
@JsonIgnore
public ExportableKind getExportableKind()
{
return exportableKind;
}
@JsonIgnore
public ObjectPermId getPermId()
{
return permId;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/data/SelectedFields.java
+ 7
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
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;
......@@ -29,8 +32,10 @@ public class SelectedFields implements Serializable, IExportableFields
private static final long serialVersionUID = 1L;
@JsonProperty
private List<Attribute> attributes;
@JsonProperty
private List<PropertyTypePermId> properties;
@SuppressWarnings("unused")
......@@ -44,11 +49,13 @@ public class SelectedFields implements Serializable, IExportableFields
this.properties = properties;
}
@JsonIgnore
public List<Attribute> getAttributes()
{
return attributes;
}
@JsonIgnore
public List<PropertyTypePermId> getProperties()
{
return properties;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/exporter/options/ExportOptions.java
+ 11
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options;
import java.io.Serializable;
import java.util.Set;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -28,12 +31,16 @@ public class ExportOptions implements Serializable
private static final long serialVersionUID = 1L;
@JsonProperty
final Set<ExportFormat> formats;
@JsonProperty
final XlsTextFormat xlsTextFormat;
@JsonProperty
final Boolean withReferredTypes;
@JsonProperty
final Boolean withImportCompatibility;
public ExportOptions(final Set<ExportFormat> formats, final XlsTextFormat xlsTextFormat, final Boolean withReferredTypes,
......@@ -45,21 +52,25 @@ public class ExportOptions implements Serializable
this.withImportCompatibility = withImportCompatibility;
}
@JsonIgnore
public Set<ExportFormat> getFormats()
{
return formats;
}
@JsonIgnore
public XlsTextFormat getXlsTextFormat()
{
return xlsTextFormat;
}
@JsonIgnore
public Boolean isWithReferredTypes()
{
return withReferredTypes;
}
@JsonIgnore
public Boolean isWithImportCompatibility()
{
return withImportCompatibility;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/ImportOperation.java
+ 7
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer;
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.ObjectToString;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
......@@ -31,8 +34,10 @@ public class ImportOperation implements Serializable, IOperation
private static final long serialVersionUID = 1L;
@JsonProperty
private IImportData importData;
@JsonProperty
private ImportOptions importOptions;
@SuppressWarnings("unused")
......@@ -52,11 +57,13 @@ public class ImportOperation implements Serializable, IOperation
return toString();
}
@JsonIgnore
public IImportData getImportData()
{
return importData;
}
@JsonIgnore
public ImportOptions getImportOptions()
{
return importOptions;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ImportScript.java
+ 7
− 0
View file @ eb95596a
......@@ -18,6 +18,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data;
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.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -27,8 +30,10 @@ public class ImportScript implements Serializable
private static final long serialVersionUID = 1L;
@JsonProperty
private String name;
@JsonProperty
private String source;
@SuppressWarnings("unused")
......@@ -42,11 +47,13 @@ public class ImportScript implements Serializable
this.source = source;
}
@JsonIgnore
public String getName()
{
return name;
}
@JsonIgnore
public String getSource()
{
return source;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/UncompressedImportData.java
+ 9
− 0
View file @ eb95596a
......@@ -19,6 +19,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data;
import java.io.Serializable;
import java.util.Collection;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -27,10 +30,13 @@ public class UncompressedImportData implements Serializable, IImportData
{
private static final long serialVersionUID = 1L;
@JsonProperty
private ImportFormat format;
@JsonProperty
private byte[] file;
@JsonProperty
private Collection<ImportScript> scripts;
@SuppressWarnings("unused")
......@@ -45,16 +51,19 @@ public class UncompressedImportData implements Serializable, IImportData
this.scripts = scripts;
}
@JsonIgnore
public ImportFormat getFormat()
{
return format;
}
@JsonIgnore
public byte[] getFile()
{
return file;
}
@JsonIgnore
public Collection<ImportScript> getScripts()
{
return scripts;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/data/ZipImportData.java
+ 7
− 0
View file @ eb95596a
......@@ -18,6 +18,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data;
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.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -26,8 +29,10 @@ public class ZipImportData implements Serializable, IImportData
{
private static final long serialVersionUID = 1L;
@JsonProperty
private ImportFormat format;
@JsonProperty
private byte[] file;
@SuppressWarnings("unused")
......@@ -41,11 +46,13 @@ public class ZipImportData implements Serializable, IImportData
this.file = file;
}
@JsonIgnore
public ImportFormat getFormat()
{
return format;
}
@JsonIgnore
public byte[] getFile()
{
return file;
......
api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/importer/options/ImportOptions.java
+ 5
− 0
View file @ eb95596a
......@@ -18,6 +18,9 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options;
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.ObjectToString;
import ch.systemsx.cisd.base.annotation.JsonObject;
......@@ -27,6 +30,7 @@ public class ImportOptions implements Serializable
private static final long serialVersionUID = 1L;
@JsonProperty
private ImportMode mode;
@SuppressWarnings("unused")
......@@ -39,6 +43,7 @@ public class ImportOptions implements Serializable
this.mode = mode;
}
@JsonIgnore
public ImportMode getMode()
{
return mode;
......
api-openbis-javascript/src/v3/as/dto/exporter/data/ExportablePermId.js
+ 0
− 2
View file @ eb95596a
......@@ -17,9 +17,7 @@
define(["stjs"], function (stjs) {
var ExportablePermId = function(exportableKind, permId) {
exportableKind.constructor(); // Assert that the value is defined
this.exportableKind = exportableKind;
permId.constructor(); // Assert that the value is defined
this.permId = permId;
}
......
test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-dto-roundtrip.js
+ 15
− 4
View file @ eb95596a
......@@ -43,13 +43,24 @@ define(['jquery', 'underscore', 'openbis', 'test/common'], function($, _, openbi
actionFacade = facade;
return _.chain(
c.getDtos()
)
c.getDtos()
)
.map(function(proto) {
return new c.CustomASServiceExecutionOptions().withParameter("object", instantiate(proto));
try {
return new c.CustomASServiceExecutionOptions()
.withParameter("object", instantiate(proto));
} catch (error) {
c.fail(error.message);
c.finish();
}
})
.map(function(options) {
return facade.executeCustomASService(id, options);
try {
return facade.executeCustomASService(id, options);
} catch (error) {
c.fail(error.message);
c.finish();
}
})
.value();
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment