Project

General

Profile

« Previous | Next » 

Revision e0935f63

Added by Andreas Müller over 4 years ago

adapt some classes to new CommonService.getSourcedObjectSByIdInSourceC and cleanup

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraDnaImport.java
362 362
	@Override
363 363
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {
364 364
		String nameSpace;
365
		Class<?> cdmClass;
366 365
		Set<String> idSet;
367 366
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();
368 367

  
369 368
		try{
370 369
			Set<String> taxonIdSet = new HashSet<>();
371

  
372 370
			Set<String> ecoFactFkSet = new HashSet<>();
373

  
374 371
			while (rs.next()){
375 372
				handleForeignKey(rs, taxonIdSet, "taxonId");
376 373
				handleForeignKey(rs, ecoFactFkSet, "ecoFactId");
......
378 375

  
379 376
			//taxon map
380 377
			nameSpace = BerlinModelTaxonImport.NAMESPACE;
381
			cdmClass = TaxonBase.class;
382 378
			idSet = taxonIdSet;
383
			Map<String, TaxonBase> objectMap = (Map<String, TaxonBase>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
379
			Map<String, TaxonBase> objectMap = getCommonService().getSourcedObjectsByIdInSourceC(TaxonBase.class, idSet, nameSpace);
384 380
			result.put(nameSpace, objectMap);
385 381

  
386 382

  
387 383
			//eco fact derived unit map
388
			nameSpace = AlgaTerraFactEcologyImport.ECO_FACT_DERIVED_UNIT_NAMESPACE;
389
			cdmClass = DerivedUnit.class;
384
			nameSpace = AlgaTerraSpecimenImportBase.ECO_FACT_DERIVED_UNIT_NAMESPACE;
390 385
			idSet = ecoFactFkSet;
391
			Map<String, DerivedUnit> derivedUnitMap = (Map<String, DerivedUnit>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
386
			Map<String, DerivedUnit> derivedUnitMap = getCommonService().getSourcedObjectsByIdInSourceC(DerivedUnit.class, idSet, nameSpace);
392 387
			result.put(nameSpace, derivedUnitMap);
393 388

  
394 389
		} catch (SQLException e) {

Also available in: Unified diff