diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java
index eff5902fbc383bd13a9975ee9426a6e3f5ddb7a1..62c0fd1f111a8a875701aa1ffa0ada4ec1c8032e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java
@@ -25,6 +25,7 @@ import ch.systemsx.cisd.authentication.IAuthenticationService;
import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.authentication.Principal;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataTable;
import ch.systemsx.cisd.openbis.generic.server.business.bo.datasetlister.IDatasetLister;
@@ -33,7 +34,6 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
/**
* @author Franz-Josef Elmer
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index bd6dfa4938e4fabfb0199b3e306f4c6c66a9e79e..c58184e8557e7a5dccf7c5c46b3fcbe2a6db1188 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -30,6 +30,8 @@ import ch.systemsx.cisd.authentication.Principal;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.AbstractServiceWithLogger;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
+import ch.systemsx.cisd.openbis.generic.server.business.PropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.DynamicPropertyEvaluationOperation;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDynamicPropertyEvaluationScheduler;
@@ -64,8 +66,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.translator.GridCustomExpressionTranslator.GridCustomColumnTranslator;
import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
import ch.systemsx.cisd.openbis.generic.shared.util.ServerUtils;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
-import ch.systemsx.cisd.openbis.plugin.generic.server.PropertiesBatchManager;
/**
* An <i>abstract</i> {@link IServer} implementation.
@@ -127,7 +127,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
{
if (propertiesBatchManager == null)
{
- propertiesBatchManager = new PropertiesBatchManager(daoFactory);
+ propertiesBatchManager = new PropertiesBatchManager();
}
return propertiesBatchManager;
}
@@ -446,7 +446,6 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
protected void registerSamples(final Session session,
final NewSamplesWithTypes newSamplesWithType, PersonPE registratorOrNull)
{
- getPropertiesBatchManager().manageProperties(newSamplesWithType);
final SampleType sampleType = newSamplesWithType.getSampleType();
final List<NewSample> newSamples = newSamplesWithType.getNewSamples();
assert sampleType != null : "Unspecified sample type.";
@@ -466,6 +465,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
throw UserFailureException.fromTemplate("Sample type with code '%s' does not exist.",
sampleTypeCode);
}
+ getPropertiesBatchManager().manageProperties(sampleTypePE, newSamplesWithType);
getSampleTypeSlaveServerPlugin(sampleTypePE).registerSamples(session, newSamples,
registratorOrNull);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index 14618d72957b16b6a25197aae936ea78d86828a3..5c6e2db4e1320071e56fea4dcf27a39a7dd0cbe2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
@@ -38,6 +38,7 @@ import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.authentication.Principal;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.DataAccessExceptionTranslator;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IAttachmentBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IAuthorizationGroupBO;
@@ -209,7 +210,6 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTermTranslat
import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTranslator;
import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
public final class CommonServer extends AbstractCommonServer<ICommonServerForInternalUse> implements
ICommonServerForInternalUse
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index fbb836599f492501a3f87d6dfedaf223044d58f9..9a07a05010ca82b9f3510afdfdde2f29dea38f7a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -32,6 +32,7 @@ import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.business.IDataStoreServiceFactory;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExperimentBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataBO;
@@ -117,7 +118,6 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTypeTranslator;
import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTermTranslator;
import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
/**
* @author Franz-Josef Elmer
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java
index 1d0cfd79de254ce6ebdfabe820dcfc3e68e9df5e..e328de81b89c6c79dd52ef3571e30db2a9ae25a9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java
@@ -23,6 +23,7 @@ import java.util.Map;
import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
import ch.systemsx.cisd.openbis.generic.server.business.bo.datasetlister.IDatasetLister;
import ch.systemsx.cisd.openbis.generic.server.business.bo.samplelister.ISampleLister;
@@ -36,7 +37,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TrackingDataSetCriteria;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TrackingSampleCriteria;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
public final class TrackingServer extends AbstractServer<ITrackingServer> implements
ITrackingServer
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
index 62c387ad3580da164a97dcaa2372d809dae70337..d02ac16ed18551679ae47c5dbb6a94069a7f8796 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataStoreDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDatabaseInstanceDAO;
@@ -64,7 +65,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
/**
* @author Franz-Josef Elmer
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IPropertiesBatchManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.java
similarity index 68%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IPropertiesBatchManager.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.java
index 465030353ed25ffdc7e216d594986469ac05b19b..69112f488168050cbf163173f90a7ec965328738 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IPropertiesBatchManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.java
@@ -14,14 +14,16 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.generic.server;
+package ch.systemsx.cisd.openbis.generic.server.business;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperimentsWithType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewMaterial;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSamplesWithTypes;
+import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialTypePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
/**
* Interface of classes which manage managed properties in batch updates.
@@ -30,9 +32,9 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialTypePE;
*/
public interface IPropertiesBatchManager
{
- public void manageProperties(NewSamplesWithTypes newSamplesWithTypes);
+ public void manageProperties(SampleTypePE sampleType, NewSamplesWithTypes newSamplesWithTypes);
- public void manageProperties(NewExperimentsWithType experiments);
+ public void manageProperties(ExperimentTypePE experimentType, NewExperimentsWithType experiments);
- public void manageProperties(MaterialTypePE materialTypePE, List<NewMaterial> newMaterials);
+ public void manageProperties(MaterialTypePE materialType, List<NewMaterial> newMaterials);
}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/PropertiesBatchManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.java
similarity index 85%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/PropertiesBatchManager.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.java
index 1998588bdd78a09bfb4dd2392eb8941298111ce2..37dc98f544c786c3f780749eb1c6b573740d6932 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/PropertiesBatchManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.generic.server;
+package ch.systemsx.cisd.openbis.generic.server.business;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,8 +24,6 @@ import java.util.Map.Entry;
import java.util.Set;
import ch.systemsx.cisd.common.evaluator.EvaluatorException;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISampleTypeDAO;
import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
@@ -42,7 +40,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ScriptPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.managed_property.ManagedPropertyEvaluator;
/**
@@ -52,38 +49,26 @@ import ch.systemsx.cisd.openbis.generic.shared.managed_property.ManagedPropertyE
*/
public class PropertiesBatchManager implements IPropertiesBatchManager
{
- final IDAOFactory daoFactory;
-
- public PropertiesBatchManager(IDAOFactory daoFactory)
- {
- this.daoFactory = daoFactory;
- }
-
- public void manageProperties(NewSamplesWithTypes newSamplesWithTypes)
+ public void manageProperties(SampleTypePE sampleType, NewSamplesWithTypes newSamplesWithTypes)
{
- ISampleTypeDAO sampleTypeDAO = daoFactory.getSampleTypeDAO();
- String code = newSamplesWithTypes.getSampleType().getCode();
- SampleTypePE sampleType = sampleTypeDAO.tryFindSampleTypeByCode(code);
Set<? extends EntityTypePropertyTypePE> sampleTypePropertyTypes =
sampleType.getSampleTypePropertyTypes();
managePropertiesBeans(newSamplesWithTypes.getNewSamples(), sampleTypePropertyTypes);
}
- public void manageProperties(NewExperimentsWithType experiments)
+ public void manageProperties(ExperimentTypePE experimentType, NewExperimentsWithType experiments)
{
- String code = experiments.getExperimentTypeCode();
- ExperimentTypePE entityType = (ExperimentTypePE) daoFactory.getEntityTypeDAO(EntityKind.EXPERIMENT).tryToFindEntityTypeByCode(code);
Set<? extends EntityTypePropertyTypePE> entityTypePropertyTypes =
- entityType.getExperimentTypePropertyTypes();
+ experimentType.getExperimentTypePropertyTypes();
managePropertiesBeans(experiments.getNewExperiments(), entityTypePropertyTypes);
}
- public void manageProperties(MaterialTypePE materialTypePE, List<NewMaterial> newMaterials)
+ public void manageProperties(MaterialTypePE materialType, List<NewMaterial> newMaterials)
{
Set<? extends EntityTypePropertyTypePE> entityTypePropertyTypes =
- materialTypePE.getMaterialTypePropertyTypes();
+ materialType.getMaterialTypePropertyTypes();
managePropertiesBeans(newMaterials, entityTypePropertyTypes);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
index c8412ff0fea785b6c03d961a9140f640ace9dc04..c0689bb4b08c6d57e79fb56c7c63072ca0c8fece 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
@@ -27,6 +27,7 @@ import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.exceptions.NotImplementedException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleBO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
@@ -42,7 +43,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
import ch.systemsx.cisd.openbis.plugin.demo.shared.IDemoServer;
import ch.systemsx.cisd.openbis.plugin.demo.shared.ResourceNames;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
/**
* The concrete {@link IDemoServer} implementation.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
index 58337ef9c66ef991445ad8b76de05de22ebdad61..51452c9d3ce5b8213a1011a836b10455eeb126f2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
@@ -41,6 +41,7 @@ import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor;
import ch.systemsx.cisd.openbis.generic.server.batch.IBatchOperation;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExperimentBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IMaterialBO;
@@ -831,7 +832,6 @@ public final class GenericServer extends AbstractServer<IGenericServer> implemen
assert sessionToken != null : "Unspecified session token.";
assert experiments.getExperimentTypeCode() != null : "Experiments type not specified";
assert experiments.getNewExperiments() != null : "Experiments collection not specified";
- getPropertiesBatchManager().manageProperties(experiments);
final Session session = getSession(sessionToken);
final List<NewBasicExperiment> newExperiments = experiments.getNewExperiments();
@@ -848,6 +848,7 @@ public final class GenericServer extends AbstractServer<IGenericServer> implemen
throw UserFailureException.fromTemplate(
"Experiment type with code '%s' does not exist.", experimentTypePE);
}
+ getPropertiesBatchManager().manageProperties(experimentTypePE, experiments);
BatchOperationExecutor.executeInBatches(new ExperimentBatchRegistration(
businessObjectFactory.createExperimentTable(session), newExperiments,
experimentTypePE));
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java
index 9ab7ab75cb70f9871fea5fd0bcac1d8ca8762da3..db219b7d4d9d35682ffb884b4272444bc1ad1d20 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java
@@ -33,6 +33,7 @@ import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.DataAccessExceptionTranslator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IQueryDAO;
@@ -44,7 +45,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.QueryType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
import ch.systemsx.cisd.openbis.generic.shared.dto.QueryPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.plugin.query.shared.DatabaseDefinition;
import ch.systemsx.cisd.openbis.plugin.query.shared.IQueryDatabaseDefinitionProvider;
import ch.systemsx.cisd.openbis.plugin.query.shared.IQueryServer;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
index 368e80c69d8a11876f9c6cfa60a3039cb380cb23..3d1df01112f48686acec42439a7685ee6fad9021 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
@@ -32,6 +32,7 @@ import ch.systemsx.cisd.authentication.Principal;
import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.openbis.generic.server.CommonServerTest.PersonWithDisplaySettingsMatcher;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IEntityTypeBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IEntityTypePropertyTypeBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExperimentBO;
@@ -77,7 +78,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
/**
* An <i>abstract</i> test infrastructure for {@link IServer} implementations.
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java
index 311a954962a79fd455c5ee6f4b365c0ee93dfe11..0553e457ef1c99f175411472eb222b98a3e0d8bb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java
@@ -268,6 +268,8 @@ public class CommonTestUtils
public static final SampleTypePE createSampleType()
{
final SampleTypePE sampleTypePE = new SampleTypePE();
+ sampleTypePE.setId(1234567890123456L);
+ sampleTypePE.setDatabaseInstance(createHomeDatabaseInstance());
sampleTypePE.setCode(CommonTestUtils.SAMPLE_TYPE);
sampleTypePE.setGeneratedFromHierarchyDepth(0);
sampleTypePE.setContainerHierarchyDepth(0);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java
index 58f5355984408da91e869b6da05ea74b269d623d..b3fe8406dc67b939246f85749699153d4f749a38 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java
@@ -19,11 +19,11 @@ package ch.systemsx.cisd.openbis.plugin.demo.server;
import org.testng.annotations.BeforeMethod;
import ch.rinn.restrictions.Friend;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase;
import ch.systemsx.cisd.openbis.plugin.demo.shared.IDemoServer;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
/**
* Test cases for corresponding {@link DemoServer} class.
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
index c6592548895b2d1fd1065d1fdc533ee51b3b4347..f53ebac48fb49ff031d25408ff40a6b915563d70 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
@@ -251,12 +251,6 @@ public final class GenericServerTest extends AbstractServerTestCase
List<NewSamplesWithTypes> samplesWithTypes = new ArrayList<NewSamplesWithTypes>();
final NewSamplesWithTypes newSamplesWithType = new NewSamplesWithTypes(new SampleType(), newSamples);
samplesWithTypes.add(newSamplesWithType);
- context.checking(new Expectations()
- {
- {
- one(propertiesBatchManager).manageProperties(newSamplesWithType);
- }
- });
try
{
@@ -290,7 +284,7 @@ public final class GenericServerTest extends AbstractServerTestCase
one(sampleTypeSlaveServerPlugin).registerSamples(SESSION, newSamples, null);
- one(propertiesBatchManager).manageProperties(newSamplesWithType);
+ one(propertiesBatchManager).manageProperties(sampleTypePE, newSamplesWithType);
}
});
createServer().registerOrUpdateSamples(SESSION_TOKEN, samplesWithTypes);
@@ -319,7 +313,7 @@ public final class GenericServerTest extends AbstractServerTestCase
one(sampleTypeSlaveServerPlugin).registerSamples(SESSION, newSamples, null);
- one(propertiesBatchManager).manageProperties(newSamplesWithType);
+ one(propertiesBatchManager).manageProperties(sampleTypePE, newSamplesWithType);
}
});
createServer().registerSamples(SESSION_TOKEN, samplesWithTypes);
@@ -850,13 +844,8 @@ public final class GenericServerTest extends AbstractServerTestCase
prepareGetSession();
final NewExperimentsWithType experiments =
new NewExperimentsWithType(EXPERIMENT_TYPE, createNewExperiments());
- context.checking(new Expectations()
- {
- {
- one(propertiesBatchManager).manageProperties(experiments);
- }
- });
createServer().registerExperiments(SESSION_TOKEN, experiments);
+ context.assertIsSatisfied();
}
@Test
@@ -872,7 +861,7 @@ public final class GenericServerTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(propertiesBatchManager).manageProperties(experiments);
+ one(propertiesBatchManager).manageProperties(experimentTypePE, experiments);
one(daoFactory).getEntityTypeDAO(EntityKind.EXPERIMENT);
will(returnValue(entityTypeDAO));
one(entityTypeDAO).tryToFindEntityTypeByCode(EXPERIMENT_TYPE);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/PhosphoNetXServer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/PhosphoNetXServer.java
index ebfcb25bec61cc023c83bc84ce9f8d5a99f47927..0f66400367bc5130ccafed46a1ad06a15cc9ebe8 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/PhosphoNetXServer.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/PhosphoNetXServer.java
@@ -29,6 +29,7 @@ import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IVocabularyDAO;
import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
@@ -39,7 +40,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyPE;
import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTranslator;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.server.business.AccessionNumberBuilder;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.server.business.IAbundanceColumnDefinitionTable;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.server.business.IBusinessObjectFactory;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/ProteomicsDataServiceInternal.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/ProteomicsDataServiceInternal.java
index 5673cf414a7bb47b4996d2480931c0078767a7fc..8ff7a36249ba6291b8c11f1b6011d4ab57d3280e 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/ProteomicsDataServiceInternal.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/ProteomicsDataServiceInternal.java
@@ -30,6 +30,7 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataTable;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
@@ -52,7 +53,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.translator.ExperimentTranslator;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.server.business.ExperimentLoader;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.server.business.IBusinessObjectFactory;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.server.business.ISampleLoader;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/api/v1/ProteomicsDataService.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/api/v1/ProteomicsDataService.java
index 24707207de229d0a9fac3480333169a945310e8b..124eb5db4934a9aed00d641101e854c90a10c8da 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/api/v1/ProteomicsDataService.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/api/v1/ProteomicsDataService.java
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStoreServiceKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
@@ -48,7 +49,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DataStoreServicePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
import ch.systemsx.cisd.openbis.generic.shared.util.DataTypeUtils;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.IProteomicsDataServiceInternal;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.api.v1.IProteomicsDataService;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.api.v1.dto.DataSet;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
index 94d68c2e9e290e8e6e0cf7723493edd60c3eeca5..d2ab0a736d5ed215c2991f77f7186bc055f54d3d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
@@ -39,6 +39,7 @@ import ch.systemsx.cisd.common.mail.MailClient;
import ch.systemsx.cisd.common.mail.MailClientParameters;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleBO;
import ch.systemsx.cisd.openbis.generic.server.business.bo.common.DatabaseContextUtils;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
@@ -62,7 +63,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyPE;
import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTranslator;
-import ch.systemsx.cisd.openbis.plugin.generic.server.IPropertiesBatchManager;
import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.IScreeningQuery;
import ch.systemsx.cisd.openbis.plugin.screening.server.logic.PlateContentLoader;