D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

This commit is contained in:
Michele Artini 2023-04-05 10:22:09 +02:00
parent 94a78beb16
commit b2881c6b53
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dnet-is-application/src/main/java/eu/dnetlib/data/mapping/MappingAjaxController.java
View File

@ -32,6 +32,7 @@ public class MappingAjaxController {
final String xmlOut = cleanerFactory.obtainCleaningRule(rule).transform(xmlIn); final String xmlOut = cleanerFactory.obtainCleaningRule(rule).transform(xmlIn);
res.setCharacterEncoding(StandardCharsets.UTF_8.name()); res.setCharacterEncoding(StandardCharsets.UTF_8.name());
res.setContentType(MediaType.APPLICATION_XML_VALUE); res.setContentType(MediaType.APPLICATION_XML_VALUE);
if (StringUtils.isNotBlank(xmlOut)) { if (StringUtils.isNotBlank(xmlOut)) {

4
libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowTemplate.java
View File

@ -207,9 +207,13 @@ public class WorkflowTemplate implements Serializable {
public Map<String, Object> calculateInitialParams(final Map<String, String> globalParams, final Environment environment) { public Map<String, Object> calculateInitialParams(final Map<String, String> globalParams, final Environment environment) {
final Map<String, Object> map = new HashMap<>(); final Map<String, Object> map = new HashMap<>();
System.out.println("****** " + input.size());
input.forEach(System.out::println);
input.stream() input.stream()
.filter(p -> StringUtils.isBlank(p.getEnv())) .filter(p -> StringUtils.isBlank(p.getEnv()))
.forEach(p -> map.put(p.getName(), calculateSimpleValue(p, globalParams, environment))); .forEach(p -> map.put(p.getName(), calculateSimpleValue(p, globalParams, environment)));
System.out.println("******");
return map; return map;
} }

3
libs/dnet-is-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java
View File

@ -31,7 +31,6 @@ class WorkflowTemplateTest {
private Node n3; private Node n3;
private NodeParam np1; private NodeParam np1;
private NodeParam np2;
private Arc a12; private Arc a12;
private Arc a13; private Arc a13;
@ -58,7 +57,7 @@ class WorkflowTemplateTest {
n2 = new Node("N2", "T2"); n2 = new Node("N2", "T2");
n2.setArcs(Arrays.asList(a23)); n2.setArcs(Arrays.asList(a23));
n2.setInput(Arrays.asList(np1, np2)); n2.setInput(Arrays.asList(np1));
n3 = new Node("N3"); n3 = new Node("N3");
n2.setArcs(Arrays.asList(a3succ)); n2.setArcs(Arrays.asList(a3succ));