Revision 47140
Added by Michele Artini about 7 years ago
modules/dnet-springboot-apps/trunk/dnet-msro-application/src/main/java/eu/dnetlib/msro/controllers/MsroController.java | ||
---|---|---|
35 | 35 |
@Autowired |
36 | 36 |
private WorkflowDispatcher dispatcher; |
37 | 37 |
|
38 |
@RequestMapping("startWorkflow") |
|
39 |
public WorkflowRef startWorkflow( |
|
40 |
@RequestParam final String wfId, |
|
41 |
@RequestParam(required = false) final String parent, |
|
42 |
@RequestParam(required = false) final String dsId, |
|
43 |
@RequestParam(required = false) final String ifaceId) throws MSROException { |
|
44 |
|
|
45 |
return dispatcher.startWorkflow(wfId, parent, dsId, ifaceId, null, null); |
|
46 |
|
|
47 |
} |
|
48 |
|
|
38 | 49 |
@Override |
39 |
public AsyncRunnable prepareThread(final String method, final String jsonParams, final AsyncServerCallback callback) throws AsyncMethodException {
|
|
50 |
public AsyncRunnable createAsyncJob(final String method, final String jsonParams, final AsyncServerCallback callback) throws AsyncMethodException {
|
|
40 | 51 |
final ObjectMapper mapper = new ObjectMapper(); |
41 | 52 |
|
42 | 53 |
return new AsyncRunnable() { |
... | ... | |
69 | 80 |
|
70 | 81 |
} |
71 | 82 |
|
72 |
@RequestMapping("startWorkflow") |
|
73 |
public WorkflowRef startWorkflow( |
|
74 |
@RequestParam final String wfId, |
|
75 |
@RequestParam(required = false) final String parent, |
|
76 |
@RequestParam(required = false) final String dsId, |
|
77 |
@RequestParam(required = false) final String ifaceId) throws MSROException { |
|
78 |
|
|
79 |
return dispatcher.startWorkflow(wfId, parent, dsId, ifaceId, null, null); |
|
80 |
|
|
81 |
} |
|
82 |
|
|
83 | 83 |
} |
modules/dnet-springboot-apps/trunk/dnet-simple-aggregation-worker/src/main/java/eu/dnetlib/msro/controllers/MsroWorkerController.java | ||
---|---|---|
151 | 151 |
} |
152 | 152 |
|
153 | 153 |
@Override |
154 |
public AsyncRunnable prepareThread(final String method, final String jsonParams, final AsyncServerCallback callback) throws AsyncMethodException {
|
|
154 |
public AsyncRunnable createAsyncJob(final String method, final String jsonParams, final AsyncServerCallback callback) throws AsyncMethodException {
|
|
155 | 155 |
final ObjectMapper mapper = new ObjectMapper(); |
156 | 156 |
|
157 | 157 |
try { |
modules/dnet-springboot-apps/trunk/dnet-common-utils/src/main/java/eu/dnetlib/services/BaseService.java | ||
---|---|---|
129 | 129 |
final AsyncServerCallback callback = |
130 | 130 |
StringUtils.isNotBlank(caller) ? res -> sendResponse(caller + "/async/response/" + async.getId(), res) : res -> {}; |
131 | 131 |
|
132 |
final AsyncRunnable runnable = ((HasAsyncMethods) this).prepareThread(method, jsonParams, callback);
|
|
132 |
final AsyncRunnable runnable = ((HasAsyncMethods) this).createAsyncJob(method, jsonParams, callback);
|
|
133 | 133 |
|
134 | 134 |
async.setInfo(runnable.prepare()); |
135 | 135 |
|
modules/dnet-springboot-apps/trunk/dnet-common-utils/src/main/java/eu/dnetlib/services/async/HasAsyncMethods.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
public interface HasAsyncMethods { |
4 | 4 |
|
5 |
AsyncRunnable prepareThread(String method, String jsonParams, AsyncServerCallback callback) throws AsyncMethodException;
|
|
5 |
AsyncRunnable createAsyncJob(String method, String jsonParams, AsyncServerCallback callback) throws AsyncMethodException;
|
|
6 | 6 |
|
7 | 7 |
} |
Also available in: Unified diff
renamed a method