From f2cc5f90f170926e56b688e4b3973e6518b7d90f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 8 Jun 2023 21:30:45 +0200 Subject: [PATCH] rename CdmBase.isPersited -> isPersisted in cdmlib-app --- .../io/berlinModel/in/BerlinModelAuthorTeamImport.java | 2 +- .../cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java | 8 ++++---- .../etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java index a5ecb299..a6c02195 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java @@ -197,7 +197,7 @@ public class BerlinModelAuthorTeamImport extends BerlinModelImportBase { String uuid = null; if (resultSetHasColumn(rs,"UUID")){ uuid = rs.getString("UUID"); - if (uuid != null && !author.isPersited()){ + if (uuid != null && !author.isPersisted()){ author.setUuid(UUID.fromString(uuid)); } } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java index 6ca9aa6e..09ef892e 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java @@ -930,7 +930,7 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase { }else if (matchingCandidates.size() == 1){ ReferenceCandidate single = matchingCandidates.iterator().next().candidate; addAuthorAndDetail(state, refDetailId, taxonName, single); - if (single.ref.isPersited()){ + if (single.ref.isPersisted()){ printResult(MatchType.SINGLE_FULL_MATCH, unparsedAndName(fullNomRefCache, taxonName)); }else{ // single.ref.addImportSource(String.valueOf(refDetailId), BerlinModelRefDetailImport.REFDETAIL_NAMESPACE, @@ -1186,14 +1186,14 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase { if (refCand.ref.getSources().isEmpty()){ refCand.ref.addImportSource(String.valueOf(refDetailId), BerlinModelRefDetailImport.REFDETAIL_NAMESPACE, state.getTransactionalSourceReference(), null); } -// if (!refCand.ref.isPersited()){ +// if (!refCand.ref.isPersisted()){ // getReferenceService().save(refCand.ref); // } Reference nomRef = state.getDeduplicationHelper().getExistingReference(refCand.ref, true); if (nomRef != refCand.ref){ System.out.println("Ref deduplicated: " + nomRef.getTitleCache() + "(RefDetId: " + refDetailId + ")"); - if (nomRef.isPersited() && !getSession().contains(nomRef)){ + if (nomRef.isPersisted() && !getSession().contains(nomRef)){ System.out.println("Start load with uuid: " + nomRef.getUuid() + ")"); nomRef = getReferenceService().find(nomRef.getUuid()); } @@ -1403,7 +1403,7 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase { private Set findPersistentMatch(TaxonName taxonName, Set finalCandidates) throws MatchException { Set result = new HashSet<>(); for (FinalCandidate cand : finalCandidates){ - if (cand.candidate.ref.isPersited()){ + if (cand.candidate.ref.isPersisted()){ result.add(cand); } } diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java index 725e670b..6360cfd4 100644 --- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java +++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java @@ -170,10 +170,10 @@ public class ErmsVernacularImport extends ErmsImportBase { } private void persistLanguage(Language language) { - if(!language.isPersited()){ + if(!language.isPersisted()){ getTermService().saveOrUpdate(language); } - if (!language.getVocabulary().isPersited()){ + if (!language.getVocabulary().isPersisted()){ getVocabularyService().saveOrUpdate(language.getVocabulary()); } } -- 2.34.1