Fix "create match" data structures

src/main/java/com/faforever/server/integration/v2/client/CreateMatchMessage.java → src/main/java/com/faforever/server/integration/v2/client/CreateMatchClientMessage.java

@@ -10,13 +10,16 @@
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
-class CreateMatchMessage extends V2ClientMessage {
+class CreateMatchClientMessage extends V2ClientMessage {
   private UUID requestId;
   private String title;
   /** ID of the map version to be played. */
   private int map;
   /** Name of the featured mod that will be played. */
   private String featuredMod;
+  /** In which lobby mode to start the game in. */
+  private LobbyMode lobbyMode;
+
   private List<Participant> participants;
 
   @Getter
@@ -27,8 +30,6 @@ public static class Participant {
     int id;
     /** The faction that will be played by this player. */
     Faction faction;
-    /** The game slot this player will be assigned to. */
-    int slot;
     /** The team this player will be assigned to. */
     int team;
     /**
@@ -39,4 +40,20 @@ public static class Participant {
     /** ID of the slot on the map the player will start in. */
     int startSpot;
   }
+
+  /**
+   * See values for description.
+   */
+  public enum LobbyMode {
+
+    /**
+     * Default lobby where players can select their faction, teams and so on.
+     */
+    DEFAULT,
+
+    /**
+     * The lobby is skipped; the game starts straight away,
+     */
+    NONE
+  }
 }

src/main/java/com/faforever/server/integration/v2/client/V2ClientMessageMapper.java

@@ -83,7 +83,7 @@ public interface V2ClientMessageMapper {
   GameModsReport map(GameModsClientMessage message);
 
   @Mapping(source = "map", target = "mapVersionId")
-  CreateMatchRequest map(CreateMatchMessage message);
+  CreateMatchRequest map(CreateMatchClientMessage message);
 
   LoginRequest map(LoginClientMessage message);
 

src/main/java/com/faforever/server/integration/v2/client/V2ClientMessageWrapper.java

@@ -45,7 +45,7 @@ class V2ClientMessageWrapper {
     @Type(value = RestoreGameSessionClientMessage.class, name = "restoreGameSession"),
     @Type(value = SelectAvatarClientMessage.class, name = "selectAvatar"),
     @Type(value = TeamKillClientMessage.class, name = "teamKill"),
-    @Type(value = CreateMatchMessage.class, name = "createMatch"),
+    @Type(value = CreateMatchClientMessage.class, name = "createMatch"),
     @Type(value = GameChatMessageClientMessage.class, name = "gameChatMessage")
   })
   private V2ClientMessage data;

src/main/java/com/faforever/server/matchmaker/CreateMatchRequest.java

@@ -2,6 +2,7 @@
 
 import com.faforever.server.common.ClientMessage;
 import com.faforever.server.game.Faction;
+import com.faforever.server.game.LobbyMode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
@@ -32,20 +33,4 @@ public static class Participant {
     private String name;
     private int startSpot;
   }
-
-  /**
-   * See values for description.
-   */
-  public enum LobbyMode {
-
-    /**
-     * Default lobby where players can select their faction, teams and so on.
-     */
-    DEFAULT,
-
-    /**
-     * The lobby is skipped; the game starts straight away,
-     */
-    NONE
-  }
 }

src/test/java/com/faforever/server/integration/MatchMakerServiceActivatorTest.java

@@ -4,8 +4,8 @@
 import com.faforever.server.entity.Player;
 import com.faforever.server.entity.User;
 import com.faforever.server.game.Faction;
+import com.faforever.server.game.LobbyMode;
 import com.faforever.server.matchmaker.CreateMatchRequest;
-import com.faforever.server.matchmaker.CreateMatchRequest.LobbyMode;
 import com.faforever.server.matchmaker.CreateMatchRequest.Participant;
 import com.faforever.server.matchmaker.MatchMakerCancelRequest;
 import com.faforever.server.matchmaker.MatchMakerMapper;