adapt some classes to new CommonService.getSourcedObjectSByIdInSource and cleanup

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / berlinModel / in / BerlinModelTaxonRelationImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java
index 4fae8334a5999c0a9069f4190932dfe5a3a883ac..8c3ffe91ee181eee5ab5b7d64971f5af5324fb20 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java
@@ -242,12 +242,15 @@ public class BerlinModelTaxonRelationImport  extends BerlinModelImportBase  {
        }\r
 \r
        @Override\r
-       public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {\r
+       public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState state) {\r
                boolean success = true ;\r
-               Set<TaxonBase> taxaToSave = new HashSet<>();\r
-               Map<String, TaxonBase> taxonMap = partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);\r
+               @SuppressWarnings("rawtypes")\r
+        Set<TaxonBase> taxaToSave = new HashSet<>();\r
+               @SuppressWarnings({ "unchecked", "rawtypes" })\r
+        Map<String, TaxonBase> taxonMap = partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);\r
                Map<Integer, Classification> classificationMap = new HashMap<>();\r
-               Map<String, Reference> refMap = partitioner.getObjectMap(BerlinModelReferenceImport.REFERENCE_NAMESPACE);\r
+               @SuppressWarnings("unchecked")\r
+        Map<String, Reference> refMap = partitioner.getObjectMap(BerlinModelReferenceImport.REFERENCE_NAMESPACE);\r
 \r
                ResultSet rs = partitioner.getResultSet();\r
 \r
@@ -617,8 +620,8 @@ public class BerlinModelTaxonRelationImport  extends BerlinModelImportBase  {
 \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<>();\r
 \r
@@ -635,25 +638,23 @@ public class BerlinModelTaxonRelationImport  extends BerlinModelImportBase  {
 \r
                        //taxon map\r
                        nameSpace = BerlinModelTaxonImport.NAMESPACE;\r
-                       cdmClass = TaxonBase.class;\r
                        idSet = taxonIdSet;\r
-                       Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+                       @SuppressWarnings("rawtypes")\r
+            Map<String, TaxonBase> taxonMap = getCommonService().getSourcedObjectsByIdInSourceC(TaxonBase.class, idSet, nameSpace);\r
                        result.put(nameSpace, taxonMap);\r
 \r
 //                     //tree map\r
 //                     nameSpace = "Classification";\r
-//                     cdmClass = Classification.class;\r
 //                     idSet = classificationIdSet;\r
-//                     Map<String, Classification> treeMap = (Map<String, Classification>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
+//                     Map<String, Classification> treeMap = getCommonService().getSourcedObjectsByIdInSourceC(Classification.class, idSet, nameSpace);\r
 //                     result.put(cdmClass, treeMap);\r
 //                     Set<UUID> treeUuidSet = state\r
 //                     getClassificationService().find(uuidSet);\r
 //\r
                        //reference map\r
                        nameSpace = BerlinModelReferenceImport.REFERENCE_NAMESPACE;\r
-                       cdmClass = Reference.class;\r
                        idSet = referenceIdSet;\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
@@ -803,6 +804,4 @@ public class BerlinModelTaxonRelationImport  extends BerlinModelImportBase  {
        protected boolean isIgnore(BerlinModelImportState state){\r
                return ! state.getConfig().isDoRelTaxa();\r
        }\r
-\r
-\r
 }\r