diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
index 02d2df10501adf68fb351973d47c6d5a9fb6346d..0a4e7d033ff9477b92b38a1b8a8ac6875e3c43d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractCompositeSearchCriteria.js
@@ -29,17 +29,6 @@ define([ "stjs", "as/dto/common/search/AbstractSearchCriteria", "as/dto/common/s
prototype.withAndOperator = function() {
this.operator = SearchOperator.AND;
}
- prototype.toString = function() {
- return this.toString("");
- };
- prototype.toString = function(indentation) {
- return this.createBuilder().toString(indentation);
- };
- prototype.createBuilder = function() {
- var builder = new SearchCriteriaToStringBuilder();
- builder.setCriteria(this.criteria);
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
index aaf12115e271adadfa1efee87b00d61e5da7eee7..005fa13634e42f2278403a2ca238ce59ab51a0a2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/AbstractEntitySearchCriteria.js
@@ -65,12 +65,6 @@ define(
var AnyFieldSearchCriteria = require("as/dto/common/search/AnyFieldSearchCriteria");
return this.addCriteria(new AnyFieldSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setOperator(this.operator);
- return builder;
- };
}, {
operator : {
name : "Enum",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
deleted file mode 100644
index 8e5c82ceb17f431516bf37a05b633b62e5a80e16..0000000000000000000000000000000000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/common/search/SearchCriteriaToStringBuilder.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @author pkupczyk
- */
-define([ "stjs", "as/dto/common/search/AbstractCompositeSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria) {
- var SearchCriteriaToStringBuilder = function() {
- };
- stjs.extend(SearchCriteriaToStringBuilder, null, [], function(constructor, prototype) {
- prototype['@type'] = 'as.dto.common.search.SearchCriteriaToStringBuilder';
- prototype.name = null;
- prototype.operator = null;
- prototype.criteria = null;
- prototype.setName = function(name) {
- this.name = name;
- return this;
- };
- prototype.setOperator = function(operator) {
- this.operator = operator;
- return this;
- };
- prototype.setCriteria = function(criteria) {
- this.criteria = criteria;
- return this;
- };
- prototype.toString = function(anIndentation) {
- // TODO rewrite to JS version
- var sb = new StringBuilder();
- var indentation = anIndentation;
- if (indentation.isEmpty()) {
- sb.append(this.name.toUpperCase() + "\n");
- } else {
- sb.append(indentation + "with " + this.name.toLowerCase() + ":\n");
- }
- indentation += " ";
- if (this.operator != null) {
- sb.append(indentation + "with operator '" + this.operator + "'\n");
- }
- for ( var criterion in this.criteria) {
- if (stjs.isInstanceOf(criterion.constructor, AbstractCompositeSearchCriteria)) {
- var compositeCriteria = criterion;
- sb.append(compositeCriteria.toString(indentation));
- } else {
- sb.append(indentation + criterion.toString() + "\n");
- }
- }
- return sb.toString();
- };
- }, {
- operator : {
- name : "Enum",
- arguments : [ "SearchOperator" ]
- },
- criteria : {
- name : "Collection",
- arguments : [ "ISearchCriteria" ]
- }
- });
- return SearchCriteriaToStringBuilder;
-})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js
index b2361796ce865434a9d99222654370f0db8f10af..140ef89a188e87a85b47574270259893e497f96e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js
@@ -46,11 +46,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
prototype.getRelation = function() {
return this.relation;
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName(this.relation.name());
- return builder;
- };
}, {
relation : {
name : "Enum",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js
index 0a4c8421eba8f3a09d93ddb5c11cbb9c17c03de5..1e15697c75142711e4dc33d9500a769d1132cd59 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/deletion/search/DeletionSearchCriteria.js
@@ -5,12 +5,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria"
stjs.extend(DeletionSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) {
prototype['@type'] = 'as.dto.deletion.search.DeletionSearchCriteria';
constructor.serialVersionUID = 1;
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("DELETION");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
index ea2692a48eaeba56914a94fe77bf1187cdfdfaed..b8660825597fe4f95bb6715dc525997d787cb93e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/entitytype/search/EntityTypeSearchCriteria.js
@@ -17,12 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("TYPE");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
index 1ecb1b0bac2b2d3cc96a5a9e0128e79f454c2649..6e31f502b8884dbcd25ba9a13bbe02b6921291ab 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/experiment/search/ExperimentSearchCriteria.js
@@ -19,11 +19,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
prototype.withAndOperator = function() {
return this.withOperator(SearchOperator.AND);
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName("EXPERIMENT");
- return builder;
- };
}, {
operator : {
name : "Enum",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/global/search/GlobalSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/global/search/GlobalSearchCriteria.js
index e139c9d599a8999abacd08d8836d3387d296a948..b875e7ffa5dbbb8a1e6a517823ff446602aaa67b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/global/search/GlobalSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/global/search/GlobalSearchCriteria.js
@@ -21,12 +21,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractCompositeSearchCriteri
var GlobalSearchWildCardsCriteria = require("as/dto/global/search/GlobalSearchWildCardsCriteria");
return this.addCriteria(new GlobalSearchWildCardsCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("GLOBAL_SEARCH");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js
index 8edef0f14200d64d386efe28a67eadf508e65aad..886538bc2313455bd6d8e04d895af5f43bf95f40 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/material/search/MaterialSearchCriteria.js
@@ -14,11 +14,6 @@ define([ "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/co
prototype.withAndOperator = function() {
return this.withOperator(SearchOperator.AND);
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName("MATERIAL");
- return builder;
- };
}, {
operator : {
name : "Enum",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js
index 0bbb3ce321571b877b70110eb45bc55ddf986b0e..35cf131ef828e484b5ac070a8a8d6c3e6de623f8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/project/search/ProjectSearchCriteria.js
@@ -21,12 +21,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var SpaceSearchCriteria = require("as/dto/space/search/SpaceSearchCriteria");
return this.addCriteria(new SpaceSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("PROJECT");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
index 714bf8daa59726915271039fc3b6e5f26e2237cd..62fcd50caf5b45ab7341cd2b7b7c69a8c530f89c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
@@ -47,11 +47,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
prototype.getRelation = function() {
return this.relation;
};
- prototype.createBuilder = function() {
- var builder = AbstractEntitySearchCriteria.prototype.createBuilder.call(this);
- builder.setName(this.relation.name());
- return builder;
- };
}, {
relation : {
name : "Enum",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/CustomASServiceSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/CustomASServiceSearchCriteria.js
index 3dcfff41ab0f213e316ed269fc9687b8bb3b0520..323b2f2056264b9eb74e3bb46b1625e0e2f40ca7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/CustomASServiceSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/service/search/CustomASServiceSearchCriteria.js
@@ -10,12 +10,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var CodeSearchCriteria = require("as/dto/common/search/CodeSearchCriteria");
return this.addCriteria(new CodeSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("CUSTOM_AS_SERVICE");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js
index 04ceb951c99878a85fd49a18a60207be82715a5a..69f39e1c921893c5a6f1c7faa63e0e34c23dcfd5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/space/search/SpaceSearchCriteria.js
@@ -17,12 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("SPACE");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js
index 4aa7f9032ce2e54110bfda65e3d40c302a9e9796..9ebf822eb067b071eb9071984d69361003889f83 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/tag/search/TagSearchCriteria.js
@@ -17,12 +17,6 @@ define([ "require", "stjs", "as/dto/common/search/AbstractObjectSearchCriteria",
var PermIdSearchCriteria = require("as/dto/common/search/PermIdSearchCriteria");
return this.addCriteria(new PermIdSearchCriteria());
};
- prototype.createBuilder = function() {
- var AbstractCompositeSearchCriteria = require("as/dto/common/search/AbstractCompositeSearchCriteria");
- var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this);
- builder.setName("TAG");
- return builder;
- };
}, {
criteria : {
name : "Collection",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
index 340b53d5cbc7d0baf1a69b9d3acc09d4d5b1e101..82b676a177b42c8aebe571710d71d1e12a99ac55 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
@@ -87,7 +87,7 @@ define([ "underscore" ], function(_) {
if (jsonObject in hashedObjects) {
return hashedObjects[jsonObject];
} else {
- throw "Object with id: " + jsonObject + " and type: " + jsonType + " haven't been found in cache";
+ throw "Object with id: " + JSON.stringify(jsonObject) + " and type: " + jsonType + " haven't been found in cache";
}
} else {
return jsonObject;
@@ -102,7 +102,11 @@ define([ "underscore" ], function(_) {
var moduleName = typeToModuleName(jsonType);
var module = modulesMap[moduleName];
var moduleFieldTypeMap = module.$typeDescription || {};
- var object = new module;
+ try {
+ var object = new module(""); // some entities have a mandatory non-null constructor parameters
+ } catch(e) {
+ throw "Failed deserializing object " + JSON.stringify(jsonObject) + " into type " + jsonType + " with error " + e.message;
+ }
if (jsonId) {
if (jsonId in hashedObjects) {