adapt some classes to new CommonService.getSourcedObjectSByIdInSource and cleanup

[cdmlib-apps.git] / cdm-pesi / src / main / java / eu / etaxonomy / cdm / io / pesi / erms / ErmsNotesSourcesImport.java

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
index 2733a4b652b7a89d5050a0931c60b178f6b6ed7e..50d483d28f2844363e41b437a89291ff7b91ce19 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
@@ -87,8 +87,8 @@ public class ErmsNotesSourcesImport extends ErmsImportBase<CommonTaxonName> {
 \r
        @Override\r
        public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {\r
-               String nameSpace;\r
-               Class<?> cdmClass;\r
+\r
+           String nameSpace;\r
                Set<String> idSet;\r
                Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();\r
 \r
@@ -102,17 +102,14 @@ public class ErmsNotesSourcesImport extends ErmsImportBase<CommonTaxonName> {
 \r
                        //note map\r
                        nameSpace = ErmsImportBase.NOTES_NAMESPACE;\r
-                       cdmClass = TextData.class;\r
                        idSet = noteIdSet;\r
-                       Map<String, CommonTaxonName> noteMap = (Map<String, CommonTaxonName>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+                       Map<String, TextData> noteMap = getCommonService().getSourcedObjectsByIdInSourceC(TextData.class, idSet, nameSpace);\r
                        result.put(nameSpace, noteMap);\r
 \r
                        //reference map\r
                        nameSpace = ErmsImportBase.REFERENCE_NAMESPACE;\r
-                       cdmClass = Reference.class;\r
                        idSet = sourceIdSet;\r
-                       @SuppressWarnings("unchecked")\r
-            Map<String, Reference> referenceMap = (Map<String, Reference>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+                       Map<String, Reference> referenceMap = getCommonService().getSourcedObjectsByIdInSourceC(Reference.class, idSet, nameSpace);\r
                        result.put(nameSpace, referenceMap);\r
 \r
                } catch (SQLException e) {\r