refactoring

Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · Jan 2, 2023 · a625a3b · a625a3b
1 parent af8a0b1
commit a625a3b
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/.../src/main/java/org/openhab/core/automation/module/script/ScriptTransformationService.java b/.../src/main/java/org/openhab/core/automation/module/script/ScriptTransformationService.java
@@ -38,9 +38,9 @@
 import org.openhab.core.automation.module.script.profile.ScriptProfile;
 import org.openhab.core.common.ThreadPoolManager;
 import org.openhab.core.common.registry.RegistryChangeListener;
-import org.openhab.core.transform.Transformation;
 import org.openhab.core.config.core.ConfigOptionProvider;
 import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.transform.Transformation;
 import org.openhab.core.transform.TransformationException;
 import org.openhab.core.transform.TransformationRegistry;
 import org.openhab.core.transform.TransformationService;
@@ -148,10 +148,10 @@ public void deactivate() {
             try {
                 CompiledScript compiledScript = scriptRecord.compiledScript;
 
-                if (compiledScript == null && scriptEngineContainer.getScriptEngine() instanceof Compilable) {
+                if (compiledScript == null
+                        && scriptEngineContainer.getScriptEngine()instanceof Compilable scriptCompiler) {
                     // no compiled script available but compiling is supported
-                    compiledScript = ((Compilable) scriptEngineContainer.getScriptEngine())
-                            .compile(scriptRecord.script);
+                    compiledScript = scriptCompiler.compile(scriptRecord.script);
                     scriptRecord.compiledScript = compiledScript;
                 }
 
@@ -218,14 +218,13 @@ private void disposeScriptRecord(ScriptRecord scriptRecord) {
     }
 
     private void disposeScriptEngine(ScriptEngine scriptEngine) {
-        if (scriptEngine instanceof AutoCloseable) {
+        if (scriptEngine instanceof AutoCloseable closableScriptEngine) {
             // we cannot not use ScheduledExecutorService.execute here as it might execute the task in the calling
             // thread (calling ScriptEngine.close in the same thread may result in a deadlock if the ScriptEngine
             // tries to Thread.join)
             scheduler.schedule(() -> {
-                AutoCloseable closeable = (AutoCloseable) scriptEngine;
                 try {
-                    closeable.close();
+                    closableScriptEngine.close();
                 } catch (Exception e) {
                     logger.error("Error while closing script engine", e);
                 }
@@ -274,5 +273,4 @@ private static class ScriptRecord {
 
         public final Lock lock = new ReentrantLock();
     }
-
 }