Project

General

Profile

« Previous | Next » 

Revision b313991f

Added by Andreas Müller over 4 years ago

adapt some classes to new CommonService.getSourcedObjectSByIdInSource and cleanup

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
556 556

  
557 557
	@Override
558 558
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {
559
		String nameSpace;
560
		Class<?> cdmClass;
559

  
560
	    String nameSpace;
561 561
		Set<String> idSet;
562 562

  
563 563
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();
......
566 566
			Set<String> teamIdSet = new HashSet<>();
567 567
			Set<String> referenceIdSet = new HashSet<>();
568 568
			Set<String> refDetailIdSet = new HashSet<>();
569
			Set<Integer> prelimRefDetailCandidateIdSet = new HashSet<>();
569
			List<Integer> prelimRefDetailCandidateIdSet = new ArrayList<>();
570 570
			while (rs.next()){
571 571
				handleForeignKey(rs, teamIdSet, "AuthorTeamFk");
572 572
				handleForeignKey(rs, teamIdSet, "ExAuthorTeamFk");
......
579 579

  
580 580
			//team map
581 581
			nameSpace = BerlinModelAuthorTeamImport.NAMESPACE;
582
			cdmClass = TeamOrPersonBase.class;
583 582
			idSet = teamIdSet;
584
			@SuppressWarnings("unchecked")
585
            Map<String, TeamOrPersonBase<?>> teamMap = (Map<String, TeamOrPersonBase<?>>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
583
            @SuppressWarnings("rawtypes")
584
            Map<String, TeamOrPersonBase> teamMap = getCommonService().getSourcedObjectsByIdInSourceC(TeamOrPersonBase.class, idSet, nameSpace);
586 585
			result.put(nameSpace, teamMap);
587 586

  
588 587
			//reference map
589 588
			nameSpace = BerlinModelReferenceImport.REFERENCE_NAMESPACE;
590
			cdmClass = Reference.class;
591 589
			idSet = referenceIdSet;
592
			@SuppressWarnings("unchecked")
593
            Map<String, Reference> referenceMap = (Map<String, Reference>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
590
            Map<String, Reference> referenceMap = getCommonService().getSourcedObjectsByIdInSourceC(Reference.class, idSet, nameSpace);
594 591
			result.put(nameSpace, referenceMap);
595 592

  
596 593
			//refDetail map
597 594
			nameSpace = BerlinModelRefDetailImport.REFDETAIL_NAMESPACE;
598
			cdmClass = Reference.class;
599 595
			idSet = refDetailIdSet;
600
			@SuppressWarnings("unchecked")
601
            Map<String, Reference> refDetailMap= (Map<String, Reference>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
596
            Map<String, Reference> refDetailMap= getCommonService().getSourcedObjectsByIdInSourceC(Reference.class, idSet, nameSpace);
602 597
			result.put(nameSpace, refDetailMap);
603 598

  
604 599
	         //prelim map
605 600
            nameSpace = NAMESPACE_PRELIM;
606
            cdmClass = Reference.class;
607
            List<Reference> list = getReferenceService().findById(prelimRefDetailCandidateIdSet);
601
            List<Reference> list = getReferenceService().loadByIds(prelimRefDetailCandidateIdSet, null);
608 602
            Map<String, Reference> prelimMap = new HashMap<>();
609 603
            for (Reference ref : list){
610 604
                prelimMap.put(String.valueOf(ref.getId()), ref);

Also available in: Unified diff