diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java index 2d8d392c64d2da47a5660bc1207d5cbfb3925733..13fe13e235ab5d63d999b2d356974d10c01814a3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java @@ -95,19 +95,18 @@ public class AtomicEntityOperationDetails implements Serializable this.dataSetUpdates = new ArrayList<DataSetBatchUpdatesDTO>(dataSetUpdates); } - // TODO: KUBA - put here the material updates as well - public AtomicEntityOperationDetails(TechId registrationId, String userIdOrNull, List<NewSpace> spaceRegistrations, List<NewProject> projectRegistrations, List<NewExperiment> experimentRegistrations, List<SampleUpdatesDTO> sampleUpdates, List<NewSample> sampleRegistrations, Map<String, List<NewMaterial>> materialRegistrations, + List<MaterialUpdateDTO> materialUpdates, List<? extends NewExternalData> dataSetRegistrations, List<DataSetBatchUpdatesDTO> dataSetUpdates, Integer batchSizeOrNull) { this(registrationId, userIdOrNull, spaceRegistrations, projectRegistrations, experimentRegistrations, sampleUpdates, sampleRegistrations, materialRegistrations, - new ArrayList<MaterialUpdateDTO>(), dataSetRegistrations, dataSetUpdates); + materialUpdates, dataSetRegistrations, dataSetUpdates); this.batchSizeOrNull = batchSizeOrNull; } diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java index fde04135691c7416a4502bd741384725b1454b33..4e7cd2fde5e4ac510c8703fc30904d3e1282bc03 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java @@ -314,12 +314,13 @@ public class ETLServiceDatabaseTest extends AbstractDAOTest List<SampleUpdatesDTO> sampleUpdates = Collections.emptyList(); List<NewSample> sampleRegistrations = Collections.emptyList(); Map<String, List<NewMaterial>> materialRegistrations = Collections.emptyMap(); + List<MaterialUpdateDTO> materialUpdates = Collections.emptyList(); List<? extends NewExternalData> dataSetRegistrations = Collections.emptyList(); AtomicEntityOperationDetails details = new AtomicEntityOperationDetails(registrationid, null, spaceRegistrations, projectRegistrations, experimentRegistrations, sampleUpdates, - sampleRegistrations, materialRegistrations, dataSetRegistrations, - dataSetUpdates, batchSizeOrNull); + sampleRegistrations, materialRegistrations, materialUpdates, + dataSetRegistrations, dataSetUpdates, batchSizeOrNull); service.performEntityOperations(sessionToken, details); } @@ -332,13 +333,14 @@ public class ETLServiceDatabaseTest extends AbstractDAOTest List<NewSample> sampleRegistrations = Collections.emptyList(); Map<String, List<NewMaterial>> materialRegistrations = Collections.emptyMap(); + List<MaterialUpdateDTO> materialUpdates = Collections.emptyList(); List<? extends NewExternalData> dataSetRegistrations = Collections.emptyList(); List<DataSetBatchUpdatesDTO> dataSetUpdates = Collections.emptyList(); AtomicEntityOperationDetails details = new AtomicEntityOperationDetails(registrationid, null, spaceRegistrations, projectRegistrations, experimentRegistrations, sampleUpdates, - sampleRegistrations, materialRegistrations, dataSetRegistrations, - dataSetUpdates, batchSizeOrNull); + sampleRegistrations, materialRegistrations, materialUpdates, + dataSetRegistrations, dataSetUpdates, batchSizeOrNull); service.performEntityOperations(sessionToken, details); }