Project

General

Profile

« Previous | Next » 

Revision 42158

progress provider refactoring

View differences:

UpdateDbJobNode.java
7 7
import eu.dnetlib.enabling.resultset.client.ResultSetClient;
8 8
import eu.dnetlib.enabling.tools.blackboard.BlackboardJob;
9 9
import eu.dnetlib.msro.workflows.nodes.BlackboardJobNode;
10
import eu.dnetlib.msro.workflows.nodes.ProgressJobNode;
11 10
import eu.dnetlib.msro.workflows.procs.Env;
12
import eu.dnetlib.msro.workflows.util.ProgressProvider;
11
import eu.dnetlib.msro.workflows.procs.Token;
13 12
import eu.dnetlib.msro.workflows.util.ResultsetProgressProvider;
14 13
import eu.dnetlib.rmi.common.ResultSet;
15 14
import eu.dnetlib.rmi.data.DatabaseService;
16 15

  
17
public class UpdateDbJobNode extends BlackboardJobNode implements ProgressJobNode {
16
public class UpdateDbJobNode extends BlackboardJobNode {
18 17

  
19 18
	private static final Log log = LogFactory.getLog(UpdateDbJobNode.class);
20 19
	private String db;
21 20
	private String dbParam;
22 21
	private String eprParam;
23 22

  
24
	private ProgressProvider progressProvider;
25

  
26 23
	@Autowired
27 24
	private ResultSetClient resultSetClient;
28 25

  
......
32 29
	}
33 30

  
34 31
	@Override
35
	protected void prepareJob(final BlackboardJob job, final Env env) throws Exception {
32
	protected void prepareJob(final BlackboardJob job, final Token token) throws Exception {
36 33
		if (this.db == null || this.db.isEmpty()) {
37
			this.db = env.getAttribute(getDbParam(), String.class);
34
			this.db = token.getEnv().getAttribute(getDbParam(), String.class);
38 35
		}
39 36

  
40 37
		log.info("preparing blackboard job to update DB: " + this.db);
41 38

  
42
		final ResultSet<?> rs = env.getAttribute(getEprParam(), ResultSet.class);
39
		final ResultSet<?> rs = token.getEnv().getAttribute(getEprParam(), ResultSet.class);
43 40

  
44
		this.progressProvider = ResultsetProgressProvider.newInstance(rs, this.resultSetClient);
41
		token.setProgressProvider(new ResultsetProgressProvider(rs, this.resultSetClient));
45 42

  
46 43
		job.setAction("IMPORT");
47 44
		job.getParameters().put("db", this.db);
48 45
		job.getParameters().put("epr", rs.toJson());
49 46
	}
50 47

  
51
	@Override
52
	public ProgressProvider getProgressProvider() {
53
		return this.progressProvider;
54
	}
55

  
56 48
	public String getDb() {
57 49
		return this.db;
58 50
	}

Also available in: Unified diff