fix: a new copy of PropertyMap is returned from AssetLoader, closes #977

AlmasB · AlmasB · commit 901da1b9703a · 2023-03-31T20:58:18.000+01:00
diff --git a/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt b/fxgl/src/main/kotlin/com/almasb/fxgl/app/services/FXGLAssetLoaderService.kt
@@ -727,6 +727,12 @@ private class PropertyMapAssetLoader : AssetLoader<PropertyMap>(
         PropertyMap::class.java,
         ASSETS_DIR
 ) {
+    override fun cast(obj: Any): PropertyMap {
+        val map = obj as PropertyMap
+
+        return map.copy()
+    }
+
     override fun load(url: URL): PropertyMap {
         val lines = url.openStream().bufferedReader().readLines()
 
diff --git a/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt b/fxgl/src/test/kotlin/com/almasb/fxgl/app/AssetLoaderServiceTest.kt
@@ -261,6 +261,14 @@ class AssetLoaderServiceTest {
         assertThat(map, `is`(notNullValue()))
         assertThat(map.getString("testKey"), `is`("testValue"))
 
+        val map2 = assetLoader.loadPropertyMap("properties/test.properties")
+        val map3 = assetLoader.loadPropertyMap("properties/test.properties")
+
+        // must not be same object
+        assertFalse(map === map2)
+        assertFalse(map === map3)
+        assertFalse(map2 === map3)
+
         map = assetLoader.loadPropertyMap("bla-bla")
         assertThat(map, `is`(notNullValue()))
         assertThat(map.keys().size, `is`(0))
