#235 - added shutdown hook; added auto start for local server;

BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java

@@ -146,6 +146,15 @@ public class Controller extends BaseController
 			System.exit(0);
 		});
 		
+		Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+			Logger.debug("Received shutdown hook");
+			if(localServerProcess != null) 
+			{
+				Logger.debug("Stopping local BudgetMasterServer...");
+				localServerProcess.destroy();
+			}
+		}));
+		
 		if(settings.getServerType() == null)
 		{
 			settings.setServerType(ServerType.ONLINE);

BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/LocalServerSettingsController.java

@@ -3,7 +3,9 @@ package de.deadlocker8.budgetmasterclient.ui.controller;
 import java.io.IOException;
 import java.util.ArrayList;
 
+import de.deadlocker8.budgetmaster.logic.LocalServerException;
 import de.deadlocker8.budgetmaster.logic.LocalServerHandler;
+import de.deadlocker8.budgetmaster.logic.LocalServerStatus;
 import de.deadlocker8.budgetmaster.logic.ServerType;
 import de.deadlocker8.budgetmaster.logic.Settings;
 import de.deadlocker8.budgetmaster.logic.updater.Updater;
@@ -132,23 +134,23 @@ public class LocalServerSettingsController extends SettingsController
 	private void checkServerStatus()
 	{
 		LocalServerHandler serverHandler = new LocalServerHandler();
-		if(serverHandler.isServerPresent())
-		{
-			if(serverHandler.isServerRunning())
+		switch(serverHandler.getServerStatus())
 		{
+			case ACTIVE:
 				labelLocalServerStatus.setText(Localization.getString(Strings.LOCAL_SERVER_STATUS_OK));
 				buttonLocalServerAction.setVisible(false);
-			}
-			else
-			{
+
+				RestartHandler restartHandler = new RestartHandler(controller);
+				restartHandler.handleRestart(controller.getSettings().getLanguage());
+				refreshLabelsUpdate();
+				break;
+			case INACTIVE:
 				labelLocalServerStatus.setText(Localization.getString(Strings.LOCAL_SERVER_STATUS_NOT_STARTED));
-				buttonLocalServerAction.setText(Localization.getString(Strings.LOCAL_SERVER_ACTION_NOT_STARTED));
-				buttonLocalServerAction.setVisible(true);
-				buttonLocalServerAction.setDisable(false);
-				buttonLocalServerAction.setOnAction((event)->{
-					buttonLocalServerAction.setDisable(true);
+				buttonLocalServerAction.setVisible(false);
 				try
 				{
+					Logger.debug("Starting local Server...");
+					serverHandler.createServerSettingsIfNotExists();
 					controller.setLocalServerProcess(serverHandler.startServer());
 					try
 					{
@@ -157,27 +159,29 @@ public class LocalServerSettingsController extends SettingsController
 					catch(InterruptedException e)
 					{
 					}
-						checkServerStatus();
 					
-						//TODO refresh all data
+					if(!serverHandler.getServerStatus().equals(LocalServerStatus.ACTIVE))
+					{
+						throw new LocalServerException("");
+					}
+
 					// TODO modals for download and start of server
-						//TODO autostart server on startup if serverType = local and server is present
+					// TODO what happens after update of client?
+					// --> TODO check compatibility of server and client
 				}
 				catch(IOException e)
 				{
+					Logger.debug("Error while starting local server");
 					Logger.error(e);
-						AlertGenerator.showAlert(AlertType.ERROR, 
-												Localization.getString(Strings.TITLE_ERROR), 
-												"", 
-												Localization.getString(Strings.ERROR_LOCAL_SERVER_START, e.getMessage()),
-												controller.getIcon(), controller.getStage(), null, false);
-						buttonLocalServerAction.setDisable(false);
+					AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", Localization.getString(Strings.ERROR_LOCAL_SERVER_START, e.getMessage()), controller.getIcon(), controller.getStage(), null, false);
 				}
-				});
-			}
-		}
-		else
+				catch(LocalServerException ex)
 				{
+					Logger.debug("Error while starting local server");
+					AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", Localization.getString(Strings.ERROR_LOCAL_SERVER_START, ""), controller.getIcon(), controller.getStage(), null, false);
+				}
+				break;
+			case MISSING:
 				labelLocalServerStatus.setText(Localization.getString(Strings.LOCAL_SERVER_STATUS_NOT_PRESENT));
 				buttonLocalServerAction.setText(Localization.getString(Strings.LOCAL_SERVER_ACTION_NOT_PRESENT));
 				buttonLocalServerAction.setVisible(true);
@@ -188,20 +192,17 @@ public class LocalServerSettingsController extends SettingsController
 					{
 						buttonLocalServerAction.setDisable(true);
 						serverHandler.downloadServer(Localization.getString(Strings.VERSION_NAME));
-					serverHandler.createServerSettings();
+						serverHandler.createServerSettingsIfNotExists();
 						checkServerStatus();
 					}
 					catch(Exception e)
 					{
 						Logger.error(e);
-					AlertGenerator.showAlert(AlertType.ERROR, 
-											Localization.getString(Strings.TITLE_ERROR), 
-											"", 
-											Localization.getString(Strings.ERROR_LOCAL_SERVER_DOWNLOAD, e.getMessage()),
-											controller.getIcon(), controller.getStage(), null, false);
+						AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", Localization.getString(Strings.ERROR_LOCAL_SERVER_DOWNLOAD, e.getMessage()), controller.getIcon(), controller.getStage(), null, false);
 						buttonLocalServerAction.setDisable(false);
 					}
 				});
+				break;
 		}
 	}
 
@@ -221,27 +222,13 @@ public class LocalServerSettingsController extends SettingsController
 
 		if(clientSecret == null || clientSecret.equals(""))
 		{
-			AlertGenerator.showAlert(AlertType.WARNING, 
-									Localization.getString(Strings.TITLE_WARNING), 
-									"",
-									Localization.getString(Strings.WARNING_EMPTY_SECRET_CLIENT),
-									controller.getIcon(), 
-									controller.getStage(), 
-									null, 
-									false);
+			AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", Localization.getString(Strings.WARNING_EMPTY_SECRET_CLIENT), controller.getIcon(), controller.getStage(), null, false);
 			return;
 		}
 
 		if(currency == null || currency.equals(""))
 		{
-			AlertGenerator.showAlert(AlertType.WARNING, 
-									Localization.getString(Strings.TITLE_WARNING), 
-									"", 
-									Localization.getString(Strings.WARNING_EMPTY_CURRENCY),
-									controller.getIcon(), 
-									controller.getStage(), 
-									null, 
-									false);
+			AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", Localization.getString(Strings.WARNING_EMPTY_CURRENCY), controller.getIcon(), controller.getStage(), null, false);
 			return;
 		}
 
@@ -290,14 +277,7 @@ public class LocalServerSettingsController extends SettingsController
 		catch(IOException e)
 		{
 			Logger.error(e);
-			AlertGenerator.showAlert(AlertType.ERROR, 
-									Localization.getString(Strings.TITLE_ERROR), 
-									"", 
-									Localization.getString(Strings.ERROR_SETTINGS_SAVE),
-									controller.getIcon(), 
-									controller.getStage(), 
-									null, 
-									false);
+			AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", Localization.getString(Strings.ERROR_SETTINGS_SAVE), controller.getIcon(), controller.getStage(), null, false);
 		}
 
 		textFieldClientSecret.setText("******");

BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties

 # DEFAULT
 app.name=BudgetMaster
 version.code=13
-version.name=1.7.0
+version.name=1.6.0
 version.date=07.11.17
 author=Robert Goldmann
 credits=Länderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans\nVerwendete Bibliotheken:\ngson 2.8.1\njoda-time 2.9.7\nitextpdf 5.0.6\nlaunch4j-maven-plugin 1.7.21\nspark-core 2.5.4\nslf4j 1.7.21\nmysql-connector 6.0.5\njunit 4.12\nsqlite-jdbc 3.21.0
@@ -68,8 +68,7 @@ undefined=unbekannt
 tagfield.placeholder=Neuen Tag hier eingeben
 shortcut.dev.console=F12
 local.server.status.ok=Server ist gestartet.
-local.server.status.not.started=Server is nicht gestartet.
-local.server.action.not.started=Starten
+local.server.status.not.started=Server konnte nicht gestartet werden.
 local.server.status.not.present=Server nicht gefunden.
 local.server.action.not.present=Herunterladen
 

BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties

@@ -68,8 +68,7 @@ undefined=undefined
 tagfield.placeholder=Enter new Tag here
 shortcut.dev.console=F12
 local.server.status.ok=Server is running.
-local.server.status.not.started=Server is not running.
-local.server.action.not.started=Start
+local.server.status.not.started=Server couldn't be started.
 local.server.status.not.present=Server not found.
 local.server.action.not.present=Download
 

BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/LocalServerException.java

+package de.deadlocker8.budgetmaster.logic;
+
+public class LocalServerException extends Exception
+{
+	private static final long serialVersionUID = 3925464782915168752L;
+
+	public LocalServerException(String message)
+	{
+		super(message);
+	}
+}
\ No newline at end of file

BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/LocalServerHandler.java

@@ -52,16 +52,23 @@ public class LocalServerHandler
 		}
 		catch(Exception e)
 		{
-			Logger.error(e);
+			Logger.debug(e);
 			return false;
 		}
 	}
 	
-	public void createServerSettings() throws FileNotFoundException
+	public void createServerSettingsIfNotExists() throws FileNotFoundException
 	{
+		File settingsFile = new File(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/localServer/settings.json");
+		if(settingsFile.exists())
+		{
+			return;
+		}
+		Logger.debug("Creating settings file for local server...");
+		
 		String databasePath = PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/localServer/BudgetMaster.db";
 		String settings = "{\"databaseType\": \"sqlite\"," + 
-							"\"databaseUrl\": \"" + databasePath + "\"," + 
+							"\"databaseUrl\": \"" + databasePath.replace("\\", "/") + "\"," + 
 							"\"databaseName\": \"budgetmaster\"," + 
 							"\"databaseUsername\": \"root\"," + 
 							"\"databasePassword\": \"\"," + 
@@ -69,13 +76,14 @@ public class LocalServerHandler
 							"\"serverSecret\": \"BudgetMaster\"," + 
 							"\"keystorePath\": \"default\"," + 
 							"\"keystorePassword\": \"BudgetMaster\"}";
-		PrintWriter writer = new PrintWriter(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/localServer/settings.json");
+		PrintWriter writer = new PrintWriter(settingsFile);
 		writer.println(settings);
 		writer.close();
 	}
 	
 	public void downloadServer(String versionName) throws Exception
 	{
+		Logger.debug("Downloading BudgetMasterServer from " + BUILD_FOLDER.replace("{}", "v" + versionName));
 		PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/localServer"));
 		
 		//download into temp directory and file
@@ -96,4 +104,28 @@ public class LocalServerHandler
 		ProcessBuilder pb = new ProcessBuilder("java", "-jar", Paths.get(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/localServer/BudgetMasterServer.jar").toString()); 				
 		return pb.start();		
 	}
+	
+	public LocalServerStatus getServerStatus()
+	{
+		LocalServerHandler serverHandler = new LocalServerHandler();
+		if(serverHandler.isServerPresent())
+		{
+			Logger.debug("Local server found");
+			if(serverHandler.isServerRunning())
+			{
+				Logger.debug("Local server is running");
+				return LocalServerStatus.ACTIVE;
+			}
+			else
+			{
+				Logger.debug("Local server is NOT running");
+				return LocalServerStatus.INACTIVE;
+			}
+		}
+		else
+		{
+			Logger.debug("Local server NOT found");
+			return LocalServerStatus.MISSING;
+		}		
+	}
 }
\ No newline at end of file

BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/LocalServerStatus.java

+package de.deadlocker8.budgetmaster.logic;
+
+public enum LocalServerStatus
+{
+	ACTIVE, INACTIVE, MISSING;
+}
\ No newline at end of file

BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Strings.java

@@ -73,7 +73,6 @@ public class Strings
     public static final String LOCAL_SERVER_STATUS_OK = "local.server.status.ok";
     public static final String LOCAL_SERVER_STATUS_NOT_STARTED = "local.server.status.not.started";
     public static final String LOCAL_SERVER_STATUS_NOT_PRESENT = "local.server.status.not.present";
-    public static final String LOCAL_SERVER_ACTION_NOT_STARTED = "local.server.action.not.started";
     public static final String LOCAL_SERVER_ACTION_NOT_PRESENT = "local.server.action.not.present";
     
     //REPORT

BudgetMasterServer/src/main/java/de/deadlocker8/budgetmasterserver/logic/Utils.java

@@ -71,8 +71,10 @@ public class Utils
 		}
 	}
 
-	public static DatabaseHandler getDatabaseHandler(Settings settings)
+	public static DatabaseHandler getDatabaseHandler(Settings settings) throws ClassNotFoundException
 	{
+		Class.forName("org.sqlite.JDBC");
+		
 		if(settings.getDatabaseType().equals("mysql"))
 		{
 			return new MysqlDatabaseHandler(settings);
@@ -83,8 +85,10 @@ public class Utils
 		}
 	}
 
-	public static DatabaseTagHandler getDatabaseTagHandler(Settings settings)
+	public static DatabaseTagHandler getDatabaseTagHandler(Settings settings) throws ClassNotFoundException
 	{
+		Class.forName("org.sqlite.JDBC");
+		
 		if(settings.getDatabaseType().equals("mysql"))
 		{
 			return new MysqlDatabaseTagHandler(settings);

BudgetMasterServer/src/main/java/de/deadlocker8/budgetmasterserver/server/SparkServer.java

@@ -139,6 +139,8 @@ public class SparkServer
 			handler.closeConnection();
 		});
 		
+		try
+		{	
 			// Category
 			get("/category", new CategoryGetAll(Utils.getDatabaseHandler(settings), gson));
 			get("/category/single", new CategoryGet(Utils.getDatabaseHandler(settings), gson));
@@ -196,6 +198,11 @@ public class SparkServer
 			get("/info", new InformationGet(gson, versionInfo, settings));
 			get("/version", new VersionGet(gson, versionInfo));
 			delete("/log", new LogDelete());
+		}
+		catch(ClassNotFoundException e)
+		{
+			Logger.error(e);
+		}
 
 		after((request, response) -> {
 			DatabaseHandler handler = Utils.getDatabaseHandler(settings);