Revision ff5981db
Added by Andreas Müller over 7 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java | ||
|---|---|---|
| 24 | 24 |
import org.springframework.transaction.annotation.Transactional; |
| 25 | 25 |
|
| 26 | 26 |
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; |
| 27 |
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
|
|
| 28 |
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
|
|
| 27 |
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
|
|
| 28 |
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
|
|
| 29 | 29 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 30 | 30 |
import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl; |
| 31 | 31 |
import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; |
| ... | ... | |
| 582 | 582 |
|
| 583 | 583 |
@Override |
| 584 | 584 |
@Transactional(readOnly = true) |
| 585 |
public <S extends T> Pager<FindByIdentifierDTO<S>> findByIdentifier(
|
|
| 585 |
public <S extends T> Pager<IdentifiedEntityDTO<S>> findByIdentifier(
|
|
| 586 | 586 |
Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, |
| 587 | 587 |
boolean includeEntity, Integer pageSize, |
| 588 | 588 |
Integer pageNumber, List<String> propertyPaths) {
|
| ... | ... | |
| 594 | 594 |
matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
| 595 | 595 |
} |
| 596 | 596 |
|
| 597 |
List<FindByIdentifierDTO<S>> result = new ArrayList<FindByIdentifierDTO<S>>();
|
|
| 597 |
List<IdentifiedEntityDTO<S>> result = new ArrayList<IdentifiedEntityDTO<S>>();
|
|
| 598 | 598 |
for (Object[] daoObj : daoResults){
|
| 599 | 599 |
if (includeEntity){
|
| 600 |
result.add(new FindByIdentifierDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (S)daoObj[2]));
|
|
| 600 |
result.add(new IdentifiedEntityDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (S)daoObj[2]));
|
|
| 601 | 601 |
}else{
|
| 602 |
result.add(new FindByIdentifierDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 602 |
result.add(new IdentifiedEntityDTO<S>((DefinedTerm)daoObj[0], (String)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 603 | 603 |
} |
| 604 | 604 |
} |
| 605 |
return new DefaultPagerImpl<FindByIdentifierDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 605 |
return new DefaultPagerImpl<IdentifiedEntityDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 606 | 606 |
} |
| 607 | 607 |
|
| 608 | 608 |
@Override |
| 609 | 609 |
@Transactional(readOnly = true) |
| 610 |
public <S extends T> Pager<FindByMarkerDTO<S>> findByMarker(
|
|
| 610 |
public <S extends T> Pager<MarkedEntityDTO<S>> findByMarker(
|
|
| 611 | 611 |
Class<S> clazz, MarkerType markerType, Boolean markerValue, |
| 612 | 612 |
boolean includeEntity, Integer pageSize, |
| 613 | 613 |
Integer pageNumber, List<String> propertyPaths) {
|
| ... | ... | |
| 619 | 619 |
pageSize, pageNumber, propertyPaths); |
| 620 | 620 |
} |
| 621 | 621 |
|
| 622 |
List<FindByMarkerDTO<S>> result = new ArrayList<>();
|
|
| 622 |
List<MarkedEntityDTO<S>> result = new ArrayList<>();
|
|
| 623 | 623 |
for (Object[] daoObj : daoResults){
|
| 624 | 624 |
if (includeEntity){
|
| 625 |
result.add(new FindByMarkerDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (S)daoObj[2]));
|
|
| 625 |
result.add(new MarkedEntityDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (S)daoObj[2]));
|
|
| 626 | 626 |
}else{
|
| 627 |
result.add(new FindByMarkerDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 627 |
result.add(new MarkedEntityDTO<S>((MarkerType)daoObj[0], (Boolean)daoObj[1], (UUID)daoObj[2], (String)daoObj[3]));
|
|
| 628 | 628 |
} |
| 629 | 629 |
} |
| 630 |
return new DefaultPagerImpl<FindByMarkerDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 630 |
return new DefaultPagerImpl<MarkedEntityDTO<S>>(pageNumber, numberOfResults, pageSize, result);
|
|
| 631 | 631 |
} |
| 632 | 632 |
} |
| 633 | 633 |
|
Also available in: Unified diff
rename FindByIdentifierDTO and FindByMarkerDTO