Revision ff5981db
Added by Andreas Müller over 7 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java | ||
|---|---|---|
| 46 | 46 |
import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling; |
| 47 | 47 |
import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator; |
| 48 | 48 |
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; |
| 49 |
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
|
|
| 50 |
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
|
|
| 49 |
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
|
|
| 50 |
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
|
|
| 51 | 51 |
import eu.etaxonomy.cdm.api.service.dto.IncludedTaxaDTO; |
| 52 | 52 |
import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException; |
| 53 | 53 |
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException; |
| ... | ... | |
| 3200 | 3200 |
|
| 3201 | 3201 |
@Override |
| 3202 | 3202 |
@Transactional(readOnly = true) |
| 3203 |
public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(
|
|
| 3203 |
public <S extends TaxonBase> Pager<IdentifiedEntityDTO<S>> findByIdentifier(
|
|
| 3204 | 3204 |
Class<S> clazz, String identifier, DefinedTerm identifierType, TaxonNode subtreeFilter, |
| 3205 | 3205 |
MatchMode matchmode, boolean includeEntity, Integer pageSize, |
| 3206 | 3206 |
Integer pageNumber, List<String> propertyPaths) {
|
| ... | ... | |
| 3215 | 3215 |
matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
| 3216 | 3216 |
} |
| 3217 | 3217 |
|
| 3218 |
List<FindByIdentifierDTO<S>> result = new ArrayList<FindByIdentifierDTO<S>>();
|
|
| 3218 |
List<IdentifiedEntityDTO<S>> result = new ArrayList<IdentifiedEntityDTO<S>>();
|
|
| 3219 | 3219 |
for (Object[] daoObj : daoResults){
|
| 3220 | 3220 |
if (includeEntity){
|
| 3221 |
result.add(new FindByIdentifierDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (S)daoObj[2]));
|
|
| 3221 |
result.add(new IdentifiedEntityDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (S)daoObj[2]));
|
|
| 3222 | 3222 |
}else{
|
| 3223 |
result.add(new FindByIdentifierDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 3223 |
result.add(new IdentifiedEntityDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 3224 | 3224 |
} |
| 3225 | 3225 |
} |
| 3226 |
return new DefaultPagerImpl<FindByIdentifierDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 3226 |
return new DefaultPagerImpl<IdentifiedEntityDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 3227 | 3227 |
} |
| 3228 | 3228 |
|
| 3229 | 3229 |
@Override |
| 3230 | 3230 |
@Transactional(readOnly = true) |
| 3231 |
public <S extends TaxonBase> Pager<FindByMarkerDTO<S>> findByMarker(
|
|
| 3231 |
public <S extends TaxonBase> Pager<MarkedEntityDTO<S>> findByMarker(
|
|
| 3232 | 3232 |
Class<S> clazz, MarkerType markerType, Boolean markerValue, |
| 3233 | 3233 |
TaxonNode subtreeFilter, boolean includeEntity, Integer pageSize, |
| 3234 | 3234 |
Integer pageNumber, List<String> propertyPaths) {
|
| ... | ... | |
| 3243 | 3243 |
includeEntity, pageSize, pageNumber, propertyPaths); |
| 3244 | 3244 |
} |
| 3245 | 3245 |
|
| 3246 |
List<FindByMarkerDTO<S>> result = new ArrayList<>();
|
|
| 3246 |
List<MarkedEntityDTO<S>> result = new ArrayList<>();
|
|
| 3247 | 3247 |
for (Object[] daoObj : daoResults){
|
| 3248 | 3248 |
if (includeEntity){
|
| 3249 |
result.add(new FindByMarkerDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (S)daoObj[2]));
|
|
| 3249 |
result.add(new MarkedEntityDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (S)daoObj[2]));
|
|
| 3250 | 3250 |
}else{
|
| 3251 |
result.add(new FindByMarkerDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 3251 |
result.add(new MarkedEntityDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 3252 | 3252 |
} |
| 3253 | 3253 |
} |
| 3254 |
return new DefaultPagerImpl<FindByMarkerDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 3254 |
return new DefaultPagerImpl<MarkedEntityDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 3255 | 3255 |
} |
| 3256 | 3256 |
|
| 3257 | 3257 |
@Override |
Also available in: Unified diff
rename FindByIdentifierDTO and FindByMarkerDTO