From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 25 Nov 2021 14:18:05 +0000 (+0100)
Subject: ref #694 adapt appimport to new DescriptionElementService
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib-apps.git/commitdiff_plain/3b52542deabbd390aaea45b1d85d52eaab8cbd54?hp=2c4c98fc7a440e90c8260ec2c2e0b062f151d0c3

ref #694 adapt appimport to new DescriptionElementService
---

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
index 6b962ef6..bc7ebdcd 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
@@ -104,7 +104,7 @@ public class DipteraPostImportUpdater {
 				}
 			}
 
-			cdmApp.getDescriptionService().saveDescriptionElement(citationsToSave);
+			cdmApp.getDescriptionElementService().save(citationsToSave);
 			//commit
 			cdmApp.commitTransaction(tx);
 			logger.warn("Citations updated!");
diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
index 9ce47105..d17935dd 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
@@ -32,7 +32,7 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.service.IDescriptionService;
+import eu.etaxonomy.cdm.api.service.IDescriptionElementService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
@@ -263,8 +263,8 @@ public class UseImport {
 
 		ITaxonService taxonService = applicationController.getTaxonService();
 		ITermService termService = applicationController.getTermService();
-		IDescriptionService descService = applicationController.getDescriptionService();
-		IReferenceService referenceService = applicationController.getReferenceService();
+		IDescriptionElementService descElementService = applicationController.getDescriptionElementService();
+        IReferenceService referenceService = applicationController.getReferenceService();
 
 
 		ArrayList<ArrayList<String>> lstUseSummaries = loadSpreadsheet(xslUseSummaryPathString);
@@ -302,7 +302,7 @@ public class UseImport {
 					TextData useSummary = TextData.NewInstance(featureUseSummary);
 					LanguageString languageString = LanguageString.NewInstance(lstUseSummary.get(1), Language.ENGLISH());
 					useSummary.putText(languageString);
-					descService.saveDescriptionElement(useSummary);
+					descElementService.save(useSummary);
 					newUseDescription.addElement(useSummary);
 					for (ArrayList<String> lstUseRecord : lstUseRecords) {
 						j++;
@@ -425,7 +425,7 @@ public class UseImport {
 								useRecord.addModifier(ethnicGroup);
 							}
 							useRecord.putModifyingText(Language.ENGLISH(), modifyingText);
-							descService.saveDescriptionElement(useRecord);
+							descElementService.save(useRecord);
 							newUseDescription.addElement(useRecord);
 						}
 					}
diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
index 09c55192..83380557 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
@@ -158,7 +158,7 @@ public class BerlinModelOccurrenceSourceImport  extends BerlinModelImportBase {
 
             }
 			logger.info("Distributions to save: " + objectsToSave.size());
-			getDescriptionService().saveDescriptionElement(objectsToSave);
+			getDescriptionElementService().save(objectsToSave);
 
 			return success;
 		} catch (SQLException e) {
diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
index 023378eb..9ff02f12 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
@@ -155,7 +155,7 @@ public class SalvadorSpecimenImport
         Map<String, String> record = state.getCurrentRecord();
         UUID factUuid = UUID.fromString(record.get("specimenFactUuid"));
 
-        TextData textSpecimen = (TextData)getDescriptionService().getDescriptionElementByUuid(factUuid);
+        TextData textSpecimen = (TextData)getDescriptionElementService().find(factUuid);
         textSpecimen.setFeature(getTexSpecimenFeature());
 
         FieldUnit fieldUnit = FieldUnit.NewInstance();