adapt some classes to new CommonService.getSourcedObjectSByIdInSource and cleanup

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / algaterra / AlgaTerraTypeImagesImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImagesImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImagesImport.java
index 8557b9ddbc3226ca6b7d433d31562891c6031bbb..03da040356c405eafb74b91825374d4e3ef68e41 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImagesImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImagesImport.java
@@ -162,13 +162,13 @@ public class AlgaTerraTypeImagesImport  extends AlgaTerraImageImportBase {
 \r
        @Override\r
        public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState 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<Object, Map<String, ? extends CdmBase>>();\r
+               Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();\r
 \r
                try{\r
-                       Set<String> typeSpecimenIdSet = new HashSet<String>();\r
+                       Set<String> typeSpecimenIdSet = new HashSet<>();\r
 \r
                        while (rs.next()){\r
                                handleForeignKey(rs, typeSpecimenIdSet, "TypeSpecimenFk");\r
@@ -176,9 +176,8 @@ public class AlgaTerraTypeImagesImport  extends AlgaTerraImageImportBase {
 \r
                        //type specimen map\r
                        nameSpace = AlgaTerraSpecimenImportBase.TYPE_SPECIMEN_DERIVED_UNIT_NAMESPACE;\r
-                       cdmClass = SpecimenOrObservationBase.class;\r
                        idSet = typeSpecimenIdSet;\r
-                       Map<String, DerivedUnit> typeSpecimenMap = (Map<String, DerivedUnit>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+                       Map<String, DerivedUnit> typeSpecimenMap = getCommonService().getSourcedObjectsByIdInSourceC(DerivedUnit.class, idSet, nameSpace);\r
                        result.put(nameSpace, typeSpecimenMap);\r
 \r
 \r