feat(sdk/server): improve XStream granularity

Author: xeruf

sdk/src/main/server-api/sc/framework/ReplayListener.kt

@@ -1,6 +1,6 @@
 package sc.framework
 
-import sc.networking.XStreamProvider.Companion.loadPluginXStream
+import sc.networking.XStreamProvider
 import java.io.IOException
 import java.io.Writer
 
@@ -12,7 +12,7 @@ class ReplayListener<T>(private val history: MutableList<T> = ArrayList()) {
     /** Write replay of game to a writer.  */
     @Throws(IOException::class)
     fun saveReplay(writer: Writer) {
-        val xStream = loadPluginXStream()
+        val xStream = XStreamProvider.allPlugins()
         writer.write("<protocol>\n")
         for (element in history) {
             // TODO do we need to save RoomPackets?

sdk/src/main/server-api/sc/framework/ReplayLoader.kt

@@ -26,7 +26,7 @@ class ReplayLoader(inputStream: InputStream) {
             file.inputStream()
     )
 
-    val stream = XStreamProvider.loadPluginXStream().createObjectInputStream(inputStream)
+    val stream = XStreamProvider.currentPlugin().createObjectInputStream(inputStream)
 
     fun loadHistory(exitCondition: (IGameState) -> Boolean = { false }): Pair<List<IGameState>, GameResult?> {
         val history: MutableList<IGameState> = ArrayList(50)

sdk/src/main/server-api/sc/networking/XStreamProvider.kt

@@ -16,14 +16,14 @@ interface XStreamProvider {
         * </prepare>
         */
         /** @return a XStream instance with the default project settings. */
-        fun getPureXStream(): XStream =
+        fun pure(): XStream =
                 XStream(KXml2Driver()).apply {
                     setMode(XStream.NO_REFERENCES)
                 }
 
         /** @return a XStream instance able to handle all messages in the sdk. */
-        fun getBasicXStream(): XStream =
-                getPureXStream().also { xStream ->
+        fun basic(): XStream =
+                pure().also { xStream ->
                     LobbyProtocol.registerMessages(xStream)
                 }
 
@@ -32,13 +32,21 @@ interface XStreamProvider {
          *
          * @return a XStream instance able to handle custom registered classes. */
         @JvmStatic
-        fun loadPluginXStream(): XStream =
-                getBasicXStream().also { xStream ->
-                    ServiceLoader.load(XStreamProvider::class.java).forEach { provider ->
-                        LobbyProtocol.registerAdditionalMessages(xStream, provider.classesToRegister)
-                        provider.setup(xStream)
-                    }
+        fun currentPlugin(): XStream =
+                basic().also { xStream ->
+                    ServiceLoader.load(XStreamProvider::class.java).sortedBy { it.javaClass.name }.last().load(xStream)
                 }
+        
+        fun allPlugins(): XStream =
+            basic().also { xStream ->
+                ServiceLoader.load(XStreamProvider::class.java).forEach { provider -> provider.load(xStream) }
+            }
+        
+        private fun XStreamProvider.load(xStream: XStream) {
+            println("Loading into XStream: $this")
+            LobbyProtocol.registerAdditionalMessages(xStream, this.classesToRegister)
+            this.setup(xStream)
+        }
     }
 
     val classesToRegister: Collection<Class<*>>

sdk/src/main/server-api/sc/networking/clients/XStreamClient.java

@@ -31,7 +31,7 @@ public static INetworkInterface createTcpNetwork(String host, int port) throws I
   private final INetworkInterface networkInterface;
   private final ObjectOutputStream out;
   private final Thread receiveThread;
-  protected final XStream xStream = XStreamProvider.loadPluginXStream();
+  protected final XStream xStream = XStreamProvider.currentPlugin();
 
   private DisconnectCause disconnectCause = DisconnectCause.NOT_DISCONNECTED;
   private boolean closed = false;

sdk/src/test/config/sc/helpers/XStreamMatcher.kt

@@ -9,7 +9,7 @@ import sc.networking.XStreamProvider
 @AutoScan
 object XStreamProjectListener: ProjectListener {
     override suspend fun beforeProject() {
-        testXStream = XStreamProvider.loadPluginXStream()
+        testXStream = XStreamProvider.allPlugins()
     }
 }
 

server/src/test/java/sc/server/helpers/ConverterTest.kt

@@ -24,7 +24,7 @@ class ConverterTest {
         }
     }
 
-    private val xStream = XStreamProvider.getPureXStream()
+    private val xStream = XStreamProvider.pure()
 
     @Test
     fun shouldSerializeSensitiveDataForAuthorizedPeople() {