|
|
@@ -2,7 +2,6 @@ package org.cobbzilla.wizard.client.script; |
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnore; |
|
|
|
import com.github.jknack.handlebars.Handlebars; |
|
|
|
import jdk.nashorn.api.scripting.ScriptObjectMirror; |
|
|
|
import lombok.Getter; |
|
|
|
import lombok.Setter; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
@@ -80,17 +79,6 @@ public class ApiInnerScript { |
|
|
|
resolved.addAll(Arrays.asList((Object[]) var)); |
|
|
|
} else if (var instanceof Collection) { |
|
|
|
resolved.addAll((Collection<?>) var); |
|
|
|
} else if (var instanceof ScriptObjectMirror && ((ScriptObjectMirror) var).isArray()) { |
|
|
|
final Object[] objects = ((ScriptObjectMirror) var).to(Object[].class); |
|
|
|
if (objects.length == 0) { |
|
|
|
log.warn("applyIterations: var "+entry.getValue()+" was an empty array"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if (objects[0] instanceof ScriptObjectMirror) { |
|
|
|
resolved.addAll(Arrays.asList(((ScriptObjectMirror) var).to(Map[].class))); |
|
|
|
} else { |
|
|
|
resolved.addAll(Arrays.asList(objects)); |
|
|
|
} |
|
|
|
} else { |
|
|
|
resolved.add(var); |
|
|
|
} |
|
|
|