fixed some NPE
This commit is contained in:
parent
d0c7ed9000
commit
e9e843e7f7
|
@ -2,6 +2,7 @@ package eu.dnetlib.domain.wfs;
|
|||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
@ -223,9 +224,15 @@ public class WfTemplate implements Serializable {
|
|||
}
|
||||
|
||||
public Map<String, String> calculateInitialParams(final Map<String, String> globalParams, final Environment environment) {
|
||||
return input.stream()
|
||||
.filter(p -> StringUtils.isBlank(p.getEnv()))
|
||||
.collect(Collectors.toMap(NodeInputParam::getName, p -> calculateSimpleValue(p, globalParams, environment)));
|
||||
|
||||
final Map<String, String> map = new HashMap<>();
|
||||
for (final NodeInputParam p : input) {
|
||||
if (StringUtils.isBlank(p.getEnv())) {
|
||||
map.put(p.getName(), calculateSimpleValue(p, globalParams, environment));
|
||||
}
|
||||
}
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
private String calculateSimpleValue(final NodeInputParam p, final Map<String, String> globalParams, final Environment environment) {
|
||||
|
|
|
@ -60,7 +60,9 @@ public abstract class ProcessNode implements BeanNameAware {
|
|||
try {
|
||||
field.setAccessible(true);
|
||||
final Class<?> fieldClass = field.getType();
|
||||
if (value.getClass().isAssignableFrom(fieldClass)) {
|
||||
if (value == null) {
|
||||
field.set(this, null);
|
||||
} else if (value.getClass().isAssignableFrom(fieldClass)) {
|
||||
field.set(this, value);
|
||||
} else if (String.class.isAssignableFrom(fieldClass)) {
|
||||
field.set(this, value.toString());
|
||||
|
|
|
@ -9,7 +9,7 @@ services:
|
|||
- frontend
|
||||
environment:
|
||||
- DNET_IS_URL=http://is-manager:${SPRING_BOOT_PORT}
|
||||
- LOGGING_LEVEL_EU_DNETLIB=DEBUG
|
||||
- LOGGING_LEVEL_EU_DNETLIB=INFO
|
||||
profiles:
|
||||
- base
|
||||
|
||||
|
|
Loading…
Reference in New Issue