EDIT

fix 10084: fix problem with missing taxonuuid in dto

ref #10076 fix HQL query (remove native)

ref #10076 fix HQL query (remove native)

ref #10076: fix taxonnodeDto creation for nodes without taxon and parent

ref #10071: add statusNote to dto again

update lineendings

revert changes to get statusNote

ref #10071: add statusNote to dto

white space problems

ref #9359 upgrade cdmlib to log4j 2

ref #10071: add node status to dto and implemented some tests

fix NPEs in DTO creation

taxon node status needs to be added to the dto

ref #10071: create taxonnodeDTOs, add classification uuid

ref #10071: create taxonnodeDTOs also for a subtree

ref #10071: create taxonnodeDTOs directly from taxon uuid

create taxonnodeDto directly with taxonUuid - continue

cleanup some base DAOs (rename, remove @Repository, ...)

ref #10067 change to new hibernate Query class, adapt generics and use set Parameter instead old setXXX (cont.)

improve paging handling in multiple DAOs

cleanup

ref #10067 change to new hibernate Query class, adapt generics and use set Parameter instead old setXXX

cleanup

cleanup

ref #9963: return null, if list is empty

cleanup javadoc

ref #9907: fix missing treeIndex in taxonNodeDto - continue

ref #9842: first steps removing objects in dto creation - continue

ref #9843: adapt other uses of SortableTaxonNodeQueryResult

ref #9843: fix taxonnode dto creation and add parent uuid

ref #6296: cleanup

ref #9803: fix not loaded subtree in DDS

code cleaning - continue

code cleaning

code cleaning, move hql queries to dao

ref #7981: fix taxonnodeDto taxon titlecache

ref #9710: switch to dtos for descriptive data set and descriptions for character matrix

ref #9704: fix NPE for * in search

ref #6359, ref #9627 fix tests for setSecundumForSubtree workaround

ref #9627 workaround for update result including taxonBase in setSecundumForSubtree

cleanup

ref #6359 improve progress monitoring for setSecundumForSubtree

ref #6359 fix NPE when removing sec

ref #6359 finetuning for updatedObjects in setSecundumForSubtree (distinguish taxon and originalsource)

cleanup

ref #6359 add session.clear()

fix compile error

cleanup

ref #6359 fix update issue

ref #6359 improve partition handling

ref #6359 improve updated objects behavior

ref #9598 some parameter renaming and improve updated objects behavior

fix #9601 allow misapplied names and proparte Syns to set secundum for subtree

remove unnecessary second load

ref #9593: revert some changes in taxonDao not belonging to this ticket

ref #9575: adapt findTaxaAndNames for doAuthors, add test case

ref #9593: add polytomouskey handling in PostMergeEntityListener to avoid NULL values - avoid NPE

cleanup

ref #9578 , ref #8889 fix behavior of TaxonNodeDaoHibernateImpl.listChildrenOf() with recursive=true and comparator

• current implementation also returns the parent which is semantically not correct and differs from implementation without comparator

fix #9561 make protectedTitleCache search a search with MatchMode.Beginning OR Anywhere

cleanup

fix #9561 fix search searches on titleCache also if titleCache is protected

cleanup

ref #9327 update script updated and some further test and propertyPath adaptations

ref #9327 fix tests in persistence and service layer

ref #9327 add sec source to TaxonBase (with few open issues)

add test for uuidAndTitleCache in TaxonNodedao and code cleau

ref #9457 , ref #9461 fix incorrect handling of AND/OR logic in doubtfulPattern handling in TaxonNodeDaoHibernateImpl.getUuidAndTitleCache

ref #9457 fix missing space in HQL (cont.)

fix #9457 fix missing space in HQL

ref #9354 unify TaxonNodeDao.listChildrenOf(...) methods

cleanup

ref #8889: sort taxonnodes for distribution editor on server side

ref #9204 update to hibernate 5.1.17 in cdmlib

ref #9171: add includeDoubtful flag to uuidAndTitleCache searchh

improve generics for list... and findTaxaByName

fix #9047 fix search does not return orphaned synonyms

cleanup

ref #7140 , ref #8802 implement supportedDataTypes and availableFor for Feature

ref ref #8815 adding condition which was lost during conflict resolution

ref #8815 reverting return types from UuidAndTitleCache to TaxonNodeDto

Revert "ref #8815: add UuidAndTitleCache methods again in taxonnodeservice"

This reverts commit 47c1bab5d954d21e17653072c211a7ae53e53e97 + 75e3aef5f2a567e2833c03f13194b062a5d58947

Resolved Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java...

ref #8907 adding missing constructor to hql query

cleanup

ref #8907 SortableTaxonNodeQueryResultComparator to replace UuidAndTitleCacheTaxonComparator - step 2

ref #8907 SortableTaxonNodeQueryResultComparator to replace UuidAndTitleCacheTaxonComparator

cleanup

cleanup

fix #8892 fix select statement for TaxonNodeDaoHibernateImpl.getUuidAndTitleCache()

ref #8892 implementing test for TaxonNodeDaoHibernateImpl.getUuidAndTitleCache()

ref #8892 loading ranks in hql with LEFT OUTER JOINs

fix #8892: fix problem of name without rank in taxon search

ref #1447 improve findIdenticalNames

ref #1447 reimplement getParentTaxonNodeDtoForRank() to fetch taxa of specific higher ranks

cleanup

ref #8815 adapt return type for uuidAndTitleCache method in taxonNodeService

ref #8815: add UuidAndTitleCache methods again in taxonnodeservice - continue

ref #8815: add UuidAndTitleCache methods again in taxonnodeservice

cleanup taxonnodeDto - UuidAndTitleCache

ref #8684 fixing bean collection initialization in TaxonDaoHibernateImpl.findTaxaByName