demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[jrubyscripting] Remove Compilable implementation (#17960)

Browse Source 
due to a bug in JRuby https://github.com/jruby/jruby/issues/8346

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2024-12-24 00:48:46 +10:00 committed by GitHub
parent 5eb47a042f
commit d253e2cd2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.automation.jrubyscripting/src/main/java/org/openhab/automation/jrubyscripting/internal/JRubyEngineWrapper.java
View File

@ -16,8 +16,6 @@ import java.io.Reader;
import java.util.Objects; import java.util.Objects;
import javax.script.Bindings; import javax.script.Bindings;
import javax.script.Compilable;
import javax.script.CompiledScript;
import javax.script.Invocable; import javax.script.Invocable;
import javax.script.ScriptContext; import javax.script.ScriptContext;
import javax.script.ScriptEngine; import javax.script.ScriptEngine;
@ -37,7 +35,9 @@ import org.jruby.embed.jsr223.JRubyEngine;
* @author Jimmy Tanagra - Initial contribution * @author Jimmy Tanagra - Initial contribution
*/ */
@NonNullByDefault @NonNullByDefault
public class JRubyEngineWrapper implements Compilable, Invocable, ScriptEngine { public class JRubyEngineWrapper implements Invocable, ScriptEngine {
// Don't implement Compilable because there is a bug
// in JRuby's compiled scripts: https://github.com/jruby/jruby/issues/8346
private final JRubyEngine engine; private final JRubyEngine engine;
@ -48,16 +48,6 @@ public class JRubyEngineWrapper implements Compilable, Invocable, ScriptEngine {
this.engine = Objects.requireNonNull(engine); this.engine = Objects.requireNonNull(engine);
} }
@Override
public CompiledScript compile(@Nullable String script) throws ScriptException {
return new JRubyCompiledScriptWrapper(engine.compile(script));
}
@Override
public CompiledScript compile(@Nullable Reader reader) throws ScriptException {
return new JRubyCompiledScriptWrapper(engine.compile(reader));
}
@Override @Override
public Object eval(@Nullable String script, @Nullable ScriptContext context) throws ScriptException { public Object eval(@Nullable String script, @Nullable ScriptContext context) throws ScriptException {
Object ctx = Objects.requireNonNull(context).getBindings(ScriptContext.ENGINE_SCOPE).get(CONTEXT_VAR_NAME); Object ctx = Objects.requireNonNull(context).getBindings(ScriptContext.ENGINE_SCOPE).get(CONTEXT_VAR_NAME);