/ - Diff - D-Net - D-Net project tracking tool

     package eu.dnetlib.msro.controllers;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.web.bind.annotation.RequestMapping;
     import org.springframework.web.bind.annotation.RestController;
     import com.fasterxml.jackson.databind.ObjectMapper;
     import eu.dnetlib.clients.msro.Workflow;
     import eu.dnetlib.clients.msro.WorkflowTemplate;
     import eu.dnetlib.enabling.annotations.DnetService;
     import eu.dnetlib.enabling.annotations.DnetServiceType;
     import eu.dnetlib.msro.workflows.util.WorkflowDispatcher;
     import eu.dnetlib.services.BaseService;
     import eu.dnetlib.services.async.AsyncMethodException;
     import eu.dnetlib.services.async.AsyncServerCallback;
     import eu.dnetlib.services.async.HasAsyncMethods;
     @RestController
     @RequestMapping("/msro")
     @DnetService(DnetServiceType.msro)
     public class MsroWorkerController extends BaseService {
     public class MsroWorkerController extends BaseService implements HasAsyncMethods {
     	private static final Log log = LogFactory.getLog(MsroWorkerController.class);
     	@Autowired
     	private WorkflowDispatcher dispatcher;
     	@Override
     	public void processMethod(final String method, final String jsonParams, final AsyncServerCallback callback) throws AsyncMethodException {
     		final ObjectMapper mapper = new ObjectMapper();
     		try {
     			if (method == "startWorkflow") {
     				dispatcher.startWorkflow(mapper.readValue(jsonParams, Workflow.class));
     			} else if (method == "startWorkflowTemplate") {
     				dispatcher.startWorkflowTemplate(mapper.readValue(jsonParams, WorkflowTemplate.class));
     			} else {
     				log.warn("Invalid method: " + method);
     				throw new AsyncMethodException("Invalid method: " + method);
+    			}
     		} catch (final Throwable e) {
     			log.warn("Error executing method: " + method, e);
     			throw new AsyncMethodException("Error executing method: " + method, e);
+    		}
+    	}
+    }

     import org.springframework.stereotype.Component;
     import eu.dnetlib.clients.is.InformationServiceClient;
     import eu.dnetlib.clients.msro.Workflow;
     import eu.dnetlib.clients.msro.WorkflowTemplate;
     import eu.dnetlib.msro.exceptions.MSROException;
     import eu.dnetlib.msro.workflows.Workflow;
     import eu.dnetlib.msro.workflows.WorkflowInstance;
     @Component
     public class WorkflowDispatcher {
-...
     	@Autowired
     	private GraphLoader graphLoader;
     	public String startRepoHiWorkflow(final String profileId, final String dsId, final String iface) throws MSROException {
     		try {
     			final Workflow wf = newWorkflowInstance(profileId);
     			wf.setDsId(dsId);
     			wf.setDsInterface(iface);
     			wf.setParent(null);
     			return executeWf(wf);
     		} catch (final Exception e) {
     			log.error("Error parsing workflow: " + profileId, e);
     			throw new MSROException("Error parsing workflow");
+    		}
     	public static final int DEFAULT_PRIORITY = 50;
     	public String startWorkflow(final Workflow wf) throws MSROException {
     		return startWorkflow(wf.getId(), wf.getParent(), wf.getDsId(), wf.getIface());
+    	}
     	public String startWorkflow(final String profileId, final String parent) throws MSROException {
     	public String startWorkflow(final String profileId, final String parent, final String dsId, final String iface) throws MSROException {
     		try {
     			final Workflow wf = newWorkflowInstance(profileId);
     			wf.setParent(parent);
     			final WorkflowInstance wf = newWorkflowInstance(profileId);
     			// override
     			if (StringUtils.isNotBlank(parent)) {
     				wf.setParent(parent);
+    			}
     			if (StringUtils.isNotBlank(dsId)) {
     				wf.setDsId(dsId);
+    			}
     			if (StringUtils.isNotBlank(iface)) {
     				wf.setDsInterface(iface);
+    			}
     			// end
     			return executeWf(wf);
     		} catch (final Exception e) {
     			log.error("Error parsing workflow: " + profileId, e);
-...
+    		}
+    	}
     	private Workflow newWorkflowInstance(final String profileId) throws Exception {
     	private WorkflowInstance newWorkflowInstance(final String profileId) throws Exception {
     		final String profile = isLookup.getProfile(profileId);
     		final Document doc = new SAXReader().read(new StringReader(profile));
-...
     			globalParams.put(p.valueOf("@name"), p.getTextTrim());
+    		}
     		final Workflow wf = new Workflow();
     		final WorkflowInstance wf = new WorkflowInstance();
     		wf.setProfileId(profileId);
     		wf.setName(doc.valueOf("//WORKFLOW_NAME"));
     		wf.setFamily(doc.valueOf("//WORKFLOW_FAMILY"));
     		wf.setPriority(NumberUtils.toInt("//WORKFLOW_PRIORITY", WorkflowsConstants.DEFAULT_WF_PRIORITY));
     		wf.setPriority(NumberUtils.toInt("//WORKFLOW_PRIORITY", DEFAULT_PRIORITY));
     		wf.setDsId(doc.valueOf("//DATASOURCE/@id"));
     		wf.setDsInterface(doc.valueOf("//DATASOURCE/@interface"));
     		wf.setTemplate(false);
-...
     		return wf;
+    	}
     	public String startWorkflowTemplate(final WorkflowTemplate wf) throws MSROException {
     		return startWorkflowTemplate(wf.getId(), wf.getParent(), wf.getName(), wf.getFamily(), wf.getDsId(), wf.getIface(), wf.getParams());
+    	}
     	public String startWorkflowTemplate(final String profileId,
     			final String parent,
     			final String name,
     			final String family,
     			final int priority,
     			final String dsId,
     			final String iface,
     			final Map<String, String> params,
     			final String parent) throws MSROException {
     			final Map<String, String> params) throws MSROException {
     		try {
     			final String profile = isLookup.getProfile(profileId);
-...
+    				}
+    			}
     			final Workflow wf = new Workflow();
     			final WorkflowInstance wf = new WorkflowInstance();
     			wf.setName(name);
     			wf.setFamily(family);
     			wf.setDsId(dsId);
     			wf.setDsInterface(iface);
     			wf.setGraph(graphLoader.loadGraph(doc, globalParams));
     			wf.setPriority(priority);
     			wf.setPriority(DEFAULT_PRIORITY);
     			wf.setProfileId(profileId);
     			wf.setTemplate(true);
     			wf.setGlobalParams(globalParams);
-...
+    		}
+    	}
     	private String executeWf(final Workflow wf) {
     	private String executeWf(final WorkflowInstance wf) {
     		final String url = searchMsroWorker(wf);
     		final String procId = assignWorkflow(url, wf);
-...
     		return procId;
+    	}
     	private String searchMsroWorker(final Workflow wf) {
     	private String searchMsroWorker(final WorkflowInstance wf) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	private String assignWorkflow(final String url, final Workflow wf) {
     	private String assignWorkflow(final String url, final WorkflowInstance wf) {
     		// TODO send message to MSRO_WORKER (blackboard ?)
     		return null;

     	// public static final String DATASOURCE_ACRONYM = WorkflowsConstants.DATASOURCE_PREFIX + "acronym";
     	// public static final String DATASOURCE_URL = WorkflowsConstants.DATASOURCE_PREFIX + "url";
     	public static final int MIN_WF_PRIORITY = 0;
     	public static final int MAX_WF_PRIORITY = 100;
     	public static final int DEFAULT_WF_PRIORITY = 50;
     	public static final int MAX_PENDING_PROCS_SIZE = 100;
     	public static final int MAX_RUNNING_PROCS_SIZE = 100;

     import eu.dnetlib.clients.is.InformationServiceClient;
     import eu.dnetlib.msro.exceptions.MSROException;
     import eu.dnetlib.msro.workflows.Workflow;
     import eu.dnetlib.msro.workflows.WorkflowInstance;
     import eu.dnetlib.msro.workflows.util.ProcessCallback;
     /**
-...
     	@Autowired
     	private InformationServiceClient isLookup;
     	public WorkflowProcess newProcess(final Workflow wf, final ProcessCallback processCallback) throws MSROException {
     	public WorkflowProcess newProcess(final WorkflowInstance wf, final ProcessCallback processCallback) throws MSROException {
     		return new WorkflowProcess(generateProcessId(),
     				wf.getName(),
     				wf.getFamily(),

     import eu.dnetlib.enabling.common.Stoppable;
     import eu.dnetlib.enabling.common.StoppableDetails;
     import eu.dnetlib.msro.exceptions.MSROException;
     import eu.dnetlib.msro.workflows.Workflow;
     import eu.dnetlib.msro.workflows.WorkflowInstance;
     import eu.dnetlib.msro.workflows.util.ProcessCallback;
     import eu.dnetlib.msro.workflows.util.WorkflowsConstants;
-...
     		}, 10, 10, TimeUnit.SECONDS);
+    	}
     	public String startWorkflow(final Workflow wf, final ProcessCallback processCallback) throws Exception {
     	public String startWorkflow(final WorkflowInstance wf, final ProcessCallback processCallback) throws Exception {
     		if (isPaused()) {
     			log.warn("Wf " + wf.getProfileId() + " not launched, because WorkflowExecutor is preparing for shutdown");

     			final MsroClient msro = serviceClientFactory.getClient(MsroClient.class);
     			msro.startWorkflowTemplate(getWfTemplateId(), process.getProfileId(), wfTemplateParams, new AsyncClientCallback() {
     			msro.startWorkflowTemplate(getWfTemplateId(), process.getProfileId(), getNodeName(), family, wfTemplateParams, new AsyncClientCallback() {
     				@Override
     				public void onGoing(final AsyncResponse res) {

     package eu.dnetlib.msro.workflows;
     import java.util.Map;
     public class Workflow {
     	private String name;
     	private String family;
     	private String parent;
     	private String dsId;
     	private String dsInterface;
     	private Graph graph;
     	private int priority;
     	private String profileId;
     	private boolean template;
     	private Map<String, String> globalParams;
     	public String getName() {
     		return name;
+    	}
     	public void setName(final String name) {
     		this.name = name;
+    	}
     	public String getFamily() {
     		return family;
+    	}
     	public void setFamily(final String family) {
     		this.family = family;
+    	}
     	public String getParent() {
     		return parent;
+    	}
     	public void setParent(final String parent) {
     		this.parent = parent;
+    	}
     	public String getDsId() {
     		return dsId;
+    	}
     	public void setDsId(final String dsId) {
     		this.dsId = dsId;
+    	}
     	public String getDsInterface() {
     		return dsInterface;
+    	}
     	public void setDsInterface(final String dsInterface) {
     		this.dsInterface = dsInterface;
+    	}
     	public Graph getGraph() {
     		return graph;
+    	}
     	public void setGraph(final Graph graph) {
     		this.graph = graph;
+    	}
     	public int getPriority() {
     		return priority;
+    	}
     	public void setPriority(final int priority) {
     		this.priority = priority;
+    	}
     	public String getProfileId() {
     		return profileId;
+    	}
     	public void setProfileId(final String profileId) {
     		this.profileId = profileId;
+    	}
     	public boolean isTemplate() {
     		return template;
+    	}
     	public void setTemplate(final boolean template) {
     		this.template = template;
+    	}
     	public Map<String, String> getGlobalParams() {
     		return globalParams;
+    	}
     	public void setGlobalParams(final Map<String, String> globalParams) {
     		this.globalParams = globalParams;
+    	}
+    }

     package eu.dnetlib.msro.workflows;
     import java.util.Map;
     public class WorkflowInstance {
     	private String name;
     	private String family;
     	private String parent;
     	private String dsId;
     	private String dsInterface;
     	private Graph graph;
     	private int priority;
     	private String profileId;
     	private boolean template;
     	private Map<String, String> globalParams;
     	public String getName() {
     		return name;
+    	}
     	public void setName(final String name) {
     		this.name = name;
+    	}
     	public String getFamily() {
     		return family;
+    	}
     	public void setFamily(final String family) {
     		this.family = family;
+    	}
     	public String getParent() {
     		return parent;
+    	}
     	public void setParent(final String parent) {
     		this.parent = parent;
+    	}
     	public String getDsId() {
     		return dsId;
+    	}
     	public void setDsId(final String dsId) {
     		this.dsId = dsId;
+    	}
     	public String getDsInterface() {
     		return dsInterface;
+    	}
     	public void setDsInterface(final String dsInterface) {
     		this.dsInterface = dsInterface;
+    	}
     	public Graph getGraph() {
     		return graph;
+    	}
     	public void setGraph(final Graph graph) {
     		this.graph = graph;
+    	}
     	public int getPriority() {
     		return priority;
+    	}
     	public void setPriority(final int priority) {
     		this.priority = priority;
+    	}
     	public String getProfileId() {
     		return profileId;
+    	}
     	public void setProfileId(final String profileId) {
     		this.profileId = profileId;
+    	}
     	public boolean isTemplate() {
     		return template;
+    	}
     	public void setTemplate(final boolean template) {
     		this.template = template;
+    	}
     	public Map<String, String> getGlobalParams() {
     		return globalParams;
+    	}
     	public void setGlobalParams(final Map<String, String> globalParams) {
     		this.globalParams = globalParams;
+    	}
+    }

     package eu.dnetlib.clients.msro;
     import java.util.HashMap;
     import java.util.Map;
     public class WorkflowDesc {
     	private String id;
     	private String parent;
     	private boolean template = false;
     	private Map<String, String> params = new HashMap<>();
     	private String family;
     	private int priority = 50;
     	private String dsId;
     	private String iface;
     	public String getId() {
     		return id;
+    	}
     	public void setId(final String id) {
     		this.id = id;
+    	}
     	public String getParent() {
     		return parent;
+    	}
     	public void setParent(final String parent) {
     		this.parent = parent;
+    	}
     	public boolean isTemplate() {
     		return template;
+    	}
     	public void setTemplate(final boolean template) {
     		this.template = template;
+    	}
     	public Map<String, String> getParams() {
     		return params;
+    	}
     	public void setParams(final Map<String, String> params) {
     		this.params = params;
+    	}
     	public String getFamily() {
     		return family;
+    	}
     	public void setFamily(final String family) {
     		this.family = family;
+    	}
     	public int getPriority() {
     		return priority;
+    	}
     	public void setPriority(final int priority) {
     		this.priority = priority;
+    	}
     	public String getDsId() {
     		return dsId;
+    	}
     	public void setDsId(final String dsId) {
     		this.dsId = dsId;
+    	}
     	public String getIface() {
     		return iface;
+    	}
     	public void setIface(final String iface) {
     		this.iface = iface;
+    	}
+    }

     	private AsyncClientUtils asyncClientUtils;
     	public void startWorkflow(final String wfId, final String parent, final AsyncClientCallback callback) {
     		final WorkflowDesc wf = new WorkflowDesc();
     		wf.setId(wfId);
     		wf.setParent(parent);
     		final Workflow wf = new Workflow(wfId, parent);
     		asyncClientUtils.invokeRemoteMethod(getBaseUrl(), "startWorkflow", wf, callback);
+    	}
     	public void startWorkflowTemplate(final String wfTemplateId, final String parent, final Map<String, String> params, final AsyncClientCallback callback) {
     		final WorkflowDesc wf = new WorkflowDesc();
     		wf.setId(wfTemplateId);
     		wf.setParent(parent);
     		wf.setTemplate(true);
     		wf.setParams(params);
     	public void startWorkflow(final String wfId, final String parent, final String dsId, final String ifaceId, final AsyncClientCallback callback) {
     		final Workflow wf = new Workflow(wfId, parent, dsId, ifaceId);
     		asyncClientUtils.invokeRemoteMethod(getBaseUrl(), "startWorkflow", wf, callback);
+    	}
     	public void startWorkflowTemplate(final String wfTemplateId,
     			final String parent,
     			final String name,
     			final String family,
     			final Map<String, String> params,
     			final AsyncClientCallback callback) {
     		final WorkflowTemplate wf = new WorkflowTemplate(wfTemplateId, parent, name, family, params);
     		asyncClientUtils.invokeRemoteMethod(getBaseUrl(), "startWorkflow", wf, callback);
+    	}
     	public void startWorkflowTemplate(final String wfTemplateId,
     			final String parent,
     			final String name,
     			final String family,
     			final Map<String, String> params,
     			final String dsId,
     			final String ifaceId,
     			final AsyncClientCallback callback) {
     		final WorkflowTemplate wf = new WorkflowTemplate(wfTemplateId, parent, name, family, dsId, ifaceId, params);
     		asyncClientUtils.invokeRemoteMethod(getBaseUrl(), "startWorkflow", wf, callback);
+    	}
+    }

     package eu.dnetlib.clients.msro;
     import java.util.HashMap;
     import java.util.Map;
     public class WorkflowTemplate extends Workflow {
     	private String name;
     	private String family;
     	private Map<String, String> params = new HashMap<>();
     	public WorkflowTemplate() {}
     	public WorkflowTemplate(final String id, final String parent, final String name, final String family, final Map<String, String> params) {
     		super(id, parent);
     		this.name = name;
     		this.family = family;
     		this.params = params;
+    	}
     	public WorkflowTemplate(final String id, final String parent, final String name, final String family, final String dsId,
     			final String iface, final Map<String, String> params) {
     		super(id, parent, dsId, iface);
     		this.name = name;
     		this.family = family;
     		this.params = params;
+    	}
     	public String getName() {
     		return name;
+    	}
     	public void setName(final String name) {
     		this.name = name;
+    	}
     	public String getFamily() {
     		return family;
+    	}
     	public void setFamily(final String family) {
     		this.family = family;
+    	}
     	public Map<String, String> getParams() {
     		return params;
+    	}
     	public void setParams(final Map<String, String> params) {
     		this.params = params;
+    	}
+    }

     package eu.dnetlib.clients.msro;
     public class Workflow {
     	private String id;
     	private String parent;
     	private String dsId;
     	private String iface;
     	public Workflow() {}
     	public Workflow(final String id, final String parent) {
     		this.id = id;
     		this.parent = parent;
+    	}
     	public Workflow(final String id, final String parent, final String dsId, final String iface) {
     		this.id = id;
     		this.parent = parent;
     		this.dsId = dsId;
     		this.iface = iface;
+    	}
     	public String getId() {
     		return id;
+    	}
     	public void setId(final String id) {
     		this.id = id;
+    	}
     	public String getParent() {
     		return parent;
+    	}
     	public void setParent(final String parent) {
     		this.parent = parent;
+    	}
     	public String getDsId() {
     		return dsId;
+    	}
     	public void setDsId(final String dsId) {
     		this.dsId = dsId;
+    	}
     	public String getIface() {
     		return iface;
+    	}
     	public void setIface(final String iface) {
     		this.iface = iface;
+    	}
+    }

     import eu.dnetlib.enabling.annotations.DnetServiceType;
     import eu.dnetlib.exceptions.DnetGenericException;
     import eu.dnetlib.services.async.AsyncClientUtils;
     import eu.dnetlib.services.async.AsyncMethodNotFoundException;
     import eu.dnetlib.services.async.AsyncMethodException;
     import eu.dnetlib.services.async.AsyncResponse;
     import eu.dnetlib.services.async.HasAsyncMethods;
     import eu.dnetlib.services.async.ResponseAck;
-...
     				((HasAsyncMethods) this).processMethod(method, jsonParams, res -> restTemplate.postForObject(url, res, ResponseAckStatus.class));
     				return id;
     			} catch (final AsyncMethodNotFoundException e) {
     				log.error("Async method " + method + " not found");
     			} catch (final AsyncMethodException e) {
     				log.error("Invocation of async method failed", e);
     				throw e;
+    			}

     package eu.dnetlib.services.async;
     import eu.dnetlib.exceptions.DnetGenericException;
     public class AsyncMethodNotFoundException extends DnetGenericException {
     	/**
+    	 *
     	 */
     	private static final long serialVersionUID = 4505152782783864469L;
     	public AsyncMethodNotFoundException() {
     		super();
+    	}
     	public AsyncMethodNotFoundException(final String message, final Throwable cause) {
     		super(message, cause);
+    	}
     	public AsyncMethodNotFoundException(final String message) {
     		super(message);
+    	}
     	public AsyncMethodNotFoundException(final Throwable cause) {
     		super(cause);
+    	}
+    }

     package eu.dnetlib.services.async;
     import eu.dnetlib.exceptions.DnetGenericException;
     public class AsyncMethodException extends DnetGenericException {
     	/**
+    	 *
     	 */
     	private static final long serialVersionUID = 4505152782783864469L;
     	public AsyncMethodException() {
     		super();
+    	}
     	public AsyncMethodException(final String message, final Throwable cause) {
     		super(message, cause);
+    	}
     	public AsyncMethodException(final String message) {
     		super(message);
+    	}
     	public AsyncMethodException(final Throwable cause) {
     		super(cause);
+    	}
+    }

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		void processMethod(String method, String jsonParams, AsyncServerCallback callback) throws AsyncMethodNotFoundException;
	5	void processMethod(String method, String jsonParams, AsyncServerCallback callback) throws AsyncMethodException;
6	6
7	7	}

Project

General

Profile

D-Net

Revision 46450

Added by Michele Artini over 7 years ago