From bccbbd7c06b37d1816797d80f64b054f79a1207e Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Wed, 9 Dec 2015 15:59:01 +0000
Subject: [PATCH] SSDM-2903 : V3 AS API - fix inconsistencies between Java and
JS DTOs found by automated test (fixed 40 out of 77 problems)
SVN: 35278
---
.../html/test/test-jsVSjava.js | 229 ++++++++++--------
.../openbis/jstest/report/V3APIReport.java | 27 ++-
.../resources/api/v3/dto/common/Enum.js | 15 ++
.../v3/dto/common/fetchoptions/CacheMode.js | 12 +-
.../common/interfaces/IAttachmentsHolder.js | 10 +
.../v3/dto/common/interfaces/ICodeHolder.js | 10 +
.../common/interfaces/ICreationIdHolder.js | 10 +
.../interfaces/IModificationDateHolder.js | 10 +
.../dto/common/interfaces/IModifierHolder.js | 10 +
.../interfaces/IParentChildrenHolder.js | 13 +
.../v3/dto/common/interfaces/IPermIdHolder.js | 10 +
.../common/interfaces/IPropertiesHolder.js | 19 ++
.../interfaces/IRegistrationDateHolder.js | 10 +
.../common/interfaces/IRegistratorHolder.js | 10 +
.../v3/dto/common/interfaces/ISpaceHolder.js | 10 +
.../v3/dto/common/interfaces/ITagsHolder.js | 10 +
.../{operation => operations}/IOperation.js | 0
.../IOperationResult.js | 0
.../api/v3/dto/common/search/IDateFormat.js | 11 +-
.../v3/dto/common/search/SearchFieldType.js | 13 +-
.../v3/dto/common/search/SearchOperator.js | 13 +-
.../api/v3/dto/dataset/ArchivingStatus.js | 17 +-
.../resources/api/v3/dto/dataset/Complete.js | 13 +-
.../api/v3/dto/dataset/DataSetKind.js | 13 +-
.../dataset/history/DataSetRelationType.js | 15 +-
.../dataset/search/DataSetSearchRelation.js | 12 +-
.../create/CreateExperimentsOperation.js | 2 +-
.../CreateExperimentsOperationResult.js | 2 +-
.../history/ExperimentRelationType.js | 11 +-
.../list/ListExperimentsOperation.js | 2 +-
.../list/ListExperimentsOperationResult.js | 2 +-
.../search/SearchExperimentsOperation.js | 2 +-
.../SearchExperimentsOperationResult.js | 2 +-
.../update/UpdateExperimentsOperation.js | 2 +-
.../UpdateExperimentsOperationResult.js | 2 +-
.../api/v3/dto/history/IRelationType.js | 6 +
.../project/history/ProjectRelationType.js | 10 +-
.../sample/create/CreateSamplesOperation.js | 2 +-
.../dto/sample/create/CreateSamplesResult.js | 2 +-
.../dto/sample/history/SampleRelationType.js | 15 +-
.../dto/sample/search/SampleSearchRelation.js | 12 +-
.../sample/update/UpdateSamplesOperation.js | 2 +-
.../fetchoptions/EntitySortOptions.java | 5 +
.../EntityWithPropertiesSortOptions.java | 3 +
.../common/interfaces/IAttachmentsHolder.java | 2 +
.../v3/dto/common/interfaces/ICodeHolder.java | 3 +
.../common/interfaces/ICreationIdHolder.java | 2 +
.../interfaces/IModificationDateHolder.java | 3 +
.../common/interfaces/IModifierHolder.java | 2 +
.../interfaces/IParentChildrenHolder.java | 3 +
.../dto/common/interfaces/IPermIdHolder.java | 2 +
.../common/interfaces/IPropertiesHolder.java | 2 +
.../interfaces/IRegistrationDateHolder.java | 3 +
.../common/interfaces/IRegistratorHolder.java | 2 +
.../dto/common/interfaces/ISpaceHolder.java | 2 +
.../v3/dto/common/interfaces/ITagsHolder.java | 2 +
.../search/SearchExperimentsOperation.java | 2 +-
.../SearchExperimentsOperationResult.java | 2 +-
.../as/api/v3/dto/history/IRelationType.java | 3 +
.../dto/tag/fetchoptions/TagSortOptions.java | 4 +
60 files changed, 434 insertions(+), 211 deletions(-)
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/Enum.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IAttachmentsHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICodeHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICreationIdHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModificationDateHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModifierHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IParentChildrenHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPermIdHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPropertiesHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistrationDateHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistratorHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ISpaceHolder.js
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ITagsHolder.js
rename openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/{operation => operations}/IOperation.js (100%)
rename openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/{operation => operations}/IOperationResult.js (100%)
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/IRelationType.js
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js
index 4f3e3ef9e97..be1380243da 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js
@@ -4,141 +4,157 @@
define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, openbis, common) {
return function() {
QUnit.module("JS VS JAVA API");
-
+
//
// Ignore specific Java classes giving a custom message
//
var getSimpleClassName = function(fullyQualifiedClassName) {
- var idx = fullyQualifiedClassName.lastIndexOf(".");
- return fullyQualifiedClassName.substring(idx+1, fullyQualifiedClassName.length);
+ var idx = fullyQualifiedClassName.lastIndexOf(".");
+ return fullyQualifiedClassName.substring(idx + 1, fullyQualifiedClassName.length);
};
-
+
var ignoreMessages = {
- "AbstractCollectionView" : "Java class ignored: ",
- "ListView" : "Java class ignored: ",
- "SetView" : "Java class ignored: ",
- "NotFetchedException" : "Java class ignored: ",
- "ObjectNotFoundException" : "Java class ignored: ",
- "UnauthorizedObjectAccessException" : "Java class ignored: ",
- "UnsupportedObjectIdException" : "Java class ignored: ",
- "IApplicationServerApi" : "Java class ignored: ",
- "DataSetFileDownloadInputStream" : "Java class ignored: ",
- "IDataStoreServerApi" : "Java class ignored: ",
- "DataSetCreation" : "Java class ignored: ",
- "LinkedDataCreation" : "Java class ignored: ",
- "PhysicalDataCreation" : "Java class ignored: ",
- "DataSetFileDownload" : "Java class not implemented in JS: ",
- "DataSetFileDownloadOptions" : "Java class not implemented in JS: ",
- "DataSetFileDownloadReader" : "Java class not implemented in JS: ",
- "DataSetFileSearchCriteria" : "Java class not implemented in JS: ",
- "DataSetFile" : "Java class not implemented in JS: ",
- "DataSetFilePermId" : "Java class not implemented in JS: ",
- "IDataSetFileId" : "Java class not implemented in JS: "
+ "AbstractCollectionView" : "Java class ignored: ",
+ "ListView" : "Java class ignored: ",
+ "SetView" : "Java class ignored: ",
+ "NotFetchedException" : "Java class ignored: ",
+ "ObjectNotFoundException" : "Java class ignored: ",
+ "UnauthorizedObjectAccessException" : "Java class ignored: ",
+ "UnsupportedObjectIdException" : "Java class ignored: ",
+ "IApplicationServerApi" : "Java class ignored: ",
+ "DataSetFileDownloadInputStream" : "Java class ignored: ",
+ "IDataStoreServerApi" : "Java class ignored: ",
+ "DataSetCreation" : "Java class ignored: ",
+ "LinkedDataCreation" : "Java class ignored: ",
+ "PhysicalDataCreation" : "Java class ignored: ",
+ "DataSetFileDownload" : "Java class not implemented in JS: ",
+ "DataSetFileDownloadOptions" : "Java class not implemented in JS: ",
+ "DataSetFileDownloadReader" : "Java class not implemented in JS: ",
+ "DataSetFileSearchCriteria" : "Java class not implemented in JS: ",
+ "DataSetFile" : "Java class not implemented in JS: ",
+ "DataSetFilePermId" : "Java class not implemented in JS: ",
+ "IDataSetFileId" : "Java class not implemented in JS: "
}
-
+
//
// JS Classes contained into other classes
//
var circularDependencies = {
- "SampleChildrenSearchCriteria" : { containerClass : "dto.sample.search.SampleSearchCriteria", method : "withChildren" },
- "SampleContainerSearchCriteria" : { containerClass : "dto.sample.search.SampleSearchCriteria", method : "withContainer" },
- "SampleParentsSearchCriteria" : { containerClass : "dto.sample.search.SampleSearchCriteria", method : "withParents" },
- "DataSetChildrenSearchCriteria" : { containerClass : "dto.dataset.search.DataSetSearchCriteria", method : "withChildren" },
- "DataSetContainerSearchCriteria" : { containerClass : "dto.dataset.search.DataSetSearchCriteria", method : "withContainer" },
- "DataSetParentsSearchCriteria" : { containerClass : "dto.dataset.search.DataSetSearchCriteria", method : "withParents" },
+ "SampleChildrenSearchCriteria" : {
+ containerClass : "dto.sample.search.SampleSearchCriteria",
+ method : "withChildren"
+ },
+ "SampleContainerSearchCriteria" : {
+ containerClass : "dto.sample.search.SampleSearchCriteria",
+ method : "withContainer"
+ },
+ "SampleParentsSearchCriteria" : {
+ containerClass : "dto.sample.search.SampleSearchCriteria",
+ method : "withParents"
+ },
+ "DataSetChildrenSearchCriteria" : {
+ containerClass : "dto.dataset.search.DataSetSearchCriteria",
+ method : "withChildren"
+ },
+ "DataSetContainerSearchCriteria" : {
+ containerClass : "dto.dataset.search.DataSetSearchCriteria",
+ method : "withContainer"
+ },
+ "DataSetParentsSearchCriteria" : {
+ containerClass : "dto.dataset.search.DataSetSearchCriteria",
+ method : "withParents"
+ },
}
-
+
//
// Java VS JS Comparator
//
- var jsComparator = function(testsResults, javaClassReport, jsObject, circularDependencyConfig) {
- //Check object returned
- if(!jsObject) {
+ var jsComparator = function(testsResults, javaClassReport, jsObject) {
+ // Check object returned
+ if (!jsObject) {
var errorResult = "JS class missing instance: " + javaClassReport.jsonObjAnnotation;
testsResults.error.push(errorResult);
console.info(errorResult);
return;
}
-
- //Check prototype available
- if(!jsObject.prototype && !circularDependencyConfig) {
+
+ var jsPrototype = null;
+
+ if ($.isFunction(jsObject)) {
+ jsPrototype = jsObject.prototype;
+ } else {
+ jsPrototype = jsObject;
+ }
+
+ if (!jsPrototype) {
var errorResult = "JS class missing prototype: " + javaClassReport.jsonObjAnnotation;
testsResults.error.push(errorResult);
console.info(errorResult);
return;
}
-
- var jsPrototype = null;
- if(circularDependencyConfig) {
- jsPrototype = jsObject.__proto__;
- }
-
- if(jsObject.prototype) {
- jsPrototype = jsObject.prototype;
- }
-
- //Java Fields found in Javascript
- for(var fIdx = 0; fIdx < javaClassReport.fields.length; fIdx++) {
- if(!jsPrototype[javaClassReport.fields[fIdx]]) {
+
+ // Java Fields found in Javascript
+ for (var fIdx = 0; fIdx < javaClassReport.fields.length; fIdx++) {
+ if (!jsPrototype[javaClassReport.fields[fIdx]]) {
var errorResult = "JS class missing field: " + javaClassReport.jsonObjAnnotation + " - " + javaClassReport.fields[fIdx];
testsResults.error.push(errorResult);
console.info(errorResult);
}
}
-
- //Java Methods found in Javascript
- for(var fIdx = 0; fIdx < javaClassReport.methods.length; fIdx++) {
- if(!jsPrototype[javaClassReport.methods[fIdx]]) {
+
+ // Java Methods found in Javascript
+ for (var fIdx = 0; fIdx < javaClassReport.methods.length; fIdx++) {
+ if (!jsPrototype[javaClassReport.methods[fIdx]]) {
var errorResult = "JS class missing method: " + javaClassReport.jsonObjAnnotation + " - " + javaClassReport.methods[fIdx];
testsResults.error.push(errorResult);
console.info(errorResult);
}
}
}
-
+
//
// Main Reporting Logic
//
var areClassesCorrect = function(report, callback) {
var testsToDo = [];
var testsResults = {
- info : [],
- warning : [],
- error : []
+ info : [],
+ warning : [],
+ error : []
};
-
+
var doNext = function() {
- if(testsToDo.length > 0) {
+ if (testsToDo.length > 0) {
var next = testsToDo.shift();
next();
} else {
callback(testsResults);
}
}
-
- for(var ridx = 0; ridx < report.entries.length; ridx++) {
+
+ for (var ridx = 0; ridx < report.entries.length; ridx++) {
var javaClassReport = report.entries[ridx];
var testClassFunc = function(javaClassReport) {
- return function () {
+ return function() {
var javaClassName = javaClassReport.name;
var javaSimpleClassName = getSimpleClassName(javaClassName);
var ignoreMessage = ignoreMessages[javaSimpleClassName];
var circularDependencyConfig = circularDependencies[javaSimpleClassName];
-
- if(ignoreMessage) {
+
+ if (ignoreMessage) {
var warningResult = ignoreMessage + javaClassReport.name;
testsResults.warning.push(warningResult);
console.info(warningResult);
doNext();
} else {
var jsClassName = null;
- if(circularDependencyConfig) {
+ if (circularDependencyConfig) {
jsClassName = circularDependencyConfig.containerClass;
} else {
jsClassName = javaClassReport.jsonObjAnnotation;
}
-
- if(jsClassName) {
+
+ if (jsClassName) {
var failedLoadingErrorHandler = function(javaClassName) {
return function() {
var errorResult = "Java class with jsonObjectAnnotation missing in Javascript: " + javaClassName;
@@ -147,29 +163,29 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
doNext();
};
};
-
+
var loadedHandler = null;
-
+
loadedHandler = function(circularDependencyConfig) {
return function(javaClassReport) {
return function(jsObject) {
- if(circularDependencyConfig) {
+ if (circularDependencyConfig) {
var instanceJSObject = new jsObject();
var containedJsObject = instanceJSObject[circularDependencyConfig.method]();
jsObject = containedJsObject;
}
-
- jsComparator(testsResults, javaClassReport, jsObject, circularDependencyConfig);
+
+ jsComparator(testsResults, javaClassReport, jsObject);
testsResults.info.push("Java class matching JS: " + javaClassReport.name);
doNext();
};
};
}
-
+
loadedHandler = loadedHandler(circularDependencyConfig);
-
- var requireJsPath = jsClassName.replace(/\./g,'/');
- require([requireJsPath], loadedHandler(javaClassReport), failedLoadingErrorHandler(javaClassName));
+
+ var requireJsPath = jsClassName.replace(/\./g, '/');
+ require([ requireJsPath ], loadedHandler(javaClassReport), failedLoadingErrorHandler(javaClassName));
} else {
var errorResult = "Java class missing jsonObjectAnnotation: " + javaClassName;
testsResults.error.push(errorResult);
@@ -181,46 +197,47 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
}
testsToDo.push(testClassFunc(javaClassReport));
}
-
+
doNext();
}
-
+
var getPrintableReport = function(javaReport, testsResults) {
var printableReport = "Total Java classes found " + javaReport.entries.length;
- printableReport += " - Javascript Error Msg: " + testsResults.error.length;
- printableReport += " - Javascript Warning Msg: " + testsResults.warning.length;
- printableReport += " - Javascript Info Msg: " + testsResults.info.length;
- printableReport += "\n";
-
- for(var edx = 0; edx < testsResults.error.length; edx++) {
- printableReport += "[ERROR] " + testsResults.error[edx] + "\n";
- }
- for(var wdx = 0; wdx < testsResults.warning.length; wdx++) {
- printableReport += "[WARNING] " + testsResults.warning[wdx] + "\n";
- }
- for(var idx = 0; idx < testsResults.info.length; idx++) {
- printableReport += "[INFO] " + testsResults.info[idx] + "\n";
- }
+ printableReport += " - Javascript Error Msg: " + testsResults.error.length;
+ printableReport += " - Javascript Warning Msg: " + testsResults.warning.length;
+ printableReport += " - Javascript Info Msg: " + testsResults.info.length;
+ printableReport += "\n";
+
+ for (var edx = 0; edx < testsResults.error.length; edx++) {
+ printableReport += "[ERROR] " + testsResults.error[edx] + "\n";
+ }
+ for (var wdx = 0; wdx < testsResults.warning.length; wdx++) {
+ printableReport += "[WARNING] " + testsResults.warning[wdx] + "\n";
+ }
+ for (var idx = 0; idx < testsResults.info.length; idx++) {
+ printableReport += "[INFO] " + testsResults.info[idx] + "\n";
+ }
return printableReport;
}
-
+
QUnit.test("get Java report from aggregation service", function(assert) {
var c = new common(assert);
c.start();
-
+
var getV3APIReport = function(facade) {
- c.getResponseFromJSTestAggregationService(facade, {"method" : "getV3APIReport"}, function(data) {
+ c.getResponseFromJSTestAggregationService(facade, {
+ "method" : "getV3APIReport"
+ }, function(data) {
var javaReport = null;
-
- if ( !data.error &&
- data.result.columns[0].title === "STATUS" &&
- data.result.rows[0][0].value === "SUCCESS") { //Success Case
+
+ if (!data.error && data.result.columns[0].title === "STATUS" && data.result.rows[0][0].value === "SUCCESS") { // Success
+ // Case
javaReport = JSON.parse(data.result.rows[0][1].value);
- }
-
- if(javaReport) {
+ }
+
+ if (javaReport) {
areClassesCorrect(javaReport, function(testsResults) {
- if(testsResults.error.length > 0) {
+ if (testsResults.error.length > 0) {
c.fail(getPrintableReport(javaReport, testsResults));
} else {
c.ok(getPrintableReport(javaReport, testsResults));
@@ -233,7 +250,7 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
}
});
}
-
+
c.createFacadeAndLogin().then(getV3APIReport);
});
}
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
index b5de9014888..628ee1dc91c 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
@@ -1,4 +1,5 @@
package ch.systemsx.cisd.openbis.jstest.report;
+
/*
* Copyright 2015 ETH Zuerich, CISD
*
@@ -17,7 +18,6 @@ package ch.systemsx.cisd.openbis.jstest.report;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -35,11 +35,12 @@ import org.reflections.util.ConfigurationBuilder;
import org.reflections.util.FilterBuilder;
import org.testng.annotations.Test;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
-import com.fasterxml.jackson.databind.ObjectMapper;
/**
* @author pkupczyk
@@ -114,12 +115,15 @@ public class V3APIReport
private String getJSONObjectAnnotation(Class<?> clazz)
{
Annotation[] annotations = clazz.getAnnotations();
- for(Annotation annotation:annotations) {
+ for (Annotation annotation : annotations)
+ {
Class<? extends Annotation> type = annotation.annotationType();
String name = type.getName();
- if(name.equals("ch.systemsx.cisd.base.annotation.JsonObject")) {
-
- for (Method method : type.getDeclaredMethods()) {
+ if (name.equals("ch.systemsx.cisd.base.annotation.JsonObject"))
+ {
+
+ for (Method method : type.getDeclaredMethods())
+ {
try
{
Object value = method.invoke(annotation, (Object[]) null);
@@ -133,13 +137,13 @@ public class V3APIReport
}
return null;
}
-
+
private Collection<Field> getPublicFields(Class<?> clazz)
{
Collection<Field> fields = new ArrayList<Field>();
for (Field field : clazz.getDeclaredFields())
{
- if (Modifier.isPublic(field.getModifiers()))
+ if (Modifier.isPublic(field.getModifiers()) && field.getAnnotation(JsonIgnore.class) == null)
{
fields.add(field);
}
@@ -153,7 +157,7 @@ public class V3APIReport
for (Method method : clazz.getDeclaredMethods())
{
- if (Modifier.isPublic(method.getModifiers()))
+ if (Modifier.isPublic(method.getModifiers()) && method.getAnnotation(JsonIgnore.class) == null)
{
methods.add(method);
}
@@ -209,9 +213,9 @@ public class V3APIReport
static class Entry
{
private String Name;
-
+
private String jsonObjAnnotation;
-
+
private List<String> fields = new ArrayList<String>();
private List<String> methods = new ArrayList<String>();
@@ -227,7 +231,6 @@ public class V3APIReport
return this.Name;
}
-
public String getJsonObjAnnotation()
{
return this.jsonObjAnnotation;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/Enum.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/Enum.js
new file mode 100644
index 00000000000..70168c15973
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/Enum.js
@@ -0,0 +1,15 @@
+define([ "stjs" ], function(stjs) {
+ var Enum = function(values) {
+ var thisEnum = this;
+ this.values = values;
+ values.forEach(function(value) {
+ thisEnum[value] = value;
+ });
+ };
+ stjs.extend(Enum, null, [], function(constructor, prototype) {
+ prototype.values = function() {
+ return this.values;
+ };
+ }, {});
+ return Enum;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js
index 05bdd5c6c72..67219fddb0f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/fetchoptions/CacheMode.js
@@ -1,10 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- NO_CACHE : "NO_CACHE",
- CACHE : "CACHE",
- RELOAD_AND_CACHE : "RELOAD_AND_CACHE"
+
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var CacheMode = function() {
+ Enum.call(this, [ "NO_CACHE", "CACHE", "RELOAD_AND_CACHE" ]);
};
+ stjs.extend(CacheMode, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new CacheMode();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IAttachmentsHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IAttachmentsHolder.js
new file mode 100644
index 00000000000..e6edcaf3fbd
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IAttachmentsHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IAttachmentsHolder = function() {
+ };
+ stjs.extend(IAttachmentsHolder, null, [], function(constructor, prototype) {
+ prototype.getAttachments = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IAttachmentsHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICodeHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICodeHolder.js
new file mode 100644
index 00000000000..a70316eac4b
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICodeHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var ICodeHolder = function() {
+ };
+ stjs.extend(ICodeHolder, null, [], function(constructor, prototype) {
+ prototype.getCode = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return ICodeHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICreationIdHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICreationIdHolder.js
new file mode 100644
index 00000000000..e5f5d346f3c
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ICreationIdHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var ICreationIdHolder = function() {
+ };
+ stjs.extend(ICreationIdHolder, null, [], function(constructor, prototype) {
+ prototype.getCreationId = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return ICreationIdHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModificationDateHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModificationDateHolder.js
new file mode 100644
index 00000000000..d788552c783
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModificationDateHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IModificationDateHolder = function() {
+ };
+ stjs.extend(IModificationDateHolder, null, [], function(constructor, prototype) {
+ prototype.getModificationDate = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IModificationDateHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModifierHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModifierHolder.js
new file mode 100644
index 00000000000..5819140d54d
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IModifierHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IModifierHolder = function() {
+ };
+ stjs.extend(IModifierHolder, null, [], function(constructor, prototype) {
+ prototype.getModifier = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IModifierHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IParentChildrenHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IParentChildrenHolder.js
new file mode 100644
index 00000000000..8efe448944a
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IParentChildrenHolder.js
@@ -0,0 +1,13 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IParentChildrenHolder = function() {
+ };
+ stjs.extend(IParentChildrenHolder, null, [], function(constructor, prototype) {
+ prototype.getChildren = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ prototype.getParents = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IParentChildrenHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPermIdHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPermIdHolder.js
new file mode 100644
index 00000000000..8fd80c1fee0
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPermIdHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IPermIdHolder = function() {
+ };
+ stjs.extend(IPermIdHolder, null, [], function(constructor, prototype) {
+ prototype.getPermId = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IPermIdHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPropertiesHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPropertiesHolder.js
new file mode 100644
index 00000000000..18ecbaeac20
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IPropertiesHolder.js
@@ -0,0 +1,19 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IPropertiesHolder = function() {
+ };
+ stjs.extend(IPropertiesHolder, null, [], function(constructor, prototype) {
+ prototype.getProperty = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ prototype.getProperties = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ prototype.getMaterialProperties = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ prototype.getMaterialProperty = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IPropertiesHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistrationDateHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistrationDateHolder.js
new file mode 100644
index 00000000000..9d9277a1006
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistrationDateHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IRegistrationDateHolder = function() {
+ };
+ stjs.extend(IRegistrationDateHolder, null, [], function(constructor, prototype) {
+ prototype.getRegistrationDate = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IRegistrationDateHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistratorHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistratorHolder.js
new file mode 100644
index 00000000000..ecc77ed3326
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/IRegistratorHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var IRegistratorHolder = function() {
+ };
+ stjs.extend(IRegistratorHolder, null, [], function(constructor, prototype) {
+ prototype.getRegistrator = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return IRegistratorHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ISpaceHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ISpaceHolder.js
new file mode 100644
index 00000000000..7ba560c5204
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ISpaceHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var ISpaceHolder = function() {
+ };
+ stjs.extend(ISpaceHolder, null, [], function(constructor, prototype) {
+ prototype.getSpace = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return ISpaceHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ITagsHolder.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ITagsHolder.js
new file mode 100644
index 00000000000..fbe95dc188a
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/interfaces/ITagsHolder.js
@@ -0,0 +1,10 @@
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
+ var ITagsHolder = function() {
+ };
+ stjs.extend(ITagsHolder, null, [], function(constructor, prototype) {
+ prototype.getTags = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
+ return ITagsHolder;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operation/IOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperation.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operation/IOperation.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperation.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operation/IOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperationResult.js
similarity index 100%
rename from openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operation/IOperationResult.js
rename to openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/operations/IOperationResult.js
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDateFormat.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDateFormat.js
index fcf5d419a4c..052454ffdc0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDateFormat.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/IDateFormat.js
@@ -1,9 +1,10 @@
-/**
- * @author pkupczyk
- */
-define([ "stjs" ], function(stjs) {
+define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
var IDateFormat = function() {
};
- stjs.extend(IDateFormat, null, [], null, {});
+ stjs.extend(IDateFormat, null, [], function(constructor, prototype) {
+ prototype.getFormat = function() {
+ throw new exceptions.RuntimeException("Interface method.");
+ };
+ }, {});
return IDateFormat;
})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js
index 1a619c029d4..3d9e74016ce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchFieldType.js
@@ -1,11 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- PROPERTY : "PROPERTY",
- ATTRIBUTE : "ATTRIBUTE",
- ANY_PROPERTY : "ANY_PROPERTY",
- ANY_FIELD : "ANY_FIELD"
+
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var SearchFieldType = function() {
+ Enum.call(this, [ "PROPERTY", "ATTRIBUTE", "ANY_PROPERTY", "ANY_FIELD" ]);
};
+ stjs.extend(SearchFieldType, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new SearchFieldType();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js
index 361caa21708..dc375db6537 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/common/search/SearchOperator.js
@@ -1,9 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- AND : "AND",
- OR : "OR"
+
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var SearchOperator = function() {
+ Enum.call(this, [ "AND", "OR" ]);
};
-})
+ stjs.extend(SearchOperator, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new SearchOperator();
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js
index 6f4885060ef..21531e57f71 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/ArchivingStatus.js
@@ -1,13 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- AVAILABLE : "AVAILABLE",
- LOCKED : "LOCKED",
- ARCHIVED : "ARCHIVED",
- UNARCHIVE_PENDING : "UNARCHIVE_PENDING",
- ARCHIVE_PENDING : "ARCHIVE_PENDING",
- BACKUP_PENDING : "BACKUP_PENDING"
+
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var ArchivingStatus = function() {
+ Enum.call(this, [ "AVAILABLE", "LOCKED", "ARCHIVED", "UNARCHIVE_PENDING", "ARCHIVE_PENDING", "BACKUP_PENDING" ]);
};
-})
+ stjs.extend(ArchivingStatus, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new ArchivingStatus();
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js
index 308b93f49f0..2c19f5ee6ce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/Complete.js
@@ -1,10 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- YES : "YES",
- NO : "NO",
- UNKNOWN : "UNKNOWN"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var Complete = function() {
+ Enum.call(this, [ "YES", "NO", "UNKNOWN" ]);
};
-})
+ stjs.extend(Complete, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new Complete();
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js
index ff5f0eeddf9..1818551542d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/DataSetKind.js
@@ -1,10 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- PHYSICAL : "PHYSICAL",
- CONTAINER : "CONTAINER",
- LINK : "LINK"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var DataSetKind = function() {
+ Enum.call(this, [ "PHYSICAL", "CONTAINER", "LINK" ]);
};
-})
+ stjs.extend(DataSetKind, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new DataSetKind();
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js
index 02a2f7433f9..37a3d18854b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/history/DataSetRelationType.js
@@ -1,13 +1,12 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- EXPERIMENT : "EXPERIMENT",
- SAMPLE : "SAMPLE",
- PARENT : "PARENT",
- CHILD : "CHILD",
- CONTAINER : "CONTAINER",
- COMPONENT : "COMPONENT"
+
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var DataSetRelationType = function() {
+ Enum.call(this, [ "EXPERIMENT", "SAMPLE", "PARENT", "CHILD", "CONTAINER", "COMPONENT" ]);
};
+ stjs.extend(DataSetRelationType, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new DataSetRelationType();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js
index 884afaaf121..828b3c375c0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/dataset/search/DataSetSearchRelation.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- DATASET : "DATASET",
- PARENTS : "PARENTS",
- CHILDREN : "CHILDREN",
- CONTAINER : "CONTAINER"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var DataSetSearchRelation = function() {
+ Enum.call(this, [ "DATASET", "PARENTS", "CHILDREN", "CONTAINER" ]);
};
+ stjs.extend(DataSetSearchRelation, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new DataSetSearchRelation();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js
index 33dbd998bdd..deb731afe66 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
var CreateExperimentsOperation = function() {
};
stjs.extend(CreateExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js
index b6cd1ac2604..41c69b4506f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/create/CreateExperimentsOperationResult.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var CreateExperimentsOperationResult = function() {
};
stjs.extend(CreateExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js
index 0cd8b606230..aa3e153c693 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/history/ExperimentRelationType.js
@@ -1,10 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- PROJECT : "PROJECT",
- SAMPLE : "SAMPLE",
- DATA_SET : "DATA_SET"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var ExperimentRelationType = function() {
+ Enum.call(this, [ "PROJECT", "SAMPLE", "DATA_SET" ]);
};
+ stjs.extend(ExperimentRelationType, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new ExperimentRelationType();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js
index 29ca80c53d1..952d2305ae9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
var ListExperimentsOperation = function() {
};
stjs.extend(ListExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js
index 489783de3af..754773930ca 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/list/ListExperimentsOperationResult.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var ListExperimentsOperationResult = function() {
};
stjs.extend(ListExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js
index efaf1fb36a6..bfb056eba3c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
var SearchForExperimentsOperation = function() {
};
stjs.extend(SearchForExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js
index 2f0884bb81c..89b5f3b41f8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/search/SearchExperimentsOperationResult.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var SearchForExperimentsOperationResult = function() {
};
stjs.extend(SearchForExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js
index eadc2037532..823202d8a50 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
var UpdateExperimentsOperation = function() {
};
stjs.extend(UpdateExperimentsOperation, null, [ IOperation ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js
index a59db7f4a15..7db9668dc2c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/experiment/update/UpdateExperimentsOperationResult.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var UpdateExperimentsOperationResult = function() {
};
stjs.extend(UpdateExperimentsOperationResult, null, [ IOperationResult ], function(constructor, prototype) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/IRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/IRelationType.js
new file mode 100644
index 00000000000..0d3c0c7eb4b
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/history/IRelationType.js
@@ -0,0 +1,6 @@
+define([ "stjs" ], function(stjs) {
+ var IRelationType = function() {
+ };
+ stjs.extend(IRelationType, null, [], null, {});
+ return IRelationType;
+})
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js
index 7064b881b2a..d2983d130c7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/project/history/ProjectRelationType.js
@@ -1,9 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- SPACE : "SPACE",
- EXPERIMENT : "EXPERIMENT"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var ProjectRelationType = function() {
+ Enum.call(this, [ "SPACE", "EXPERIMENT" ]);
};
+ stjs.extend(ProjectRelationType, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new ProjectRelationType();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js
index b999447487f..93411fc5085 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesOperation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
var CreateSamplesOperation = function(creations) {
this.creations = creations;
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js
index b4d74ae119e..98270a2d8ce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/create/CreateSamplesResult.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperationResult" ], function(stjs, IOperationResult) {
+define([ "stjs", "dto/common/operations/IOperationResult" ], function(stjs, IOperationResult) {
var CreateSamplesResult = function(permIds) {
this.permIds = permIds;
};
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js
index e6cedc087ce..1ca5bf0f024 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/history/SampleRelationType.js
@@ -1,14 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- SPACE : "SPACE",
- EXPERIMENT : "EXPERIMENT",
- PARENT : "PARENT",
- CHILD : "CHILD",
- CONTAINER : "CONTAINER",
- COMPONENT : "COMPONENT",
- DATA_SET : "DATA_SET"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var SampleRelationType = function() {
+ Enum.call(this, [ "SPACE", "EXPERIMENT", "PARENT", "CHILD", "CONTAINER", "COMPONENT", "DATA_SET" ]);
};
+ stjs.extend(SampleRelationType, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new SampleRelationType();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js
index 01b548919f6..fc131e58665 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js
@@ -1,11 +1,11 @@
/**
* @author pkupczyk
*/
-define([ "stjs" ], function(stjs) {
- return {
- SAMPLE : "SAMPLE",
- PARENTS : "PARENTS",
- CHILDREN : "CHILDREN",
- CONTAINER : "CONTAINER"
+define([ "stjs", "dto/common/Enum" ], function(stjs, Enum) {
+ var SampleSearchRelation = function() {
+ Enum.call(this, [ "SAMPLE", "PARENTS", "CHILDREN", "CONTAINER" ]);
};
+ stjs.extend(SampleSearchRelation, Enum, [ Enum ], function(constructor, prototype) {
+ }, {});
+ return new SampleSearchRelation();
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js
index 77f4050513c..8fbbaf6df0b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js
@@ -1,7 +1,7 @@
/**
* @author pkupczyk
*/
-define([ "stjs", "dto/common/operation/IOperation" ], function(stjs, IOperation) {
+define([ "stjs", "dto/common/operations/IOperation" ], function(stjs, IOperation) {
var UpdateSamplesOperation = function(updates) {
this.updates = updates;
};
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntitySortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntitySortOptions.java
index 06751eca18e..cf1b15217a4 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntitySortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntitySortOptions.java
@@ -16,6 +16,8 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.fetchoptions;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces.IRegistrationDateHolder;
@@ -30,10 +32,13 @@ public class EntitySortOptions<OBJECT extends ICodeHolder & IRegistrationDateHol
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public static final String CODE = "CODE";
+ @JsonIgnore
public static final String MODIFICATION_DATE = "MODIFICATION_DATE";
+ @JsonIgnore
public static final String REGISTRATION_DATE = "REGISTRATION_DATE";
public SortOrder code()
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
index b9872fb7d74..e9765b6a53e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
@@ -16,6 +16,8 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.fetchoptions;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces.ICodeHolder;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces.IModificationDateHolder;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces.IPropertiesHolder;
@@ -32,6 +34,7 @@ public class EntityWithPropertiesSortOptions<OBJECT extends ICodeHolder & IRegis
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public static final String PROPERTY = "PROPERTY";
public SortOrder property(String propertyName)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IAttachmentsHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IAttachmentsHolder.java
index 3d142902d7e..8a8645df1a1 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IAttachmentsHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IAttachmentsHolder.java
@@ -19,10 +19,12 @@ package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import java.util.List;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.attachment.Attachment;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IAttachmentsHolder")
public interface IAttachmentsHolder
{
List<Attachment> getAttachments();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICodeHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICodeHolder.java
index 291a5e4e6fe..ab4d9951184 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICodeHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICodeHolder.java
@@ -16,9 +16,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
/**
* @author pkupczyk
*/
+@JsonObject("dto.common.interfaces.ICodeHolder")
public interface ICodeHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICreationIdHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICreationIdHolder.java
index e30e7edc813..4e4d8cb0a89 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICreationIdHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ICreationIdHolder.java
@@ -17,10 +17,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.id.CreationId;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
+@JsonObject("dto.common.interfaces.ICreationIdHolder")
public interface ICreationIdHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModificationDateHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModificationDateHolder.java
index 42a955f34f6..9ea900749d5 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModificationDateHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModificationDateHolder.java
@@ -18,9 +18,12 @@ package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import java.util.Date;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IModificationDateHolder")
public interface IModificationDateHolder
{
Date getModificationDate();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModifierHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModifierHolder.java
index 376e381ed5b..81e5330118f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModifierHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IModifierHolder.java
@@ -17,10 +17,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.person.Person;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IModifierHolder")
public interface IModifierHolder
{
Person getModifier();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IParentChildrenHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IParentChildrenHolder.java
index c3164b70829..f2d204904ef 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IParentChildrenHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IParentChildrenHolder.java
@@ -18,9 +18,12 @@ package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import java.util.List;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IParentChildrenHolder")
public interface IParentChildrenHolder<T>
{
List<T> getParents();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPermIdHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPermIdHolder.java
index cedc211c34f..7d16280e14b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPermIdHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPermIdHolder.java
@@ -17,10 +17,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.id.IObjectId;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
+@JsonObject("dto.common.interfaces.IPermIdHolder")
public interface IPermIdHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPropertiesHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPropertiesHolder.java
index 93f78690126..a3240c3c773 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPropertiesHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IPropertiesHolder.java
@@ -19,10 +19,12 @@ package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import java.util.Map;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.material.Material;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IPropertiesHolder")
public interface IPropertiesHolder
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistrationDateHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistrationDateHolder.java
index 98e57d613e6..49f86a4b278 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistrationDateHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistrationDateHolder.java
@@ -18,9 +18,12 @@ package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import java.util.Date;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IRegistrationDateHolder")
public interface IRegistrationDateHolder
{
Date getRegistrationDate();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistratorHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistratorHolder.java
index 9c0f4d8fa12..d4d2cf8fc1e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistratorHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/IRegistratorHolder.java
@@ -17,10 +17,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.person.Person;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.IRegistratorHolder")
public interface IRegistratorHolder
{
Person getRegistrator();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ISpaceHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ISpaceHolder.java
index 679fa653e4b..60ede91da87 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ISpaceHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ISpaceHolder.java
@@ -17,10 +17,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.space.Space;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.ISpaceHolder")
public interface ISpaceHolder
{
Space getSpace();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ITagsHolder.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ITagsHolder.java
index d6a8537e4d8..a34fe44dd63 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ITagsHolder.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/common/interfaces/ITagsHolder.java
@@ -19,10 +19,12 @@ package ch.ethz.sis.openbis.generic.as.api.v3.dto.common.interfaces;
import java.util.Set;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.tag.Tag;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Jakub Straszewski
*/
+@JsonObject("dto.common.interfaces.ITagsHolder")
public interface ITagsHolder
{
Set<Tag> getTags();
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperation.java
index 11009f21116..b33ff2a35be 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperation.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.search.SearchForExperimentsOperation")
+@JsonObject("dto.experiment.search.SearchExperimentsOperation")
public class SearchExperimentsOperation implements IOperation
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperationResult.java
index ba291d6232a..b7775cd5bf6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/experiment/search/SearchExperimentsOperationResult.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("dto.experiment.search.SearchForExperimentsOperationResult")
+@JsonObject("dto.experiment.search.SearchExperimentsOperationResult")
public class SearchExperimentsOperationResult implements IOperationResult
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/history/IRelationType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/history/IRelationType.java
index 0841b22f6cd..3016aca75b3 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/history/IRelationType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/history/IRelationType.java
@@ -16,9 +16,12 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.history;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
/**
* @author pkupczyk
*/
+@JsonObject("dto.history.IRelationType")
public interface IRelationType
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/tag/fetchoptions/TagSortOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/tag/fetchoptions/TagSortOptions.java
index fc55c708598..3961a470a54 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/tag/fetchoptions/TagSortOptions.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/as/api/v3/dto/tag/fetchoptions/TagSortOptions.java
@@ -16,6 +16,8 @@
package ch.ethz.sis.openbis.generic.as.api.v3.dto.tag.fetchoptions;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.fetchoptions.SortOptions;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.fetchoptions.SortOrder;
import ch.ethz.sis.openbis.generic.as.api.v3.dto.tag.Tag;
@@ -30,8 +32,10 @@ public class TagSortOptions extends SortOptions<Tag>
private static final long serialVersionUID = 1L;
+ @JsonIgnore
public static final String CODE = "CODE";
+ @JsonIgnore
public static final String REGISTRATION_DATE = "REGISTRATION_DATE";
public SortOrder code()
--
GitLab