fix(plugin): load XStream properly

Author: xeruf

plugin/src/client/sc/plugin2021/AbstractClient.kt

@@ -30,6 +30,10 @@ abstract class AbstractClient(
     companion object {
         private val logger = LoggerFactory.getLogger(AbstractClient::class.java);
         private val gameType = GamePlugin.PLUGIN_UUID
+    
+        init {
+            GamePlugin.registerXStream()
+        }
     }
 
     var isGameOver = false

plugin/src/server/sc/plugin2021/GamePlugin.kt

@@ -1,20 +1,23 @@
 package sc.plugin2021
 
+import com.thoughtworks.xstream.XStream
 import sc.api.plugins.IGameInstance
 import sc.api.plugins.IGamePlugin
+import sc.helpers.xStream
 import sc.plugin2021.xstream.BoardConverter
 import sc.plugins.PluginDescriptor
 import sc.protocol.helpers.LobbyProtocol
 import sc.shared.ScoreAggregation
 import sc.shared.ScoreDefinition
 import sc.shared.ScoreFragment
-import sc.helpers.xStream as xstream
+import java.util.concurrent.atomic.AtomicBoolean
 
 @PluginDescriptor(name = "Blokus", uuid = "swc_2021_blokus")
 class GamePlugin: IGamePlugin {
 
     companion object {
         val PLUGIN_UUID = "swc_2021_blokus"
+        val loaded = AtomicBoolean(false)
 
         val SCORE_DEFINITION = ScoreDefinition(arrayOf(
                 ScoreFragment("Gewinner"),
@@ -28,15 +31,16 @@ class GamePlugin: IGamePlugin {
                     Color::class.java, Team::class.java)
 
         fun registerXStream() {
-            LobbyProtocol.registerAdditionalMessages(xstream, classesToRegister)
-            
-            xstream.registerConverter(BoardConverter())
+            if (loaded.compareAndSet(false, true)) {
+                LobbyProtocol.registerAdditionalMessages(xStream, classesToRegister)
+                xStream.registerConverter(BoardConverter())
+            }
         }
-        
+    
         @JvmStatic
-        val xStream by lazy {
+        fun loadXStream(): XStream {
             registerXStream()
-            xstream
+            return xStream
         }
     }
 

plugin/src/test/sc/plugin2021/GameStateTest.kt

@@ -8,8 +8,8 @@ import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
-import sc.plugin2021.GamePlugin.Companion.xStream
 import sc.plugin2021.util.Constants
+import sc.plugin2021.GamePlugin.Companion.loadXStream
 import sc.plugin2021.util.GameRuleLogic
 import sc.shared.InvalidMoveException
 
@@ -70,7 +70,7 @@ class GameStateTest: StringSpec({
     }
     "XML conversion works" {
         val state = GameState()
-        val transformed = xStream.fromXML(xStream.toXML(GameState(startPiece = state.startPiece))) as GameState
+        val transformed = loadXStream().fromXML(loadXStream().toXML(GameState(startPiece = state.startPiece))) as GameState
         transformed.toString() shouldBe state.toString()
         transformed shouldBe state
 

plugin/src/test/sc/plugin2021/PieceTest.kt

@@ -7,7 +7,6 @@ import io.kotest.matchers.maps.shouldContain
 import io.kotest.matchers.maps.shouldContainExactly
 import io.kotest.matchers.shouldBe
 import org.opentest4j.AssertionFailedError
-import sc.plugin2021.GamePlugin.Companion.xStream
 import sc.plugin2021.helper.shouldSerializeTo
 import sc.plugin2021.util.align
 import sc.plugin2021.util.flip

plugin/src/test/sc/plugin2021/helper/XStreamMatcher.kt

@@ -4,8 +4,8 @@ import io.kotest.matchers.shouldBe
 import sc.plugin2021.GamePlugin
 
 infix fun <T : Any> T.shouldSerializeTo(serialized: String) {
-    GamePlugin.xStream.toXML(this) shouldBe serialized
-    val deserialized = GamePlugin.xStream.fromXML(serialized)
+    GamePlugin.loadXStream().toXML(this) shouldBe serialized
+    val deserialized = GamePlugin.loadXStream().fromXML(serialized)
     deserialized.toString() shouldBe this.toString()
     deserialized shouldBe this
 }