Revision 11d3d7eb
Added by Andreas Müller almost 6 years ago
| cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java | ||
|---|---|---|
| 549 | 549 |
|
| 550 | 550 |
inner.setProjection(Projections.distinct(Projections.id())); |
| 551 | 551 |
|
| 552 |
@SuppressWarnings("unchecked")
|
|
| 552 | 553 |
List<Object> intermediateResult = inner.list(); |
| 553 | 554 |
|
| 554 | 555 |
if(intermediateResult.isEmpty()) {
|
| 555 |
return new ArrayList<DescriptionBase>();
|
|
| 556 |
return new ArrayList<>(); |
|
| 556 | 557 |
} |
| 557 | 558 |
|
| 558 | 559 |
Integer[] resultIds = new Integer[intermediateResult.size()]; |
| ... | ... | |
| 614 | 615 |
|
| 615 | 616 |
addOrder(criteria,orderHints); |
| 616 | 617 |
|
| 618 |
@SuppressWarnings("unchecked")
|
|
| 617 | 619 |
List<Object> intermediateResult = criteria.list(); |
| 618 | 620 |
|
| 619 | 621 |
if(intermediateResult.isEmpty()) {
|
| 620 |
return new ArrayList<TaxonDescription>();
|
|
| 622 |
return new ArrayList<>(); |
|
| 621 | 623 |
} |
| 622 | 624 |
|
| 623 | 625 |
Integer[] resultIds = new Integer[intermediateResult.size()]; |
| ... | ... | |
| 633 | 635 |
criteria.add(Restrictions.in("id", resultIds));
|
| 634 | 636 |
addOrder(criteria,orderHints); |
| 635 | 637 |
|
| 638 |
@SuppressWarnings("unchecked")
|
|
| 636 | 639 |
List<TaxonDescription> results = criteria.list(); |
| 637 | 640 |
defaultBeanInitializer.initializeAll(results, propertyPaths); |
| 638 | 641 |
return results; |
| ... | ... | |
| 654 | 657 |
crit.setFirstResult(pageNumber * pageSize); |
| 655 | 658 |
} |
| 656 | 659 |
} |
| 660 |
@SuppressWarnings("unchecked")
|
|
| 657 | 661 |
List<CommonTaxonName> results = crit.list(); |
| 658 | 662 |
return results; |
| 659 | 663 |
} |
| ... | ... | |
| 667 | 671 |
|
| 668 | 672 |
@Override |
| 669 | 673 |
public DescriptionBase find(LSID lsid) {
|
| 670 |
DescriptionBase descriptionBase = super.find(lsid); |
|
| 674 |
DescriptionBase<?> descriptionBase = super.find(lsid);
|
|
| 671 | 675 |
if(descriptionBase != null) {
|
| 672 |
List<String> propertyPaths = new ArrayList<String>();
|
|
| 676 |
List<String> propertyPaths = new ArrayList<>(); |
|
| 673 | 677 |
propertyPaths.add("createdBy");
|
| 674 | 678 |
propertyPaths.add("updatedBy");
|
| 675 | 679 |
propertyPaths.add("taxon");
|
| ... | ... | |
| 793 | 797 |
|
| 794 | 798 |
setPagingParameter(query, pageSize, pageNumber); |
| 795 | 799 |
|
| 800 |
@SuppressWarnings("unchecked")
|
|
| 796 | 801 |
List<Media> results = query.list(); |
| 797 | 802 |
|
| 798 | 803 |
defaultBeanInitializer.initializeAll(results, propertyPaths); |
| ... | ... | |
| 803 | 808 |
} |
| 804 | 809 |
} |
| 805 | 810 |
|
| 806 |
|
|
| 807 |
/* (non-Javadoc) |
|
| 808 |
* @see eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao#countTaxonDescriptionMedia(java.util.UUID, java.lang.Boolean, java.util.Set) |
|
| 809 |
*/ |
|
| 810 | 811 |
@Override |
| 811 | 812 |
public int countTaxonDescriptionMedia(UUID taxonUuid, |
| 812 | 813 |
Boolean limitToGalleries, Set<MarkerType> markerTypes) {
|
| ... | ... | |
| 867 | 868 |
|
| 868 | 869 |
} |
| 869 | 870 |
|
| 870 |
/* (non-Javadoc) |
|
| 871 |
* @see eu.etaxonomy.cdm.persistence.dao.description.IDescriptionDao#listNamedAreasInUse(java.lang.Integer, java.lang.Integer, java.util.List) |
|
| 872 |
*/ |
|
| 873 | 871 |
@SuppressWarnings("unchecked")
|
| 874 | 872 |
@Override |
| 875 | 873 |
public List<TermDto> listNamedAreasInUse(boolean includeAllParents, Integer pageSize, Integer pageNumber) {
|
| ... | ... | |
| 885 | 883 |
List<Object[]> parentResults = new ArrayList<Object[]>(); |
| 886 | 884 |
|
| 887 | 885 |
if(!areasInUse.isEmpty()) {
|
| 888 |
Set<Object> allAreaIds = new HashSet<Object>(areasInUse.size());
|
|
| 886 |
Set<Object> allAreaIds = new HashSet<>(areasInUse.size()); |
|
| 889 | 887 |
|
| 890 | 888 |
if(includeAllParents) {
|
| 891 | 889 |
// find all parent nodes |
| ... | ... | |
| 894 | 892 |
List<Object[]> allAreasResult = query.list(); |
| 895 | 893 |
Map<Object, Object> allAreasMap = ArrayUtils.toMap(allAreasResult.toArray()); |
| 896 | 894 |
|
| 897 |
Set<Object> parents = new HashSet<Object>();
|
|
| 895 |
Set<Object> parents = new HashSet<>(); |
|
| 898 | 896 |
|
| 899 | 897 |
for(Object[] leaf : areasInUse) {
|
| 900 | 898 |
allAreaIds.add(leaf[0]); |
| ... | ... | |
| 942 | 940 |
* @return |
| 943 | 941 |
*/ |
| 944 | 942 |
private List<TermDto> termDtoListFrom(List<Object[]> results) {
|
| 945 |
Map<UUID, TermDto> dtoMap = new HashMap<UUID, TermDto>(results.size());
|
|
| 943 |
Map<UUID, TermDto> dtoMap = new HashMap<>(results.size()); |
|
| 946 | 944 |
for (Object[] elements : results) {
|
| 947 | 945 |
UUID uuid = (UUID)elements[0]; |
| 948 | 946 |
if(dtoMap.containsKey(uuid)){
|
| ... | ... | |
| 958 | 956 |
dtoMap.put(uuid, new TermDto(uuid, representations, (UUID)elements[2], (UUID)elements[3], (Integer)elements[4])); |
| 959 | 957 |
} |
| 960 | 958 |
} |
| 961 |
return new ArrayList<TermDto>(dtoMap.values());
|
|
| 959 |
return new ArrayList<>(dtoMap.values()); |
|
| 962 | 960 |
} |
| 963 | 961 |
|
| 964 | 962 |
|
Also available in: Unified diff
cleanup and remove rows(xxx) method