From b2881c6b53892f4738cfd2fb0b2c7375c8483547 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 5 Apr 2023 10:22:09 +0200 Subject: [PATCH] test --- .../java/eu/dnetlib/data/mapping/MappingAjaxController.java | 1 + .../java/eu/dnetlib/manager/wf/model/WorkflowTemplate.java | 4 ++++ .../eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mapping/MappingAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mapping/MappingAjaxController.java index ba139131..8075ce63 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mapping/MappingAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mapping/MappingAjaxController.java @@ -32,6 +32,7 @@ public class MappingAjaxController { final String xmlOut = cleanerFactory.obtainCleaningRule(rule).transform(xmlIn); res.setCharacterEncoding(StandardCharsets.UTF_8.name()); + res.setContentType(MediaType.APPLICATION_XML_VALUE); if (StringUtils.isNotBlank(xmlOut)) { diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowTemplate.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowTemplate.java index e7611d34..2da4404c 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowTemplate.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowTemplate.java @@ -207,9 +207,13 @@ public class WorkflowTemplate implements Serializable { public Map calculateInitialParams(final Map globalParams, final Environment environment) { final Map map = new HashMap<>(); + System.out.println("****** " + input.size()); + input.forEach(System.out::println); + input.stream() .filter(p -> StringUtils.isBlank(p.getEnv())) .forEach(p -> map.put(p.getName(), calculateSimpleValue(p, globalParams, environment))); + System.out.println("******"); return map; } diff --git a/libs/dnet-is-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java b/libs/dnet-is-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java index 92bff063..1a3e9229 100644 --- a/libs/dnet-is-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java +++ b/libs/dnet-is-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java @@ -31,7 +31,6 @@ class WorkflowTemplateTest { private Node n3; private NodeParam np1; - private NodeParam np2; private Arc a12; private Arc a13; @@ -58,7 +57,7 @@ class WorkflowTemplateTest { n2 = new Node("N2", "T2"); n2.setArcs(Arrays.asList(a23)); - n2.setInput(Arrays.asList(np1, np2)); + n2.setInput(Arrays.asList(np1)); n3 = new Node("N3"); n2.setArcs(Arrays.asList(a3succ));