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/AlgaTerraMorphologyImport.java
56 56
 */
57 57
@Component
58 58
public class AlgaTerraMorphologyImport  extends AlgaTerraSpecimenImportBase {
59
	private static final Logger logger = Logger.getLogger(AlgaTerraMorphologyImport.class);
60 59

  
60
    private static final long serialVersionUID = 5978046406702163690L;
61
    private static final Logger logger = Logger.getLogger(AlgaTerraMorphologyImport.class);
61 62

  
62 63
	private static int modCount = 5000;
63 64
	private static final String pluralString = "morpho facts";
......
245 246
	}
246 247

  
247 248

  
248

  
249

  
250 249
	private void makeValveFeatures(AlgaTerraImportState state,
251 250
			Map<String, Feature> featureMap2,
252 251
			TermVocabulary<Feature> algaTerraMorphoFeatures2) {
......
259 258

  
260 259
	}
261 260

  
262

  
263 261
	private void handleSingleValve(AlgaTerraImportState state,
264 262
			Map<String, Feature> featureMap2,
265 263
			TermVocabulary<Feature> algaTerraMorphoFeatures2, String valveStr) {
......
307 305

  
308 306

  
309 307
	@Override
310
	public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState bmState) {
308
	public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState bmState) {
311 309
		boolean success = true;
312 310

  
313 311
		AlgaTerraImportState state = (AlgaTerraImportState)bmState;
314
		Set<SpecimenOrObservationBase> objectsToSave = new HashSet<SpecimenOrObservationBase>();
312
		@SuppressWarnings("rawtypes")
313
        Set<SpecimenOrObservationBase> objectsToSave = new HashSet<>();
315 314

  
316 315
		ResultSet rs = partitioner.getResultSet();
317 316

  
......
483 482
		return ECO_FACT_FIELD_OBSERVATION_NAMESPACE;
484 483
	}
485 484

  
486

  
487

  
488 485
	private void makeParameter(AlgaTerraImportState state, ResultSet rs, DescriptionBase<?> descriptionBase) throws SQLException {
489 486
		for (int i = 1; i <= 10; i++){
490 487
			String valueStr = rs.getString(String.format("P%dValue", i));
......
524 521
			}else if (isNotBlank(valueStr) || isNotBlank(unitStr) ){
525 522
				logger.warn("There is value or unit without parameter: " + i);
526 523
			}
527

  
528

  
529 524
		}
530

  
531 525
	}
532 526

  
533 527
	private String normalizeAndModifyValue(AlgaTerraImportState state, String valueStr, Set<DefinedTerm> valueModifier) {
......
575 569
		}
576 570
	}
577 571

  
578

  
579 572
	@Override
580 573
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {
581
		String nameSpace;
582
		Class<?> cdmClass;
574

  
575
	    String nameSpace;
583 576
		Set<String> idSet;
584
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
577
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();
585 578

  
586 579
		try{
587
			Set<String> ecoFactFkSet = new HashSet<String>();
580
			Set<String> ecoFactFkSet = new HashSet<>();
588 581

  
589 582
			while (rs.next()){
590 583
				handleForeignKey(rs, ecoFactFkSet, "ecoFactId");
591 584
			}
592 585

  
593 586
			//eco fact derived unit map
594
			nameSpace = AlgaTerraFactEcologyImport.ECO_FACT_DERIVED_UNIT_NAMESPACE;
595
			cdmClass = DerivedUnit.class;
587
			nameSpace = AlgaTerraSpecimenImportBase.ECO_FACT_DERIVED_UNIT_NAMESPACE;
596 588
			idSet = ecoFactFkSet;
597
			Map<String, DerivedUnit> derivedUnitMap = (Map<String, DerivedUnit>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
589
			Map<String, DerivedUnit> derivedUnitMap = getCommonService().getSourcedObjectsByIdInSourceC(DerivedUnit.class, idSet, nameSpace);
598 590
			result.put(nameSpace, derivedUnitMap);
599 591

  
600 592
		} catch (SQLException e) {

Also available in: Unified diff