Project

General

Profile

« Previous | Next » 

Revision 49538

branch for new dsm

View differences:

RemoveApiExtraFieldsJobNode.java
4 4
import java.util.Map;
5 5
import java.util.Set;
6 6

  
7
import javax.annotation.Resource;
8

  
9 7
import org.apache.cxf.common.util.StringUtils;
10 8
import org.dom4j.Document;
11 9
import org.dom4j.Node;
12 10
import org.dom4j.io.SAXReader;
11
import org.springframework.beans.factory.annotation.Autowired;
13 12

  
14 13
import com.google.common.base.Splitter;
15 14
import com.google.common.collect.Maps;
......
17 16
import com.googlecode.sarasvati.Arc;
18 17
import com.googlecode.sarasvati.NodeToken;
19 18

  
20
import eu.dnetlib.enabling.datasources.rmi.DatasourceManagerService;
19
import eu.dnetlib.enabling.datasources.common.DatasourceManager;
21 20
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
22 21
import eu.dnetlib.enabling.locators.UniqueServiceLocator;
23 22
import eu.dnetlib.msro.workflows.nodes.SimpleJobNode;
......
28 27
	private String datasourceInterface;
29 28
	private String fields;
30 29

  
31
	@Resource
30
	@Autowired
32 31
	private UniqueServiceLocator serviceLocator;
33 32

  
33
	@Autowired
34
	private DatasourceManager<?, ?> dsManager;
35

  
34 36
	@Override
35 37
	protected String execute(final NodeToken token) throws Exception {
36 38
		if (!StringUtils.isEmpty(fields)) {
37 39
			final Set<String> invalidFields = Sets.newHashSet(Splitter.on(",").omitEmptyStrings().trimResults().split(fields.toLowerCase()));
38 40
			final Map<String, String> map = calculateValidExtraFields(datasourceId, datasourceInterface, invalidFields);
39
			serviceLocator.getService(DatasourceManagerService.class).bulkUpdateApiExtraFields(datasourceId, datasourceInterface, map);
41
			dsManager.bulkUpdateApiExtraFields(datasourceId, datasourceInterface, map);
40 42
		}
41 43
		return Arc.DEFAULT_ARC;
42 44
	}

Also available in: Unified diff