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/BerlinModelTypesImport.java
26 26
import eu.etaxonomy.cdm.io.common.IOValidator;
27 27
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
28 28
import eu.etaxonomy.cdm.io.common.Source;
29
import eu.etaxonomy.cdm.model.agent.Person;
30 29
import eu.etaxonomy.cdm.model.common.Annotation;
31 30
import eu.etaxonomy.cdm.model.common.CdmBase;
32 31
import eu.etaxonomy.cdm.model.common.Language;
......
61 60
		super(dbTableName, pluralString);
62 61
	}
63 62

  
64

  
65
	/* (non-Javadoc)
66
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
67
	 */
68 63
	@Override
69 64
	protected String getRecordQuery(BerlinModelImportConfigurator config) {
70 65
		String strRecordQuery =
......
75 70
		return strRecordQuery;
76 71
	}
77 72

  
78
	/* (non-Javadoc)
79
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#doPartition(eu.etaxonomy.cdm.io.berlinModel.in.ResultSetPartitioner, eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState)
80
	 */
81 73
	@Override
82
    public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {
83
		boolean result = true;
74
    public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState state) {
75

  
76
	    boolean result = true;
84 77
		Set<TaxonName> namesToSave = new HashSet<>();
85
		Map<Integer, DerivedUnit> typeMap = new HashMap<Integer, DerivedUnit>();
78
		Map<Integer, DerivedUnit> typeMap = new HashMap<>();
86 79

  
87
		Map<String, TaxonName> nameMap = partitioner.getObjectMap(BerlinModelTaxonNameImport.NAMESPACE);
88
		Map<String, Reference> refMap = partitioner.getObjectMap(BerlinModelReferenceImport.REFERENCE_NAMESPACE);
80
		@SuppressWarnings("unchecked")
81
        Map<String, TaxonName> nameMap = partitioner.getObjectMap(BerlinModelTaxonNameImport.NAMESPACE);
82
		@SuppressWarnings("unchecked")
83
        Map<String, Reference> refMap = partitioner.getObjectMap(BerlinModelReferenceImport.REFERENCE_NAMESPACE);
89 84

  
90 85
		BerlinModelImportConfigurator config = state.getConfig();
91 86
		Source source = config.getSource();
......
176 171

  
177 172
	@Override
178 173
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {
179
		String nameSpace;
180
		Class<?> cdmClass;
174

  
175
	    String nameSpace;
181 176
		Set<String> idSet;
182
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
177
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>();
183 178

  
184 179
		try{
185 180
			Set<String> nameIdSet = new HashSet<String>();
......
191 186

  
192 187
			//name map
193 188
			nameSpace = BerlinModelTaxonNameImport.NAMESPACE;
194
			cdmClass = TaxonName.class;
195 189
			idSet = nameIdSet;
196
			Map<String, Person> objectMap = (Map<String, Person>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
190
			Map<String, TaxonName> objectMap = getCommonService().getSourcedObjectsByIdInSourceC(TaxonName.class, idSet, nameSpace);
197 191
			result.put(nameSpace, objectMap);
198 192

  
199 193
			//reference map
200 194
			nameSpace = BerlinModelReferenceImport.REFERENCE_NAMESPACE;
201
			cdmClass = Reference.class;
202 195
			idSet = referenceIdSet;
203
			Map<String, Reference> referenceMap = (Map<String, Reference>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
196
			Map<String, Reference> referenceMap = getCommonService().getSourcedObjectsByIdInSourceC(Reference.class, idSet, nameSpace);
204 197
			result.put(nameSpace, referenceMap);
205 198

  
206 199
		} catch (SQLException e) {
......
272 265
		return success;
273 266
	}
274 267

  
275
	/* (non-Javadoc)
276
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
277
	 */
278 268
	@Override
279 269
	protected boolean doCheck(BerlinModelImportState state){
280 270
		IOValidator<BerlinModelImportState> validator = new BerlinModelTypesImportValidator();
281 271
		return validator.validate(state);
282 272
	}
283 273

  
284

  
285
	/* (non-Javadoc)
286
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
287
	 */
288 274
	@Override
289 275
    protected boolean isIgnore(BerlinModelImportState state){
290 276
		return ! state.getConfig().isDoTypes();
291 277
	}
292

  
293 278
}

Also available in: Unified diff