Address review

Signed-off-by: Florian Hotze <[email protected]>

Author: florian-h05

bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/ScriptEngineFactory.java

@@ -58,15 +58,6 @@ public interface ScriptEngineFactory {
      */
     List<String> getScriptTypes();
 
-    /**
-     * This method returns whether the ScriptEngine supports pre-compilation of scripts.
-     *
-     * @return true if pre-compilation is supported, else false
-     */
-    default boolean supportsPreCompilation() {
-        return false;
-    }
-
     /**
      * This method "scopes" new values into the given ScriptEngine.
      *

bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/ScriptEngineManager.java

@@ -61,14 +61,6 @@ public interface ScriptEngineManager {
      */
     boolean isSupported(String scriptType);
 
-    /**
-     * Checks if the supplied file extension or MimeType supports pre-compilation.
-     *
-     * @param scriptType a file extension (script) or MimeType (ScriptAction or ScriptCondition)
-     * @return true, if pre-compilation supported, else false
-     */
-    boolean isPreCompilationSupported(String scriptType);
-
     /**
      * Add a listener that is notified when a ScriptEngineFactory is added or removed
      *

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

@@ -251,15 +251,6 @@ public boolean isSupported(String scriptType) {
         return findEngineFactory(scriptType) != null;
     }
 
-    @Override
-    public boolean isPreCompilationSupported(String scriptType) {
-        ScriptEngineFactory engineFactory = findEngineFactory(scriptType);
-        if (engineFactory != null) {
-            return engineFactory.supportsPreCompilation();
-        }
-        return false;
-    }
-
     private void addAttributeToScriptContext(ScriptEngine engine, String name, Object value) {
         ScriptContext scriptContext = engine.getContext();
 

bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java

@@ -87,13 +87,9 @@ private static String getValidConfigParameter(String parameter, Configuration co
     }
 
     /**
-     * Compiles the script if the script engine supports pre-compilation.
+     * Creates the {@link ScriptEngine} and compiles the script if the {@link ScriptEngine} implements {@link Compilable}.
      */
-    protected void compileScriptIfSupported() throws ScriptException {
-        if (!scriptEngineManager.isPreCompilationSupported(type)) {
-            return;
-        }
-
+    protected void compileScript() throws ScriptException {
         if (compiledScript.isPresent()) {
             return;
         }

bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/ScriptActionHandler.java

@@ -64,7 +64,7 @@ public void dispose() {
 
     @Override
     public void compile() throws ScriptException {
-        super.compileScriptIfSupported();
+        super.compileScript();
     }
 
     @Override

bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/ScriptConditionHandler.java

@@ -45,7 +45,7 @@ public ScriptConditionHandler(Condition module, String ruleUID, ScriptEngineMana
 
     @Override
     public void compile() throws ScriptException {
-        super.compileScriptIfSupported();
+        super.compileScript();
     }
 
     @Override