michele.artini
/
dnet-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed repo-bye

This commit is contained in:
Michele Artini 2024-01-05 12:09:46 +01:00
parent 24b2160082
commit 36935e197f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnet-app/apps/dnet-wf-manager/src/main/resources/wf_templates/simple_repo_bye.json
View File

@ -87,7 +87,7 @@
},
{
"name":"DELETE_WF_CONF",
"type":"registerWfConfiguration",
"type":"deleteWfConfiguration",
"join": true,
"input":[
{

3
dnet-app/libs/dnet-wf-common/src/main/java/eu/dnetlib/wfs/utils/WfConfigurationUtils.java
View File

@ -48,6 +48,9 @@ public class WfConfigurationUtils {
if (conf.getSystemParams() != null) {
all.putAll(conf.getUserParams());
}
if (StringUtils.isNotBlank(conf.getId())) {
all.put("wfConfId", conf.getId());
}
if (StringUtils.isNotBlank(conf.getDsId())) {
all.put("dsId", conf.getDsId());
}

7
dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/nodes/conf/DeleteWfConfigurationNode.java
View File

@ -2,11 +2,10 @@ package eu.dnetlib.wfs.nodes.conf;
import org.springframework.beans.factory.annotation.Autowired;
import eu.dnetlib.common.clients.DnetServiceClientFactory;
import eu.dnetlib.common.clients.SimpleResourceClient;
import eu.dnetlib.wfs.annotations.WfInputParam;
import eu.dnetlib.wfs.annotations.WfNode;
import eu.dnetlib.wfs.nodes.AbstractJobNode;
import eu.dnetlib.wfs.repository.WfConfigurationRepository;
@WfNode("deleteWfConfiguration")
public class DeleteWfConfigurationNode extends AbstractJobNode {
@ -15,11 +14,11 @@ public class DeleteWfConfigurationNode extends AbstractJobNode {
private String wfConfId;
@Autowired
private DnetServiceClientFactory clientFactory;
private WfConfigurationRepository wfConfigurationRepository;
@Override
protected void execute() throws Exception {
clientFactory.getClient(SimpleResourceClient.class).deleteResource(wfConfId);
wfConfigurationRepository.deleteById(wfConfId);
}
}