Project

General

Profile

« Previous | Next » 

Revision c61c9db0

Added by Katja Luther over 2 years ago

code cleaning, move hql queries to dao

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
1183 1183
    @Override
1184 1184
    public TaxonNodeDto getTaxonNodeDto(UUID nodeUuid) {
1185 1185
        String queryString = "SELECT new " + SortableTaxonNodeQueryResult.class.getName() + "("
1186
                + "tn.uuid, tn.id, t.titleCache, rank "
1186
                + "tn.uuid, tn.id, t.titleCache, name.titleCache, rank "
1187 1187
                + ") "
1188 1188
                + " FROM TaxonNode tn "
1189 1189
                + "   INNER JOIN tn.taxon AS t "
......
1203 1203

  
1204 1204
        List<TaxonNodeDto> list = new ArrayList<>();
1205 1205
        for(SortableTaxonNodeQueryResult queryDTO : result){
1206
            list.add(new TaxonNodeDto(queryDTO.getTaxonNodeUuid(), queryDTO.getTaxonNodeId(), queryDTO.getTaxonTitleCache()));
1206
            list.add(new TaxonNodeDto(queryDTO.getTaxonNodeUuid(), queryDTO.getTaxonNodeId(), queryDTO.getNameTitleCache(), queryDTO.getTaxonTitleCache()));
1207 1207
        }
1208 1208
        return list.get(0);
1209 1209
    }
......
1211 1211
    @Override
1212 1212
    public List<TaxonNodeDto> getTaxonNodeDtos(List<UUID> nodeUuids) {
1213 1213
        String queryString = "SELECT new " + SortableTaxonNodeQueryResult.class.getName() + "("
1214
                + "tn.uuid, tn.id, t.titleCache, rank "
1214
                + "tn.uuid, tn.id, t.titleCache, name.titleCache, rank "
1215 1215
                + ") "
1216 1216
                + " FROM TaxonNode tn "
1217 1217
                + "   INNER JOIN tn.taxon AS t "
......
1232 1232

  
1233 1233
        List<TaxonNodeDto> list = new ArrayList<>();
1234 1234
        for(SortableTaxonNodeQueryResult queryDTO : result){
1235
            TaxonNodeDto nodeDto = new TaxonNodeDto(queryDTO.getTaxonNodeUuid(), queryDTO.getTaxonNodeId(), queryDTO.getTaxonTitleCache(), queryDTO.getNameRank().getOrderIndex());
1235
            TaxonNodeDto nodeDto = new TaxonNodeDto(queryDTO.getTaxonNodeUuid(), queryDTO.getTaxonNodeId(), queryDTO.getNameTitleCache(), queryDTO.getTaxonTitleCache(), queryDTO.getNameRank().getOrderIndex());
1236 1236

  
1237 1237
            list.add(nodeDto);
1238 1238
        }

Also available in: Unified diff