From 51ca678ce69602f44c7e0fb9d75bf18ca8f28b7c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 25 May 2016 11:16:52 +0000
Subject: [PATCH] SSDM-3551: get rid of IFullTextIndexUpdateScheduler in
DAOFactory classes and PersistencyResources. In RemoveFromIndexState access
FullTextIndexUpdateScheduler directly from application context.
SVN: 36582
---
.../server/dataaccess/PersistencyResources.java | 12 +-----------
.../dataaccess/db/AuthorizationDAOFactory.java | 4 +---
.../generic/server/dataaccess/db/DAOFactory.java | 13 +------------
.../source/java/genericApplicationContext.xml | 1 -
.../systemtest/asapi/v3/AbstractTest.java | 8 ++++----
.../asapi/v3/DeleteExperimentTest.java | 2 +-
.../systemtest/asapi/v3/DeleteSampleTest.java | 2 +-
.../asapi/v3/index/RemoveFromIndexState.java | 10 +++++-----
.../openbis/generic/server/ETLServiceTest.java | 16 ++++++++--------
.../generic/shared/AbstractServerTestCase.java | 2 +-
10 files changed, 23 insertions(+), 47 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
index e61aa3dd290..2eb639f2b8e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.server.dataaccess;
import org.hibernate.SessionFactory;
import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IFullTextIndexUpdateScheduler;
/**
* Resources needed to create DAO's.
@@ -32,17 +31,13 @@ public final class PersistencyResources
private final SessionFactory sessionFactory;
- private final IFullTextIndexUpdateScheduler indexUpdateScheduler;
-
private final IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler;
- public PersistencyResources(DatabaseConfigurationContext context,
- SessionFactory sessionFactory, IFullTextIndexUpdateScheduler indexUpdateScheduler,
+ public PersistencyResources(DatabaseConfigurationContext context, SessionFactory sessionFactory,
IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler)
{
this.context = context;
this.sessionFactory = sessionFactory;
- this.indexUpdateScheduler = indexUpdateScheduler;
this.dynamicPropertyEvaluationScheduler = dynamicPropertyEvaluationScheduler;
}
@@ -56,11 +51,6 @@ public final class PersistencyResources
return sessionFactory;
}
- public IFullTextIndexUpdateScheduler getIndexUpdateScheduler()
- {
- return indexUpdateScheduler;
- }
-
public IDynamicPropertyEvaluationScheduler getDynamicPropertyEvaluationScheduler()
{
return dynamicPropertyEvaluationScheduler;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
index 1a49ad5fb66..ba5176b0a10 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
@@ -37,7 +37,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISampleDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISpaceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.PersistencyResources;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion.EntityHistoryCreator;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IFullTextIndexUpdateScheduler;
import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
/**
@@ -78,12 +77,11 @@ public class AuthorizationDAOFactory implements IAuthorizationDAOFactory
public AuthorizationDAOFactory(final DatabaseConfigurationContext context,
final SessionFactory sessionFactory,
- final IFullTextIndexUpdateScheduler indexUpdateScheduler,
final IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler,
final EntityHistoryCreator historyCreator)
{
persistencyResources =
- new PersistencyResources(context, sessionFactory, indexUpdateScheduler,
+ new PersistencyResources(context, sessionFactory,
dynamicPropertyEvaluationScheduler);
personDAO = new PersonDAO(sessionFactory, historyCreator);
groupDAO = new SpaceDAO(sessionFactory, historyCreator);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
index c474d33dc0a..09b131d12ac 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
@@ -61,7 +61,6 @@ 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.db.deletion.EntityHistoryCreator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.HibernateSearchContext;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IFullTextIndexUpdateScheduler;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.util.UpdateUtils;
import ch.systemsx.cisd.openbis.generic.shared.Constants;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
@@ -85,8 +84,6 @@ public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFac
private final IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler;
- private final IFullTextIndexUpdateScheduler fullTextIndexUpdateScheduler;
-
private final ISampleTypeDAO sampleTypeDAO;
private final IHibernateSearchDAO hibernateSearchDAO;
@@ -141,15 +138,12 @@ public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFac
public DAOFactory(final DatabaseConfigurationContext context,
final SessionFactory sessionFactory, HibernateSearchContext hibernateSearchContext,
- final IFullTextIndexUpdateScheduler fullTextIndexUpdateScheduler,
final IDynamicPropertyEvaluationScheduler dynamicPropertyEvaluationScheduler,
final EntityHistoryCreator historyCreator)
{
- super(context, sessionFactory, fullTextIndexUpdateScheduler,
- dynamicPropertyEvaluationScheduler, historyCreator);
+ super(context, sessionFactory, dynamicPropertyEvaluationScheduler, historyCreator);
this.context = context;
this.dynamicPropertyEvaluationScheduler = dynamicPropertyEvaluationScheduler;
- this.fullTextIndexUpdateScheduler = fullTextIndexUpdateScheduler;
historyCreator.setDaoFactory(this);
sampleTypeDAO = new SampleTypeDAO(sessionFactory, historyCreator);
hibernateSearchDAO = new HibernateSearchDAO(sessionFactory, hibernateSearchContext);
@@ -316,11 +310,6 @@ public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFac
return dynamicPropertyEvaluationScheduler;
}
- public IFullTextIndexUpdateScheduler getFullTextIndexUpdateScheduler()
- {
- return fullTextIndexUpdateScheduler;
- }
-
@Override
public ICorePluginDAO getCorePluginDAO()
{
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index c726b7fe9e6..dd3fb142158 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -111,7 +111,6 @@
<constructor-arg ref="db-configuration-context" />
<constructor-arg ref="hibernate-session-factory" />
<constructor-arg ref="hibernate-search-context" />
- <constructor-arg ref="full-text-index-updater" />
<constructor-arg ref="dynamic-property-scheduler" />
<constructor-arg ref="entity-history-creator" />
</bean>
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
index 0beb34c99d1..7cd3e92ed26 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
@@ -918,22 +918,22 @@ public class AbstractTest extends SystemTestCase
protected void assertExperimentsRemovedFromIndex(RemoveFromIndexState previousState, Long... ids)
{
- assertIndexStateChange(previousState, new RemoveFromIndexState(daoFactory), ExperimentPE.class.getName(), ids);
+ assertIndexStateChange(previousState, new RemoveFromIndexState(), ExperimentPE.class.getName(), ids);
}
protected void assertSamplesRemovedFromIndex(RemoveFromIndexState previousState, Long... ids)
{
- assertIndexStateChange(previousState, new RemoveFromIndexState(daoFactory), SamplePE.class.getName(), ids);
+ assertIndexStateChange(previousState, new RemoveFromIndexState(), SamplePE.class.getName(), ids);
}
protected void assertDataSetsRemovedFromIndex(RemoveFromIndexState previousState, Long... ids)
{
- assertIndexStateChange(previousState, new RemoveFromIndexState(daoFactory), DataPE.class.getName(), ids);
+ assertIndexStateChange(previousState, new RemoveFromIndexState(), DataPE.class.getName(), ids);
}
protected void assertMaterialsRemovedFromIndex(RemoveFromIndexState previousState, Long... ids)
{
- assertIndexStateChange(previousState, new RemoveFromIndexState(daoFactory), MaterialPE.class.getName(), ids);
+ assertIndexStateChange(previousState, new RemoveFromIndexState(), MaterialPE.class.getName(), ids);
}
protected <S extends IndexState> void assertIndexStateChange(S previousState, S currentState, String expectedClassName,
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java
index 7e9b608a82e..5915f28476c 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java
@@ -58,7 +58,7 @@ public class DeleteExperimentTest extends AbstractDeletionTest
List<ExperimentPE> experiments = daoFactory.getExperimentDAO().listByPermID(Arrays.asList(permId.getPermId()));
assertEquals(experiments.size(), 1);
- RemoveFromIndexState state = new RemoveFromIndexState(daoFactory);
+ RemoveFromIndexState state = new RemoveFromIndexState();
v3api.deleteExperiments(sessionToken, Collections.singletonList(permId), options);
TestTransaction.flagForCommit();
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
index 52fdd774ecd..d59ba2260a0 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
@@ -60,7 +60,7 @@ public class DeleteSampleTest extends AbstractDeletionTest
List<SamplePE> samples = daoFactory.getSampleDAO().listByPermID(Arrays.asList(samplePermId.getPermId()));
assertEquals(samples.size(), 1);
- RemoveFromIndexState state = new RemoveFromIndexState(daoFactory);
+ RemoveFromIndexState state = new RemoveFromIndexState();
v3api.deleteSamples(sessionToken, Collections.singletonList(samplePermId), options);
TestTransaction.flagForCommit();
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/index/RemoveFromIndexState.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/index/RemoveFromIndexState.java
index 8fced3ede36..9e0385f1e7a 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/index/RemoveFromIndexState.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/index/RemoveFromIndexState.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.server.CommonServiceProvider;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.FullTextIndexUpdater;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IndexUpdateOperation;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IndexUpdateOperation.IndexUpdateOperationKind;
@@ -31,14 +31,14 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IndexUpdateO
public class RemoveFromIndexState extends IndexState
{
- public RemoveFromIndexState(IDAOFactory daoFactory)
+ public RemoveFromIndexState()
{
- super(createOperations(daoFactory));
+ super(createOperations());
}
- private static Collection<RemoveFromIndexOperation> createOperations(IDAOFactory daoFactory)
+ private static Collection<RemoveFromIndexOperation> createOperations()
{
- FullTextIndexUpdater indexUpdater = (FullTextIndexUpdater) daoFactory.getPersistencyResources().getIndexUpdateScheduler();
+ FullTextIndexUpdater indexUpdater = (FullTextIndexUpdater) CommonServiceProvider.tryToGetBean("full-text-index-updater");
Collection<IndexUpdateOperation> updateOperations = indexUpdater.getQueue();
List<RemoveFromIndexOperation> removeOperations = new ArrayList<RemoveFromIndexOperation>();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
index 02f3489d2e7..34139f5fe05 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
@@ -245,7 +245,7 @@ public class ETLServiceTest extends AbstractServerTestCase
.getExperiment());
will(returnValue(Arrays.asList(ds1.getDataSet())));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
@@ -290,7 +290,7 @@ public class ETLServiceTest extends AbstractServerTestCase
will(returnValue(list));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
@@ -523,7 +523,7 @@ public class ETLServiceTest extends AbstractServerTestCase
will(returnValue("permId"));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
@@ -593,7 +593,7 @@ public class ETLServiceTest extends AbstractServerTestCase
sample.setCode("S42");
will(returnValue(sample));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
@@ -622,7 +622,7 @@ public class ETLServiceTest extends AbstractServerTestCase
sampleTypePE.setSubcodeUnique(Boolean.FALSE);
will(returnValue(sampleTypePE));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
@@ -879,7 +879,7 @@ public class ETLServiceTest extends AbstractServerTestCase
one(personDAO).listPersons();
will(returnValue(Arrays.asList(personPE)));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
@@ -1016,7 +1016,7 @@ public class ETLServiceTest extends AbstractServerTestCase
will(returnValue(externalDataPE));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
one(metaprojectDAO).listMetaprojectsForEntity(sessionPerson, samplePE);
}
@@ -1512,7 +1512,7 @@ public class ETLServiceTest extends AbstractServerTestCase
one(sampleBO).tryToGetSample();
will(returnValue(sample));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
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 821d1a47e6e..81e345109c6 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
@@ -354,7 +354,7 @@ public abstract class AbstractServerTestCase extends AssertJUnit
allowing(sessionManager).getSession(SESSION_TOKEN);
will(returnValue(session));
allowing(daoFactory).getPersistencyResources();
- will(returnValue(new PersistencyResources(null, null, null, null)));
+ will(returnValue(new PersistencyResources(null, null, null)));
}
});
--
GitLab