Add ProgramSettingsManager for handle settings not found or empty cases

Author: gerardszczepanski

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>szczepanski.gerard</groupId>
 	<artifactId>runit-parent</artifactId>
-	<version>0.9</version>
+	<version>0.9.2</version>
 	<packaging>pom</packaging>
 
 	<properties>

runit-common/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>szczepanski.gerard</groupId>
     <artifactId>runit-parent</artifactId>
-    <version>0.9</version>
+    <version>0.9.2</version>
   </parent>
   <artifactId>runit-common</artifactId>
 </project>

runit-program/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>szczepanski.gerard</groupId>
 		<artifactId>runit-parent</artifactId>
-		<version>0.9</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>runit-program</artifactId>
 

runit-program/src/main/java/szczepanski/gerard/runit/program/config/DependenciesConfig.java

@@ -48,6 +48,7 @@
 import szczepanski.gerard.runnit.view.tab.factory.SettingsDirTabFactory;
 import szczepanski.gerard.runnit.view.tab.factory.SettingsGeneralTabFactory;
 import szczepanski.gerard.runnit.view.tab.factory.SettingsWebTabFactory;
+import szczepanski.gerard.runnit.view.util.ProgramSettingsManager;
 
 @Configuration
 public class DependenciesConfig {
@@ -199,5 +200,10 @@ private List<SearchAlgorithm> searchAlgorithms() {
 	public SearchTermMatcher searchTermMatcher() {
 		return new SimpleSearchTermMatcher();
 	}
+	
+	@Bean
+	public ProgramSettingsManager programSettingsManager() {
+		return new ProgramSettingsManager(settingsLoader(), settingsWriter());
+	}
 
 }

runit-program/src/main/java/szczepanski/gerard/runit/program/main/Main.java

@@ -18,6 +18,7 @@
 import szczepanski.gerard.runit.program.util.ProgramHotKeyListener;
 import szczepanski.gerard.runit.program.util.ProgramWindowMoveListener;
 import szczepanski.gerard.runnit.view.scene.factory.MainSceneFactory;
+import szczepanski.gerard.runnit.view.util.ProgramSettingsManager;
 import szczepanski.gerard.runnit.view.util.ProgramTrayManager;
 
 public class Main extends Application {
@@ -40,6 +41,7 @@ public void start(Stage primaryStage) throws Exception {
 			ProgramTrayManager.installInSystemTray(primaryStage);
 			ProgramHotKeyListener.getInstance().registerProgramHotKey();
 			ProgramWindowMoveListener.makeStageDraggable(primaryStage, (Pane) mainScene.getRoot());
+			loadSettingsOnProgramStart();
 		});
 
 		primaryStage.initStyle(StageStyle.UNDECORATED);
@@ -59,4 +61,10 @@ private static void initComponents() {
 		ctx = new AnnotationConfigApplicationContext(DependenciesConfig.class);
 	}
 
+	private static void loadSettingsOnProgramStart() {
+		LOG.debug("Initial Loading Settings");
+		ProgramSettingsManager programSettingsManager = ctx.getBean(ProgramSettingsManager.class);
+		programSettingsManager.loadSettings();
+	}
+	
 }

runit-search-service/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>szczepanski.gerard</groupId>
 		<artifactId>runit-parent</artifactId>
-		<version>0.9</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>runit-search-service</artifactId>
 

runit-settings-service/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>szczepanski.gerard</groupId>
 		<artifactId>runit-parent</artifactId>
-		<version>0.9</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<artifactId>runit-settings-service</artifactId>

runit-settings-service/src/main/java/szczepanski/gerard/runit/settings/service/loader/Settings.java

@@ -8,10 +8,14 @@
 @Builder
 @Getter
 public class Settings {
-	
+
 	private List<String> rootDirectioresToScan;
 	private List<String> fileExtensions;
 	private List<Alias> webAliases;
 	private List<Alias> dirAliases;
-	
+
+	public boolean areSettingsNotDefined() {
+		return rootDirectioresToScan.isEmpty() && fileExtensions.isEmpty() && webAliases.isEmpty()
+				&& dirAliases.isEmpty();
+	}
 }

runit-view/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>szczepanski.gerard</groupId>
 		<artifactId>runit-parent</artifactId>
-		<version>0.9</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>runit-view</artifactId>
 

runit-view/src/main/java/szczepanski/gerard/runnit/view/util/ProgramSettingsManager.java

@@ -0,0 +1,47 @@
+package szczepanski.gerard.runnit.view.util;
+
+import org.apache.log4j.Logger;
+
+import lombok.RequiredArgsConstructor;
+import szczepanski.gerard.runit.common.exception.RunitRuntimeException;
+import szczepanski.gerard.runit.settings.service.loader.Settings;
+import szczepanski.gerard.runit.settings.service.loader.SettingsLoader;
+import szczepanski.gerard.runit.settings.service.writer.SettingsWriter;
+
+/**
+ * This class is responsible for load Settings if exist,
+ * and then check if settings are initialized. If not, then
+ * invoke SettingsWriter restoreDefaults.
+ * 
+ * If Settings file is not exist, then ProgramSettingsManager will create settings file,
+ * with default configuration.
+ * 
+ * @author Gerard Szczepanski
+ */
+@RequiredArgsConstructor
+public class ProgramSettingsManager {
+	private static final Logger LOG = Logger.getLogger(ProgramSettingsManager.class);
+	
+	private final SettingsLoader settingsLoader;
+	private final SettingsWriter settingsWriter;
+	
+	public void loadSettings() {
+		LOG.debug("Loading settings");
+		
+		try {
+			Settings initialSettings = settingsLoader.getSettings();
+			restoreSettingsIfNotDefined(initialSettings);
+		} catch (RunitRuntimeException e) {
+			LOG.debug("Settings file is not created yet. Creating default settings file");
+			settingsWriter.restoreDefaultSettings();
+		}
+	}
+	
+	private void restoreSettingsIfNotDefined(Settings initialSettings) {
+		if (initialSettings.areSettingsNotDefined()) {
+			LOG.debug("Settings are not defined. Injecting default settings");
+			settingsWriter.restoreDefaultSettings();
+		}
+	}
+	
+}

runit.xml

@@ -3,7 +3,7 @@
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
   <jar>C:\Users\Ziemniak\Documents\runit\runit-program\target\runit-program-0.9.jar</jar>
-  <outfile>C:\Users\Ziemniak\Desktop\runit-exe\runit-0.9.exe</outfile>
+  <outfile>C:\Users\Ziemniak\Desktop\runit-exe\runit-0.9.1.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>
@@ -22,6 +22,5 @@
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
     <runtimeBits>64/32</runtimeBits>
-    <maxHeapSize>64</maxHeapSize>
   </jre>
 </launch4jConfig>