Project

General

Profile

Revision 5bdaf8c0

ID5bdaf8c0e22e27cb8c85e641606c7f32903160fe
Parent ba0d3894
Child 2a95430a

Added by Andreas Müller over 2 years ago

cleanup

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
220 220

  
221 221
        	for (TaxonName name: nameResult){
222 222
        		if (name.getTaxonBases().size() == 0){
223
        			resultObjects.add(new UuidAndTitleCache<TaxonName>(TaxonName.class, name.getUuid(), name.getId(), name.getTitleCache()));
223
        			resultObjects.add(new UuidAndTitleCache<>(TaxonName.class, name.getUuid(),
224
        			        name.getId(), name.getTitleCache()));
224 225
        		}
225 226
        	}
226 227
        	if (!doSynonyms && !doTaxa && !doCommonNames){
......
242 243
                // see FIXME in 'prepareQuery' for more details
243 244
                if (doTaxa || doSynonyms || doCommonNames){
244 245
                    if (result[3].equals("synonym")) {
245
                        resultObjects.add( new UuidAndTitleCache<Synonym>(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
246
                        resultObjects.add( new UuidAndTitleCache<>(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
246 247
                    }
247 248
                    else {
248
                        resultObjects.add( new UuidAndTitleCache<Taxon>(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
249
                        resultObjects.add( new UuidAndTitleCache<>(Taxon.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
249 250
                    }
250 251

  
251 252
                }else if (doSynonyms){
252
                    resultObjects.add( new UuidAndTitleCache<Synonym>(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
253
                    resultObjects.add( new UuidAndTitleCache<>(Synonym.class, (UUID) result[0], (Integer) result[1], (String)result[2], new Boolean(result[4].toString()), null));
253 254
                }
254 255
            }
255 256
        }
......
296 297
                classification, matchMode, namedAreas, order, doCount, true);
297 298
    }
298 299

  
300

  
299 301
    /**
302
     * @param doTaxa
303
     * @param doSynonyms
304
     * @param doIncludeMisappliedNames
305
     * @param doCommonNames
306
     * @param includeUnpublished
300 307
     * @param searchField
301 308
     * @param queryString
302 309
     * @param classification
303 310
     * @param matchMode
304 311
     * @param namedAreas
312
     * @param order
305 313
     * @param doCount
306
     * @param doNotReturnFullEntities
307
     *            if set true the seach method will not return synonym and taxon
314
     * @param returnIdAndTitle
315
     *            If set true the seach method will not return synonym and taxon
308 316
     *            entities but an array containing the uuid, titleCache, and the
309 317
     *            DTYPE in lowercase letters.
310
     * @param order
311
     * @param clazz
312 318
     * @return
313 319
     */
314 320
    private Query prepareByNameQuery(boolean doTaxa, boolean doSynonyms, boolean doIncludeMisappliedNames,
......
356 362

  
357 363
            if (logger.isDebugEnabled()) {
358 364
                logger.debug("taxonSubselect: " + (taxonSubselect != null ? taxonSubselect: "NULL"));
359
            }
360
            if (logger.isDebugEnabled()) {
361 365
                logger.debug("synonymSubselect: " + (synonymSubselect != null ? synonymSubselect: "NULL"));
362 366
            }
363 367

  
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/CdmMassIndexer.java
67 67
@Transactional
68 68
public class CdmMassIndexer implements ICdmMassIndexer {
69 69

  
70
    private final Set<Class<? extends CdmBase>> indexedClasses = new HashSet<Class<? extends CdmBase>>();
70
    private final Set<Class<? extends CdmBase>> indexedClasses = new HashSet<>();
71 71
    public static final Logger logger = Logger.getLogger(CdmMassIndexer.class);
72 72

  
73 73
    /*

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)