Query refactor

src/main/java/ecdar/Ecdar.java

@@ -1,11 +1,11 @@
 package ecdar;
 
 import ecdar.abstractions.*;
-import ecdar.backend.BackendDriver;
+import ecdar.backend.BackendException;
 import ecdar.backend.BackendHelper;
-import ecdar.backend.QueryHandler;
 import ecdar.code_analysis.CodeAnalysis;
 import ecdar.controllers.EcdarController;
+import ecdar.issues.ExitStatusCodes;
 import ecdar.presentations.*;
 import ecdar.utility.keyboard.Keybind;
 import ecdar.utility.keyboard.KeyboardTracker;
@@ -50,8 +50,6 @@ public class Ecdar extends Application {
     private static BooleanProperty isUICached = new SimpleBooleanProperty();
     public static BooleanProperty shouldRunBackgroundQueries = new SimpleBooleanProperty(true);
     private static final BooleanProperty isSplit = new SimpleBooleanProperty(false);
-    private static BackendDriver backendDriver = new BackendDriver();
-    private static QueryHandler queryHandler = new QueryHandler(backendDriver);
     private Stage debugStage;
 
     /**
@@ -179,20 +177,6 @@ public static void toggleCanvasSplit() {
         isSplit.set(!isSplit.get());
     }
 
-    /**
-     * Returns the backend driver used to execute queries and handle simulation
-     *
-     * @return BackendDriver
-     */
-    public static BackendDriver getBackendDriver() {
-        return backendDriver;
-    }
-
-    public static QueryHandler getQueryExecutor() {
-        return queryHandler;
-
-    }
-
     public static double getDpiScale() {
         if (!autoScalingEnabled.getValue())
             return 1;
@@ -256,6 +240,21 @@ public void start(final Stage stage) {
             Ecdar.showToast("The application icon could not be loaded");
         }
 
+        BackendHelper.addEngineInstanceListener(() -> {
+            // When the engines change, clear the backendDriver
+            // to prevent dangling connections and queries
+            try {
+                presentation.getController().queryPane.getController().stopAllQueries();
+                BackendHelper.clearEngineConnections();
+            } catch (BackendException e) {
+                showToast("An exception was encountered during shutdown of engine connections");
+            }
+        });
+
+        // Whenever the Runtime is requested to exit, first stop all queries and exit the Platform
+        Runtime.getRuntime().addShutdownHook(new Thread(presentation.getController().queryPane.getController()::stopAllQueries));
+        Runtime.getRuntime().addShutdownHook(new Thread(Platform::exit));
+
         // We're now ready! Let the curtains fall!
         stage.show();
 
@@ -298,28 +297,19 @@ public void start(final Stage stage) {
         }));
 
         stage.setOnCloseRequest(event -> {
-            BackendHelper.stopQueries();
-
+            int statusCode = ExitStatusCodes.SHUTDOWN_SUCCESSFUL.getStatusCode();
             try {
-                backendDriver.closeAllEngineConnections();
-            } catch (IOException e) {
-                e.printStackTrace();
+                BackendHelper.clearEngineConnections();
+            } catch (BackendException e) {
+                statusCode = ExitStatusCodes.CLOSE_ENGINE_CONNECTIONS_FAILED.getStatusCode();
             }
 
-            Platform.exit();
-            System.exit(0);
-        });
-
-        BackendHelper.addEngineInstanceListener(() -> {
-            // When the engines change, re-instantiate the backendDriver
-            // to prevent dangling connections and queries
             try {
-                backendDriver.closeAllEngineConnections();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
+                System.exit(statusCode);
+            } catch (SecurityException e) {
+                // Forcefully shutdown the Java Runtime
+                Runtime.getRuntime().halt(ExitStatusCodes.GRACEFUL_SHUTDOWN_FAILED.getStatusCode());
             }
-
-            backendDriver = new BackendDriver();
         });
 
         project = presentation.getController().projectPane.getController().project;

src/main/java/ecdar/abstractions/Query.java

@@ -1,15 +1,10 @@
 package ecdar.abstractions;
 
-import ecdar.Ecdar;
 import ecdar.backend.*;
-import ecdar.controllers.EcdarController;
 import ecdar.utility.serialize.Serializable;
 import com.google.gson.JsonObject;
-import javafx.application.Platform;
 import javafx.beans.property.*;
 
-import java.util.function.Consumer;
-
 public class Query implements Serializable {
     private static final String QUERY = "query";
     private static final String COMMENT = "comment";
@@ -18,49 +13,20 @@ public class Query implements Serializable {
 
     private final StringProperty query = new SimpleStringProperty("");
     private final StringProperty comment = new SimpleStringProperty("");
-    private final StringProperty errors = new SimpleStringProperty("");
     private final SimpleBooleanProperty isPeriodic = new SimpleBooleanProperty(false);
     private final ObjectProperty<QueryState> queryState = new SimpleObjectProperty<>(QueryState.UNKNOWN);
     private final ObjectProperty<QueryType> type = new SimpleObjectProperty<>();
     private Engine engine;
 
-
-    private final Consumer<Boolean> successConsumer = (aBoolean) -> {
-        if (aBoolean) {
-            setQueryState(QueryState.SUCCESSFUL);
-        } else {
-            setQueryState(QueryState.ERROR);
-        }
-    };
-
-    private Boolean forcedCancel = false;
-    private final Consumer<Exception> failureConsumer = (e) -> {
-        if (forcedCancel) {
-            setQueryState(QueryState.UNKNOWN);
-        } else {
-            setQueryState(QueryState.SYNTAX_ERROR);
-            if (e instanceof BackendException.MissingFileQueryException) {
-                Ecdar.showToast("Please save the project before trying to run queries");
-            }
-
-            this.addError(e.getMessage());
-            final Throwable cause = e.getCause();
-            if (cause != null) {
-                // We had trouble generating the model if we get a NullPointerException
-                if (cause instanceof NullPointerException) {
-                    setQueryState(QueryState.UNKNOWN);
-                } else {
-                    Platform.runLater(() -> EcdarController.openQueryDialog(this, cause.toString()));
-                }
-            }
-        }
-    };
-
-    public Query(final String query, final String comment, final QueryState queryState) {
+    public Query(final String query, final String comment, final QueryState queryState, final Engine engine) {
         this.query.set(query);
         this.comment.set(comment);
         this.queryState.set(queryState);
-        setEngine(BackendHelper.getDefaultEngine());
+        setEngine(engine);
+    }
+
+    public Query(final String query, final String comment, final QueryState queryState) {
+        this(query, comment, queryState, BackendHelper.getDefaultEngine());
     }
 
     public Query(final JsonObject jsonElement) {
@@ -103,8 +69,6 @@ public StringProperty commentProperty() {
         return comment;
     }
 
-    public StringProperty errors() { return errors; }
-
     public boolean isPeriodic() {
         return isPeriodic.get();
     }
@@ -137,14 +101,6 @@ public ObjectProperty<QueryType> getTypeProperty() {
         return this.type;
     }
 
-    public Consumer<Boolean> getSuccessConsumer() {
-        return successConsumer;
-    }
-
-    public Consumer<Exception> getFailureConsumer() {
-        return failureConsumer;
-    }
-
     @Override
     public JsonObject serialize() {
         final JsonObject result = new JsonObject();
@@ -181,19 +137,4 @@ public void deserialize(final JsonObject json) {
             setEngine(BackendHelper.getDefaultEngine());
         }
     }
-
-    public void cancel() {
-        if (getQueryState().equals(QueryState.RUNNING)) {
-            forcedCancel = true;
-            setQueryState(QueryState.UNKNOWN);
-        }
-    }
-
-    public void addError(String e) {
-        errors.set(errors.getValue() + e + "\n");
-    }
-
-    public String getCurrentErrors() {
-        return errors.getValue();
-    }
 }