SSDM-2903 : V3 AS API - fix inconsistencies between Java and JS DTOs found by...

SSDM-2903 : V3 AS API - fix inconsistencies between Java and JS DTOs found by automated test (fixed 40 out of 77 problems)

SVN: 35278

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/search/SampleSearchRelation.js

 /**
  * @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();
 })

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/sample/update/UpdateSamplesOperation.js

 /**
  * @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;
 	};

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()

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)

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();

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
 {
 

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
 {
 

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();

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();

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();

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
 {
 

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
 {
 

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();

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();

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();

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();

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
 {
 

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
 {
 

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
 {
 

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()