From: Andreas Müller Date: Wed, 12 May 2021 15:13:52 +0000 (+0200) Subject: cleanup X-Git-Tag: 5.23.0^2~93 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/f0a11642f1e96103012e684579679a43b9606af3 cleanup --- diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java index 54d43c097e..7839377c86 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java @@ -216,7 +216,6 @@ public interface ITaxonService public UpdateResult moveSynonymToAnotherTaxon(Synonym oldSynonym, Taxon newTaxon, boolean moveHomotypicGroup, SynonymType newSynonymType) throws HomotypicalGroupChangeException; - /** * Moves a synonym to another taxon and removes the old synonym relationship. * @@ -244,18 +243,7 @@ public interface ITaxonService SynonymType newSynonymType, UUID newSecundumUuid, String newSecundumDetail, boolean keepSecundumIfUndefined) throws HomotypicalGroupChangeException; - /** - * @param oldSynonym - * @param newTaxonUUID - * @param moveHomotypicGroup - * @param newSynonymType - * @param reference - * @param referenceDetail - * @param keepReference - * @return - * @throws HomotypicalGroupChangeException - * * @see {@link #moveSynonymToAnotherTaxon(Synonym, Taxon, boolean, SynonymType, Reference, String, boolean)} */ public UpdateResult moveSynonymToAnotherTaxon(Synonym oldSynonym, diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java index d936420800..4849f71390 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java @@ -1448,6 +1448,20 @@ public class TaxonServiceImpl return null; } + @Override + @Transactional(readOnly = false) + public UpdateResult moveSynonymToAnotherTaxon(Synonym oldSynonym, UUID newTaxonUUID, boolean moveHomotypicGroup, + SynonymType newSynonymType, UUID newSecundumUuid, String newSecundumDetail, + boolean keepSecundumIfUndefined) throws HomotypicalGroupChangeException { + + UpdateResult result = new UpdateResult(); + Taxon newTaxon = CdmBase.deproxy(dao.load(newTaxonUUID), Taxon.class); + result = moveSynonymToAnotherTaxon(oldSynonym, newTaxon, moveHomotypicGroup, newSynonymType, + newSecundumUuid, newSecundumDetail, keepSecundumIfUndefined); + + return result; + } + @Override @Transactional(readOnly = false) public UpdateResult moveSynonymToAnotherTaxon(Synonym oldSynonym, @@ -3366,20 +3380,6 @@ public class TaxonServiceImpl return new DefaultPagerImpl<>(pageNumber, numberOfResults, pageSize, result); } - @Override - @Transactional(readOnly = false) - public UpdateResult moveSynonymToAnotherTaxon(Synonym oldSynonym, UUID newTaxonUUID, boolean moveHomotypicGroup, - SynonymType newSynonymType, UUID newSecundumUuid, String newSecundumDetail, - boolean keepSecundumIfUndefined) throws HomotypicalGroupChangeException { - - UpdateResult result = new UpdateResult(); - Taxon newTaxon = CdmBase.deproxy(dao.load(newTaxonUUID),Taxon.class); - result = moveSynonymToAnotherTaxon(oldSynonym, newTaxon, moveHomotypicGroup, newSynonymType, - newSecundumUuid, newSecundumDetail, keepSecundumIfUndefined); - - return result; - } - @Override public UpdateResult moveFactualDateToAnotherTaxon(UUID fromTaxonUuid, UUID toTaxonUuid){ UpdateResult result = new UpdateResult();