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

fixed repo-hi parameters

This commit is contained in:
Michele Artini 2023-12-11 11:51:40 +01:00
parent e462cf804e
commit 6423669b86
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dnet-app/libs/dnet-app-common/src/main/java/eu/dnetlib/common/clients/DnetServiceClient.java
View File

@ -2,6 +2,8 @@ package eu.dnetlib.common.clients;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@ -11,10 +13,13 @@ import org.springframework.web.client.RestTemplate;
public class DnetServiceClient {
private static final Log log = LogFactory.getLog(DnetServiceClient.class);
private String baseUrl;
private DnetServiceClientFactory factory;
protected final <T> T httpGet(final String path, final Class<T> clazz) {
log.debug("CALLING URL (METHOD GET): " + baseUrl + path);
return new RestTemplate().getForObject(baseUrl + path, clazz);
}

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

@ -45,6 +45,22 @@ public class WfConfigurationUtils {
if (conf.getSystemParams() != null) {
all.putAll(conf.getUserParams());
}
if (StringUtils.isNotBlank(conf.getDsId())) {
all.put("dsId", conf.getDsId());
}
if (StringUtils.isNotBlank(conf.getDsName())) {
all.put("dsName", conf.getDsName());
}
if (StringUtils.isNotBlank(conf.getApiId())) {
all.put("apiId", conf.getApiId());
}
if (log.isDebugEnabled()) {
log.debug("** CONFIGURED INPUT WF PARAMETERS **");
all.forEach((k, v) -> log.debug("* " + k + ": " + v));
log.debug("************************************");
}
return all;
}

3
dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java
View File

@ -50,9 +50,6 @@ public class ProcessEngine {
process.setStatus(JobStatus.running);
process.setStartDate(now);
process.setLastActivityDate(now);
process.getEnv().setAttribute("dsId", process.getDsId());
process.getEnv().setAttribute("dsName", process.getDsName());
process.getEnv().setAttribute("apiId", process.getDsInterface());
try {
for (final GraphNode graphNode : process.getGraph().startNodes()) {