From 5cfe0428fc3a00a5518b4ef25b81a60b1bc41e7c Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Fri, 27 Jul 2012 13:29:34 +0000
Subject: [PATCH] BIS-102 SP-146 add materialupdates as an addictional argument
SVN: 26245
---
.../shared/dto/AtomicEntityOperationDetails.java | 5 ++---
.../openbis/generic/server/ETLServiceDatabaseTest.java | 10 ++++++----
2 files changed, 8 insertions(+), 7 deletions(-)
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 2d8d392c64d..13fe13e235a 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 fde04135691..4e7cd2fde5e 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);
}
--
GitLab