fixed color palettes were not saved synchronized, resulting in file c…

…orruptions [related to #36, #37, #38]

+ added unit test for loading and storing color palettes to json file
+ bumped version to 0.2.5.2

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>de.lars</groupId>
 	<artifactId>remotelight</artifactId>
-	<version>0.2.5.1</version>
+	<version>0.2.5.2</version>
 	<packaging>pom</packaging>
 
 	<name>RemoteLight</name>

remotelight-client/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.lars</groupId>
 		<artifactId>remotelight</artifactId>
-		<version>0.2.5.1</version>
+		<version>0.2.5.2</version>
 	</parent>
 
 	<artifactId>remotelight-client</artifactId>

remotelight-core/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.lars</groupId>
 		<artifactId>remotelight</artifactId>
-		<version>0.2.5.1</version>
+		<version>0.2.5.2</version>
 	</parent>
 
 	<artifactId>remotelight-core</artifactId>

remotelight-core/src/main/java/de/lars/remotelightcore/RemoteLightCore.java

@@ -65,7 +65,7 @@ public class RemoteLightCore {
 	private static boolean shuttingDown = false;
 	private static long startMillis = System.currentTimeMillis();
 
-	public final static String VERSION = "v0.2.5.1";
+	public final static String VERSION = "v0.2.5.2";
 	public final static boolean DEVBUILD = false;
 	public final static String WEBSITE = "https://remotelight-software.blogspot.com";
 	public final static String GITHUB = "https://github.com/Drumber/RemoteLight";

remotelight-core/src/main/java/de/lars/remotelightcore/colors/palette/PaletteLoader.java

@@ -65,7 +65,7 @@ public PaletteLoader() {
 				.create();
 	}
 
-	public void load() {
+	public synchronized void load() {
 		List<PaletteData> palettes = null;
 
 		if(dataFile.exists()) {
@@ -90,7 +90,7 @@ public void load() {
 		}
 	}
 
-	public void store() {
+	public synchronized void store() {
 		List<PaletteData> palettes = new ArrayList<PaletteData>(Palettes.getAll());
 		Logger.info("Storing " + palettes.size() + " color palettes.");
 

remotelight-core/src/test/java/de/lars/remotelightcore/PaletteLoaderTest.java

@@ -0,0 +1,77 @@
+package de.lars.remotelightcore;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import de.lars.remotelightcore.colors.palette.PaletteLoader;
+import de.lars.remotelightcore.colors.palette.Palettes;
+import de.lars.remotelightcore.utils.DirectoryUtil;
+
+public class PaletteLoaderTest {
+
+	@Test
+	public void runTest() throws InterruptedException {
+		System.out.println("Running palette loader test...");
+		final List<Throwable> errorList = new ArrayList<>();
+
+		final PaletteLoader loader = PaletteLoader.getInstance();
+		loader.load();
+		loader.store();
+
+		final int prevPaletteSize = Palettes.getAll().size();
+
+		final int storeRepeatCount = 10;
+		final long waitTime = 5;
+
+		final ExecutorService executor = Executors.newFixedThreadPool(storeRepeatCount);
+
+		for(int i = 0; i < storeRepeatCount; i++) {
+			final int pos = i;
+
+			executor.submit(() -> {
+				try {
+					System.out.printf("[%d/%d] Storing %d palettes to %s...\n",
+							pos + 1,
+							storeRepeatCount,
+							Palettes.getAll().size(),
+							DirectoryUtil.getDataStoragePath() + DirectoryUtil.PALETTES_FILE_NAME);
+
+					//---- Store
+					loader.store();
+
+					//---- Clear
+					Palettes.getAll().clear();
+					assertEquals(0, Palettes.getAll().size());
+
+					//---- Load
+					loader.load();
+					assertEquals(prevPaletteSize, Palettes.getAll().size());
+				} catch(Throwable e) {
+					errorList.add(e);
+					e.printStackTrace();
+				}
+
+				System.out.printf("[%d] Thread finished", pos + 1);
+				return null;
+			});
+
+			Thread.sleep(waitTime);
+		}
+
+		executor.shutdown();
+		executor.awaitTermination(5, TimeUnit.SECONDS);
+
+		if(!errorList.isEmpty()) {
+			throw new AssertionFailedError("Expected no error, but test caused " + errorList.size() + " errors.");
+		}
+	}
+
+}

remotelight-plugincompat/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.lars</groupId>
 		<artifactId>remotelight</artifactId>
-		<version>0.2.5.1</version>
+		<version>0.2.5.2</version>
 	</parent>
 	<artifactId>remotelight-plugincompat</artifactId>
 

remotelight-plugincore/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.lars</groupId>
 		<artifactId>remotelight</artifactId>
-		<version>0.2.5.1</version>
+		<version>0.2.5.2</version>
 	</parent>
 
 	<artifactId>remotelight-plugincore</artifactId>

remotelight-restapi/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.lars</groupId>
 		<artifactId>remotelight</artifactId>
-		<version>0.2.5.1</version>
+		<version>0.2.5.2</version>
 	</parent>
 
 	<artifactId>remotelight-restapi</artifactId>