OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed IndexOutOfBoundsException in ScriptModuleTypeProvider (#1730) 

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
pull/1737/head
Christoph Weitkamp 2020-10-19 13:41:58 +02:00 committed by GitHub
parent b2c045d0fe
commit 7d70a97b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/ScriptEngineManagerImpl.java
View File

@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory;
public class ScriptEngineManagerImpl implements ScriptEngineManager {
private final Logger logger = LoggerFactory.getLogger(ScriptEngineManagerImpl.class);
private final Map<String, ScriptEngineContainer> loadedScriptEngineInstances = new HashMap<>();
private final Map<String, ScriptEngineFactory> customSupport = new HashMap<>();
private final Map<String, ScriptEngineFactory> genericSupport = new HashMap<>();
private final Map<String, @Nullable ScriptEngineContainer> loadedScriptEngineInstances = new HashMap<>();
private final Map<String, @Nullable ScriptEngineFactory> customSupport = new HashMap<>();
private final Map<String, @Nullable ScriptEngineFactory> genericSupport = new HashMap<>();
private final ScriptExtensionManager scriptExtensionManager;
@Activate
@ -57,7 +57,6 @@ public class ScriptEngineManagerImpl implements ScriptEngineManager {
@Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
public void addScriptEngineFactory(ScriptEngineFactory engineFactory) {
List<String> scriptTypes = engineFactory.getScriptTypes();
logger.trace("{}.getScriptTypes(): {}", engineFactory.getClass().getSimpleName(), scriptTypes);
for (String scriptType : scriptTypes) {
if (isCustomFactory(engineFactory)) {
@ -66,26 +65,27 @@ public class ScriptEngineManagerImpl implements ScriptEngineManager {
this.genericSupport.put(scriptType, engineFactory);
}
}
if (!engineFactory.getScriptTypes().isEmpty()) {
ScriptEngine scriptEngine = engineFactory.createScriptEngine(engineFactory.getScriptTypes().get(0));
if (scriptEngine != null) {
javax.script.ScriptEngineFactory factory = scriptEngine.getFactory();
logger.debug(
"Initialized a {} ScriptEngineFactory for {} ({}): supports {} ({}) with file extensions {}, names {}, and mimetypes {}",
(isCustomFactory(engineFactory)) ? "custom" : "generic", factory.getEngineName(),
factory.getEngineVersion(), factory.getLanguageName(), factory.getLanguageVersion(),
factory.getExtensions(), factory.getNames(), factory.getMimeTypes());
if (logger.isDebugEnabled()) {
if (!scriptTypes.isEmpty()) {
ScriptEngine scriptEngine = engineFactory.createScriptEngine(scriptTypes.get(0));
if (scriptEngine != null) {
javax.script.ScriptEngineFactory factory = scriptEngine.getFactory();
logger.debug(
"Initialized a {} ScriptEngineFactory for {} ({}): supports {} ({}) with file extensions {}, names {}, and mimetypes {}",
(isCustomFactory(engineFactory)) ? "custom" : "generic", factory.getEngineName(),
factory.getEngineVersion(), factory.getLanguageName(), factory.getLanguageVersion(),
factory.getExtensions(), factory.getNames(), factory.getMimeTypes());
} else {
logger.trace("addScriptEngineFactory: engine was null");
}
} else {
logger.trace("addScriptEngineFactory: engine was null");
logger.trace("addScriptEngineFactory: scriptTypes was empty");
}
} else {
logger.trace("addScriptEngineFactory: scriptTypes was empty");
}
}
public void removeScriptEngineFactory(ScriptEngineFactory engineFactory) {
List<String> scriptTypes = engineFactory.getScriptTypes();
logger.trace("{}.getScriptTypes(): {}", engineFactory.getClass().getSimpleName(), scriptTypes);
for (String scriptType : scriptTypes) {
if (isCustomFactory(engineFactory)) {
@ -150,7 +150,6 @@ public class ScriptEngineManagerImpl implements ScriptEngineManager {
ScriptEngine engine = container.getScriptEngine();
try {
engine.eval(scriptData);
if (engine instanceof Invocable) {
Invocable inv = (Invocable) engine;
try {

42
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java
View File

@ -18,8 +18,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.script.ScriptEngine;
@ -77,7 +75,6 @@ public class ScriptModuleTypeProvider implements ModuleTypeProvider {
return null;
} else {
List<Output> outputs = new ArrayList<>();
Output result = new Output("result", "java.lang.Object", "result", "the script result", null, null, null);
outputs.add(result);
return new ActionType(ScriptActionHandler.TYPE_ID, getConfigDescriptions(locale), "execute a given script",
@ -113,13 +110,12 @@ public class ScriptModuleTypeProvider implements ModuleTypeProvider {
final ConfigDescriptionParameter script = ConfigDescriptionParameterBuilder.create("script", Type.TEXT)
.withRequired(true).withReadOnly(false).withMultiple(false).withLabel("Script").withContext("script")
.withDescription("the script to execute").build();
return Stream.of(scriptType, script).collect(Collectors.toList());
return List.of(scriptType, script);
}
@Override
public Collection<ModuleType> getModuleTypes(@Nullable Locale locale) {
return (Collection<ModuleType>) Stream.of(getScriptActionType(locale), getScriptConditionType(locale))
.collect(Collectors.toList());
return (Collection<ModuleType>) List.of(getScriptActionType(locale), getScriptConditionType(locale));
}
@Override
@ -143,24 +139,34 @@ public class ScriptModuleTypeProvider implements ModuleTypeProvider {
*/
@Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
public void setScriptEngineFactory(ScriptEngineFactory engineFactory) {
ScriptEngine scriptEngine = engineFactory.createScriptEngine(engineFactory.getScriptTypes().get(0));
if (scriptEngine != null) {
javax.script.ScriptEngineFactory factory = scriptEngine.getFactory();
parameterOptions.put(getPreferredMimeType(factory), getLanguageName(factory));
logger.trace("ParameterOptions: {}", parameterOptions);
List<String> scriptTypes = engineFactory.getScriptTypes();
if (!scriptTypes.isEmpty()) {
ScriptEngine scriptEngine = engineFactory.createScriptEngine(scriptTypes.get(0));
if (scriptEngine != null) {
javax.script.ScriptEngineFactory factory = scriptEngine.getFactory();
parameterOptions.put(getPreferredMimeType(factory), getLanguageName(factory));
logger.trace("ParameterOptions: {}", parameterOptions);
} else {
logger.trace("setScriptEngineFactory: engine was null");
}
} else {
logger.trace("setScriptEngineFactory: engine was null");
logger.trace("addScriptEngineFactory: scriptTypes was empty");
}
}
public void unsetScriptEngineFactory(ScriptEngineFactory engineFactory) {
ScriptEngine scriptEngine = engineFactory.createScriptEngine(engineFactory.getScriptTypes().get(0));
if (scriptEngine != null) {
javax.script.ScriptEngineFactory factory = scriptEngine.getFactory();
parameterOptions.remove(getPreferredMimeType(factory));
logger.trace("ParameterOptions: {}", parameterOptions);
List<String> scriptTypes = engineFactory.getScriptTypes();
if (!scriptTypes.isEmpty()) {
ScriptEngine scriptEngine = engineFactory.createScriptEngine(scriptTypes.get(0));
if (scriptEngine != null) {
javax.script.ScriptEngineFactory factory = scriptEngine.getFactory();
parameterOptions.remove(getPreferredMimeType(factory));
logger.trace("ParameterOptions: {}", parameterOptions);
} else {
logger.trace("unsetScriptEngineFactory: engine was null");
}
} else {
logger.trace("unsetScriptEngineFactory: engine was null");
logger.trace("unsetScriptEngineFactory: scriptTypes was empty");
}
}

8
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ActionType.java
View File

@ -16,6 +16,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.automation.Action;
import org.openhab.core.automation.Module;
@ -32,6 +33,7 @@ import org.openhab.core.config.core.ConfigDescriptionParameter;
* @author Ana Dimova - Initial contribution
* @author Vasil Ilchev - Initial contribution
*/
@NonNullByDefault
public class ActionType extends ModuleType {
/**
@ -57,7 +59,7 @@ public class ActionType extends ModuleType {
* {@link Action} instances.
*/
public ActionType(@Nullable String UID, @Nullable List<ConfigDescriptionParameter> configDescriptions,
List<Input> inputs) {
@Nullable List<Input> inputs) {
this(UID, configDescriptions, inputs, null);
}
@ -101,8 +103,8 @@ public class ActionType extends ModuleType {
@Nullable String label, @Nullable String description, @Nullable Set<String> tags,
@Nullable Visibility visibility, @Nullable List<Input> inputs, @Nullable List<Output> outputs) {
super(UID, configDescriptions, label, description, tags, visibility);
this.inputs = inputs != null ? Collections.unmodifiableList(inputs) : Collections.emptyList();
this.outputs = outputs != null ? Collections.unmodifiableList(outputs) : Collections.emptyList();
this.inputs = inputs != null ? Collections.unmodifiableList(inputs) : List.of();
this.outputs = outputs != null ? Collections.unmodifiableList(outputs) : List.of();
}
/**

7
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ConditionType.java
View File

@ -16,6 +16,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.automation.Condition;
import org.openhab.core.automation.Visibility;
@ -31,6 +32,7 @@ import org.openhab.core.config.core.ConfigDescriptionParameter;
* @author Ana Dimova - Initial contribution
* @author Vasil Ilchev - Initial contribution
*/
@NonNullByDefault
public class ConditionType extends ModuleType {
private final List<Input> inputs;
@ -47,8 +49,7 @@ public class ConditionType extends ModuleType {
*/
public ConditionType(@Nullable String UID, @Nullable List<ConfigDescriptionParameter> configDescriptions,
@Nullable List<Input> inputs) {
super(UID, configDescriptions);
this.inputs = inputs != null ? Collections.unmodifiableList(inputs) : Collections.emptyList();
this(UID, configDescriptions, null, null, null, null, inputs);
}
/**
@ -72,7 +73,7 @@ public class ConditionType extends ModuleType {
@Nullable String label, @Nullable String description, @Nullable Set<String> tags,
@Nullable Visibility visibility, @Nullable List<Input> inputs) {
super(UID, configDescriptions, label, description, tags, visibility);
this.inputs = inputs != null ? Collections.unmodifiableList(inputs) : Collections.emptyList();
this.inputs = inputs != null ? Collections.unmodifiableList(inputs) : List.of();
}
/**