/ - Diff - EDIT - EDIT Project Management

     	private ICdmDataSource datasource;
     	private final String mappingId;
     	private final Map<String, Class> shortCuts = new HashMap<String, Class>();
     	private final Map<Class, String> reverseShortCuts = new HashMap<Class, String>();
     	private final Map<String, Class> shortCuts = new HashMap<>();
     	private final Map<Class, String> reverseShortCuts = new HashMap<>();
     	@Override
-...
     	@Override
     	public void putMapping(String namespace, String sourceKey, IdentifiableEntity destinationObject){
     		CdmKey<IdentifiableEntity<?>> cdmKey = new CdmKey(destinationObject);
     		CdmKey<IdentifiableEntity<?>> cdmKey = new CdmKey<>(destinationObject);
     		putMapping(namespace, sourceKey, cdmKey);
+    	}
-...
     	@Override
     	public Set<CdmKey> get(String sourceNamespace, String sourceId) {
     		Set<CdmKey> result = new HashSet<CdmKey>();
     		Set<CdmKey> result = new HashSet<>();
     		String normalizedKey = normalizeKey(sourceId);
     		String selectMappingSql = " SELECT %s, %s FROM %s" +
     				" WHERE %s = '%s' AND %s = '%s' AND %s = '%s' ";
-...
     					throw new RuntimeException("Destination id for import mapping is 'null'");
+    				}
     				Class clazz = getCdmClass(clazzStr);
     				Class<?> clazz = getCdmClass(clazzStr);
     				CdmKey<?> key = new CdmKey(clazz, Integer.valueOf(String.valueOf(id)));
     				CdmKey<?> key = new CdmKey<>(clazz, Integer.valueOf(String.valueOf(id)));
     				result.add(key);
+    			}
     		} catch (NumberFormatException e) {
-...
     	 * @return
     	 * @throws ClassNotFoundException
     	 */
     	private Class getCdmClass(String clazzStr) throws ClassNotFoundException {
     		Class clazz = shortCuts.get(clazzStr);
     	private Class<?> getCdmClass(String clazzStr) throws ClassNotFoundException {
     		Class<?> clazz = shortCuts.get(clazzStr);
     		if (clazz == null){
     			clazz = Class.forName(clazzStr);
+    		}

     	@Override
         public IReader<MappedCdmBase> map(StreamItem item ){
     		List<MappedCdmBase> resultList = new ArrayList<MappedCdmBase>();
     		List<MappedCdmBase> resultList = new ArrayList<>();
     		Map<String, String> csv = item.map;
     		Reference sourceReference = state.getTransactionalSourceReference();
-...
+    		}
     		//return
     		return new ListReader<MappedCdmBase>(resultList);
     		return new ListReader<>(resultList);
+    	}
-...
     	@Override
     	public Set<String> requiredSourceNamespaces() {
     		Set<String> result = new HashSet<String>();
     		Set<String> result = new HashSet<>();
      		result.add(TermUri.DWC_TAXON.toString());
      		result.add(TermUri.DWC_LOCATION_ID.toString());
      		return result;

     	public  void loadRelatedObjects (InMemoryMapping mapping){
     		Map<String, Map<String, IdentifiableEntity>> result = new HashMap<String, Map<String,IdentifiableEntity>>();
     		Map<String, Map<String, IdentifiableEntity>> result = new HashMap<>();
     		List<MappingEntry<String, String, Class, Integer>> mappingEntryList = mapping.getEntryList();
     		//order ids by destination classes
     		Map<Class, Set<Integer>> destinationNamespaceMap = new HashMap<Class, Set<Integer>>();
     		Map<Class, Set<Integer>> destinationNamespaceMap = new HashMap<>();
     		for (MappingEntry<String, String, Class, Integer> entry : mappingEntryList){
     			Set<Integer> idSet = destinationNamespaceMap.get(entry.getDestinationNamespace());
     			if (idSet == null){
-...
+    		}
     		//retrieve cdm objects per class
     		Map<Class, Map<Integer, IdentifiableEntity>> classMap = new HashMap<Class, Map<Integer,IdentifiableEntity>>();
     		Map<Class, Map<Integer, IdentifiableEntity>> classMap = new HashMap<>();
     		for (Class<?> cdmClass : destinationNamespaceMap.keySet()){
     			IIdentifiableEntityService<?> classService = getCurrentIO().getServiceByClass(cdmClass);
     			Set<Integer> idSet = destinationNamespaceMap.get(cdmClass);
     			List<? extends IdentifiableEntity> relatedObjects = classService.findById(idSet);
     			//put into id map
     			Map<Integer, IdentifiableEntity> idMap = new HashMap<Integer, IdentifiableEntity>();
     			Map<Integer, IdentifiableEntity> idMap = new HashMap<>();
     			for (IdentifiableEntity<?> identEnt : relatedObjects){
     				idMap.put(identEnt.getId(), identEnt);
+    			}
-...
     //	}
     	public void unloadPartitionStore(Map<String, Map<String, IdentifiableEntity>> partitionStore) {
     		this.partitionStore = new HashMap<String, Map<String,IdentifiableEntity>>();
     		this.partitionStore = new HashMap<>();
+    	}
     	public IImportMapping getMapping() {
-...
     	private Map<String, IdentifiableEntity> getOrMakeNamespaceMap(Map<String, Map<String, IdentifiableEntity>> relatedObjectMap2, String namespace) {
     		Map<String, IdentifiableEntity> namespaceMap = relatedObjectMap2.get(namespace);
     		if (namespaceMap == null){
     			namespaceMap = new HashMap<String, IdentifiableEntity>();
     			namespaceMap = new HashMap<>();
     			relatedObjectMap2.put(namespace, namespaceMap);
+    		}
     		return namespaceMap;

Project

General

Profile

EDIT

Revision 0d6a5e24

Added by Andreas Müller over 6 years ago