SSDM-3529: reformat code

SVN: 36475

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java

@@ -712,15 +712,19 @@ public class AbstractTest extends SystemTestCase
         return codes;
     }
     
-    protected List<String> extractVocabularyCodes(List<PropertyAssignment> propertyAssignments) {
-    	List<String> codes = new ArrayList<>();
-        	if(propertyAssignments != null) {
-        		for(PropertyAssignment propertyAssignment : propertyAssignments) {
-                	if(propertyAssignment.getVocabulary() != null) {
-                		codes.add(propertyAssignment.getVocabulary().getCode());
-                	}
+    protected List<String> extractVocabularyCodes(List<PropertyAssignment> propertyAssignments)
+    {
+        List<String> codes = new ArrayList<>();
+        if (propertyAssignments != null)
+        {
+            for (PropertyAssignment propertyAssignment : propertyAssignments)
+            {
+                if (propertyAssignment.getVocabulary() != null)
+                {
+                    codes.add(propertyAssignment.getVocabulary().getCode());
                 }
-        	}
+            }
+        }
         return codes;
     }
 

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java

@@ -111,8 +111,9 @@ public class SearchDataSetTypeTest extends AbstractTest
                 + "HCS_IMAGE_ANALYSIS_DATA:, LINK_TYPE:, REQUIRES_EXPERIMENT:, UNKNOWN:, "
                 + "VALIDATED_CONTAINER_TYPE:, VALIDATED_IMPOSSIBLE_TO_UPDATE_TYPE:, VALIDATED_NORMAL_TYPE:]");
         List<String> vocabularyCodes = new ArrayList<String>();
-        for(DataSetType type:types) {
-        	vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
+        for (DataSetType type : types)
+        {
+            vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
         }
         Collections.sort(vocabularyCodes);
         assertEquals(vocabularyCodes.toString(), "[GENDER, ORGANISM, ORGANISM]");

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTypeTest.java

@@ -52,8 +52,9 @@ public class SearchExperimentTypeTest extends AbstractTest
         assertEquals(types.get(0).getFetchOptions().hasPropertyAssignments(), true);
         
         List<String> vocabularyCodes = new ArrayList<String>();
-        for(ExperimentType type:types) {
-        	vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
+        for (ExperimentType type : types)
+        {
+            vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
         }
         Collections.sort(vocabularyCodes);
         assertEquals(vocabularyCodes.toString(), "[GENDER, ORGANISM]");

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTypeTest.java

@@ -48,16 +48,18 @@ public class SearchMaterialTypeTest extends AbstractTest
         List<MaterialType> types = searchResult.getObjects();
         List<String> codes = extractCodes(types);
         Collections.sort(codes);
-        assertEquals(codes.toString(), "[BACTERIUM, CELL_LINE, COMPOUND, CONTROL, DELETION_TEST, GENE, OTHER_REF, SELF_REF, SIRNA, SLOW_GENE, VIRUS]");
+        assertEquals(codes.toString(),
+                "[BACTERIUM, CELL_LINE, COMPOUND, CONTROL, DELETION_TEST, GENE, OTHER_REF, SELF_REF, SIRNA, SLOW_GENE, VIRUS]");
         assertEquals(types.get(0).getFetchOptions().hasPropertyAssignments(), true);
-        
+
         List<String> vocabularyCodes = new ArrayList<String>();
-        for(MaterialType type:types) {
-        	vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
+        for (MaterialType type : types)
+        {
+            vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
         }
         Collections.sort(vocabularyCodes);
         assertEquals(vocabularyCodes.toString(), "[ORGANISM, ORGANISM]");
-        
+
         v3api.logout(sessionToken);
     }
 

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTypeTest.java

@@ -48,15 +48,16 @@ public class SearchSampleTypeTest extends AbstractTest
 
         List<SampleType> types = searchResult.getObjects();
         List<String> codes = extractCodes(types);
-        
+
         List<String> vocabularyCodes = new ArrayList<String>();
-        for(SampleType type:types) {
-        	vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
+        for (SampleType type : types)
+        {
+            vocabularyCodes.addAll(extractVocabularyCodes(type.getPropertyAssignments()));
         }
-        
+
         Collections.sort(vocabularyCodes);
         assertEquals(
-        		vocabularyCodes.toString(),
+                vocabularyCodes.toString(),
                 "[$PLATE_GEOMETRY, $PLATE_GEOMETRY, ORGANISM, ORGANISM, TEST_VOCABULARY]");
         Collections.sort(codes);
         assertEquals(