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

Allow inline scripts in SCRIPT transformation (#3249) 

Signed-off-by: Jan N. Klug <github@klug.nrw>
pull/3450/head
J-N-K 2023-03-12 12:00:06 +01:00 committed by GitHub
parent a5d65ce2ad
commit 95e04fccbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/ScriptTransformationService.java
View File

@ -96,13 +96,20 @@ public class ScriptTransformationService implements TransformationService, Regis
scriptRecord.lock.lock();
try {
if (scriptRecord.script.isBlank()) {
Transformation transformation = transformationRegistry.get(scriptUid);
if (transformation != null) {
if (!SUPPORTED_CONFIGURATION_TYPE.equals(transformation.getType())) {
throw new TransformationException("Configuration does not have correct type 'script' but '"
+ transformation.getType() + "'.");
if (scriptUid.startsWith("|")) {
// inline script -> strip inline-identifier
scriptRecord.script = scriptUid.substring(1);
} else {
// get script from transformation registry
Transformation transformation = transformationRegistry.get(scriptUid);
if (transformation != null) {
if (!SUPPORTED_CONFIGURATION_TYPE.equals(transformation.getType())) {
throw new TransformationException("Configuration does not have correct type 'script' but '"
+ transformation.getType() + "'.");
}
scriptRecord.script = transformation.getConfiguration().getOrDefault(Transformation.FUNCTION,
"");
}
scriptRecord.script = transformation.getConfiguration().getOrDefault(Transformation.FUNCTION, "");
}
if (scriptRecord.script.isBlank()) {
throw new TransformationException("Could not get script for UID '" + scriptUid + "'.");

9
bundles/org.openhab.core.automation.module.script/src/test/java/org/openhab/core/automation/module/script/ScriptTransformationServiceTest.java
View File

@ -51,6 +51,8 @@ public class ScriptTransformationServiceTest {
private static final String SCRIPT_UID = "scriptUid";
private static final String INVALID_SCRIPT_UID = "invalidScriptUid";
private static final String INLINE_SCRIPT = "|inlineScript";
private static final String SCRIPT = "script";
private static final String SCRIPT_OUTPUT = "output";
@ -176,4 +178,11 @@ public class ScriptTransformationServiceTest {
assertThat(e.getMessage(), is("Configuration does not have correct type 'script' but 'invalid'."));
}
@Test
public void inlineScriptProperlyProcessed() throws TransformationException, ScriptException {
service.transform(SCRIPT_LANGUAGE + ":" + INLINE_SCRIPT, "input");
verify(scriptEngine).eval(INLINE_SCRIPT.substring(1));
}
}