From 3128679a139a15f98c4b256d94e6bc8db01d3acb Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 8 Feb 2011 21:29:20 +0000
Subject: [PATCH] [LMS-2029] minor: cleanup
SVN: 19819
---
.../business/bo/AbstractBusinessObject.java | 17 +++--------------
.../generic/server/dataaccess/IDAOFactory.java | 7 -------
...ynamicPropertyEvaluationMaintenanceTask.java | 3 ++-
.../generic/shared/AbstractServerTestCase.java | 7 -------
4 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
index 9be58a720ef..c6ff68ebb0c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
@@ -26,7 +26,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataSetTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataStoreDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDatabaseInstanceDAO;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDynamicPropertyEvaluationScheduler;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityPropertyTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEventDAO;
@@ -35,7 +34,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExternalDataDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IFileFormatTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IGridCustomColumnDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IGridCustomFilterDAO;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISpaceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IHibernateSearchDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.ILocatorTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMaterialDAO;
@@ -48,18 +46,18 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IRoleAssignmentDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISampleDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISampleTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IScriptDAO;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISpaceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IVocabularyDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IVocabularyTermDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.PersistencyResources;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.ICodeSequenceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.IPermIdDAO;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IFullTextIndexUpdateScheduler;
import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Identifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
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.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
@@ -151,7 +149,7 @@ abstract class AbstractBusinessObject implements IDAOFactory
final String code = String.valueOf(entityKind.name().charAt(0)) + id;
return code;
}
-
+
/**
* Returns the perm ID of specified identifier or creates a new one if it is <code>null</code>.
*/
@@ -330,13 +328,4 @@ abstract class AbstractBusinessObject implements IDAOFactory
return daoFactory.getRelationshipTypeDAO();
}
- public IDynamicPropertyEvaluationScheduler getDynamicPropertyEvaluationScheduler()
- {
- return daoFactory.getDynamicPropertyEvaluationScheduler();
- }
-
- public IFullTextIndexUpdateScheduler getFullTextIndexUpdateScheduler()
- {
- return daoFactory.getFullTextIndexUpdateScheduler();
- }
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
index 5cab584411c..629dd5bc04c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.generic.server.dataaccess;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.ICodeSequenceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.IPermIdDAO;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IFullTextIndexUpdateScheduler;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
/**
@@ -99,10 +98,4 @@ public interface IDAOFactory extends IAuthorizationDAOFactory
/** Returns an implementation of {@link IAuthorizationGroupDAO}. */
public IAuthorizationGroupDAO getAuthorizationGroupDAO();
- /** Returns an implementation of {@link IDynamicPropertyEvaluationScheduler}. */
- public IDynamicPropertyEvaluationScheduler getDynamicPropertyEvaluationScheduler();
-
- /** Returns an implementation of {@link IFullTextIndexUpdateScheduler}. */
- public IFullTextIndexUpdateScheduler getFullTextIndexUpdateScheduler();
-
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java
index 87f335e77fe..3ec0611edfa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java
@@ -59,7 +59,8 @@ public class DynamicPropertyEvaluationMaintenanceTask implements IMaintenanceTas
{
operationLog.info("execution started");
IDynamicPropertyEvaluationScheduler scheduler =
- CommonServiceProvider.getDAOFactory().getDynamicPropertyEvaluationScheduler();
+ CommonServiceProvider.getDAOFactory().getPersistencyResources()
+ .getDynamicPropertyEvaluationScheduler();
// all entities will be scheduled for update so previous schedule can be cleared
scheduler.clear();
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 3d1df01112f..e09823b102d 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
@@ -54,7 +54,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataSetTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataStoreDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDatabaseInstanceDAO;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDynamicPropertyEvaluationScheduler;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityTypeDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExperimentDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExternalDataDAO;
@@ -174,8 +173,6 @@ public abstract class AbstractServerTestCase extends AssertJUnit
protected IQueryDAO queryDAO;
- protected IDynamicPropertyEvaluationScheduler evaluator;
-
protected IPropertiesBatchManager propertiesBatchManager;
@BeforeMethod
@@ -226,8 +223,6 @@ public abstract class AbstractServerTestCase extends AssertJUnit
propertyTypeTable = context.mock(IPropertyTypeTable.class);
materialTable = context.mock(IMaterialTable.class);
materialLister = context.mock(IMaterialLister.class);
- //
- evaluator = context.mock(IDynamicPropertyEvaluationScheduler.class);
homeDatabaseInstance = CommonTestUtils.createHomeDatabaseInstance();
context.checking(new Expectations()
@@ -261,8 +256,6 @@ public abstract class AbstractServerTestCase extends AssertJUnit
will(returnValue(dataSetTypeDAO));
allowing(daoFactory).getDataStoreDAO();
will(returnValue(dataStoreDAO));
- allowing(daoFactory).getDynamicPropertyEvaluationScheduler();
- will(returnValue(evaluator));
}
});
}
--
GitLab