SE-235 adapt to modified service interface to openBIS

SVN: 15484

eu_basysbio/source/java/eu/basysbio/cisd/dss/DataSetPropertiesValidator.java

@@ -107,12 +107,13 @@ class DataSetPropertiesValidator
         }
         StringBuilder errorMessage =
                 createErrorMessage(missingPropertyTypes, wrongDataTypePropertyTypes);
+        String dataSetTypeCode = dataSetType.getDataSetType().getCode();
         if (errorMessage.length() > 0)
         {
             throw new ConfigurationFailureException("Wrong property assignments for data set type "
-                    + dataSetType.getCode() + ":\n" + errorMessage);
+                    + dataSetTypeCode + ":\n" + errorMessage);
         }
-        dataSetType2PropertyTypeMap.put(dataSetType.getCode(), map);
+        dataSetType2PropertyTypeMap.put(dataSetTypeCode, map);
     }
 
     private StringBuilder createErrorMessage(List<TimePointPropertyType> missingPropertyTypes,

eu_basysbio/sourceTest/java/eu/basysbio/cisd/dss/TimeSeriesDataSetHandlerTest.java

@@ -628,7 +628,7 @@ public class TimeSeriesDataSetHandlerTest extends AbstractFileSystemTestCase
                     {
                         one(service).getDataSetType(dataSetTypeCode);
                         DataSetTypeWithVocabularyTerms type = new DataSetTypeWithVocabularyTerms();
-                        type.setCode(dataSetTypeCode);
+                        type.setDataSetType(new DataSetType(dataSetTypeCode));
                         for (TimePointPropertyType timePointPropertyType : TimePointPropertyType
                                 .values())
                         {