From b985330b1ac52b70b0ce1ef263a75465910db4a5 Mon Sep 17 00:00:00 2001
From: Viktor Kovtun <viktor.kovtun@id.ethz.ch>
Date: Wed, 23 Sep 2020 15:56:33 +0200
Subject: [PATCH] SSDM-10226 Refactored SampleContainerSearchManager so that it
does not extend AbstractCompositeEntitySearchManager.
---
.../planner/SampleContainerSearchManager.java | 34 +++----------------
1 file changed, 5 insertions(+), 29 deletions(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java
index 46933502c5b..d36607c7488 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java
@@ -37,26 +37,22 @@ import java.util.Set;
*
* @author Viktor Kovtun
*/
-public class SampleContainerSearchManager extends AbstractCompositeEntitySearchManager<SampleContainerSearchCriteria, Sample, Long>
+public class SampleContainerSearchManager extends AbstractLocalSearchManager<SampleContainerSearchCriteria, Sample,
+ Long>
{
- public SampleContainerSearchManager(final ISQLSearchDAO searchDAO, final ISQLAuthorisationInformationProviderDAO authProvider,
+ public SampleContainerSearchManager(final ISQLSearchDAO searchDAO,
+ final ISQLAuthorisationInformationProviderDAO authProvider,
final IID2PEMapper<Long, Long> idsMapper)
{
super(searchDAO, authProvider, idsMapper);
}
- @Override
- protected Class<? extends AbstractCompositeSearchCriteria> getParentsSearchCriteriaClass()
- {
- return null;
- }
-
public Set<Long> searchForIDs(final Long userId, final AuthorisationInformation authorisationInformation,
final SampleContainerSearchCriteria criteria,
final AbstractCompositeSearchCriteria parentCriteria, final String idsColumnName)
{
- return doSearchForIDs(userId, authorisationInformation, criteria, null, idsColumnName, TableMapper.SAMPLE);
+ return super.searchForIDs(userId, authorisationInformation, criteria, idsColumnName, TableMapper.SAMPLE);
}
@Override
@@ -64,30 +60,10 @@ public class SampleContainerSearchManager extends AbstractCompositeEntitySearchM
return doSortIDs(ids, sortOptions, TableMapper.SAMPLE);
}
- @Override
- protected Class<? extends AbstractCompositeSearchCriteria> getChildrenSearchCriteriaClass()
- {
- return null;
- }
-
- @Override
- protected SampleContainerSearchCriteria createEmptyCriteria()
- {
- throw new UnsupportedOperationException("This method is not supposed to be called.");
- }
-
@Override
protected Set<Long> doFilterIDsByUserRights(final Set<Long> ids, final AuthorisationInformation authorisationInformation)
{
return getAuthProvider().getAuthorisedSamples(ids, authorisationInformation);
}
- @Override
- protected Set<Long> getAllIds(final Long userId, final AuthorisationInformation authorisationInformation, final String idsColumnName,
- final TableMapper tableMapper)
- {
- return getSearchDAO().queryDBWithNonRecursiveCriteria(userId, new DummyCompositeSearchCriterion(), tableMapper,
- idsColumnName, authorisationInformation);
- }
-
}
--
GitLab