SSDM-3401: Java part including system tests implemented.

SVN: 36075

openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java

@@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptionsToStringBuilder;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions.PropertyAssignmentFetchOptions;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
 import ch.systemsx.cisd.base.annotation.JsonObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -30,9 +31,34 @@ public class SampleTypeFetchOptions extends FetchOptions<SampleType> implements
 {
     private static final long serialVersionUID = 1L;
 
+    @JsonProperty
+    private PropertyAssignmentFetchOptions propertyAssignments;
+
     @JsonProperty
     private SampleTypeSortOptions sort;
 
+    // Method automatically generated with DtoGenerator
+    public PropertyAssignmentFetchOptions withPropertyAssignments()
+    {
+        if (propertyAssignments == null)
+        {
+            propertyAssignments = new PropertyAssignmentFetchOptions();
+        }
+        return propertyAssignments;
+    }
+
+    // Method automatically generated with DtoGenerator
+    public PropertyAssignmentFetchOptions withPropertyAssignmentsUsing(PropertyAssignmentFetchOptions fetchOptions)
+    {
+        return propertyAssignments = fetchOptions;
+    }
+
+    // Method automatically generated with DtoGenerator
+    public boolean hasPropertyAssignments()
+    {
+        return propertyAssignments != null;
+    }
+
     // Method automatically generated with DtoGenerator
     @Override
     public SampleTypeSortOptions sortBy()
@@ -54,6 +80,7 @@ public class SampleTypeFetchOptions extends FetchOptions<SampleType> implements
     protected FetchOptionsToStringBuilder getFetchOptionsStringBuilder()
     {
         FetchOptionsToStringBuilder f = new FetchOptionsToStringBuilder("SampleType", this);
+        f.addFetchOption("PropertyAssignments", propertyAssignments);
         return f;
     }
 

openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt

@@ -1063,4 +1063,34 @@ Vocabulary Term Update
 map Vocabulary Terms
 get Replaced Id
 get Replacement Id
-Vocabulary Term Replacement
+Vocabulary Term Replacement
\ No newline at end of file
+
+BOOLEAN
+CONTROLLEDVOCABULARY
+HYPERLINK
+INTEGER
+LABEL
+MULTILINE_VARCHAR
+REAL
+TIMESTAMP
+VARCHAR
+XML
+Data Type Code
+get Data Type Code
+get Property Assignments
+get Property Type
+has Property Assignments
+is Internal Name Space
+is Mandatory
+label
+Property Assignment
+Property Assignment Fetch Options
+Property Assignment Sort Options
+Property Type
+set Data Type Code
+set Internal Name Space
+set Mandatory
+set Property Assignments
+set Property Type
+with Property Assignments
+with Property Assignments Using