refactor: remove generics from ITeam

xeruf · anarchuser · commit 75151e7ae823 · 2020-09-09T15:08:46.000+02:00
diff --git a/plugin/src/client/sc/plugin2020/AbstractClient.java b/plugin/src/client/sc/plugin2020/AbstractClient.java
@@ -80,7 +80,7 @@ public void onRoomMessage(String roomId, Object data) {
     if(data instanceof MoveRequest) {
       this.handler.onRequestAction();
     } else if(data instanceof WelcomeMessage) {
-      this.color = Team.valueOf(((WelcomeMessage) data).getPlayerColor());
+      this.color = Team.valueOf(((WelcomeMessage)data).getColor());
     }
     this.roomId = roomId;
   }
diff --git a/plugin/src/client/sc/plugin2021/AbstractClient.kt b/plugin/src/client/sc/plugin2021/AbstractClient.kt
@@ -74,7 +74,7 @@ abstract class AbstractClient @Throws(IOException::class) constructor(
             handler.onRequestAction()
         }
         if(data is WelcomeMessage) {
-            team = Team.valueOf(data.playerColor.toUpperCase())
+            team = Team.valueOf(data.color.toUpperCase())
         }
         roomID = roomId
     }
diff --git a/plugin/src/server/sc/plugin2021/Game.kt b/plugin/src/server/sc/plugin2021/Game.kt
@@ -33,7 +33,7 @@ class Game(UUID: String = GamePlugin.PLUGIN_UUID): RoundBasedGameInstance<Player
    
     override fun onPlayerJoined(): Player {
         val player = gameState.getPlayer(availableTeams.removeAt(0))
-                ?: throw NullPointerException("Too many players joined the game!")
+                ?: throw IllegalStateException("Too many players joined the game!")
         
         players.add(player)
         playerMap[player.color as Team] = player
diff --git a/plugin/src/shared/sc/plugin2020/Board.kt b/plugin/src/shared/sc/plugin2020/Board.kt
@@ -104,7 +104,7 @@ data class Board(
     override fun hashCode(): Int =
             gameField.contentDeepHashCode()
     
-    fun getFieldsOwnedBy(owner: ITeam<*>): List<Field> = fields.filter { it.owner == owner }
+    fun getFieldsOwnedBy(owner: ITeam): List<Field> = fields.filter { it.owner == owner }
     
     companion object {
         private const val SHIFT = (Constants.BOARD_SIZE - 1) / 2
diff --git a/plugin/src/shared/sc/plugin2020/GameState.kt b/plugin/src/shared/sc/plugin2020/GameState.kt
@@ -71,7 +71,7 @@ class GameState @JvmOverloads constructor(
         }
     }
     
-    override fun getPointsForPlayer(team: ITeam<*>): Int {
+    override fun getPointsForPlayer(team: ITeam): Int {
         return GameRuleLogic.freeBeeNeighbours(this.board, team)
     }
     
diff --git a/plugin/src/shared/sc/plugin2020/Piece.kt b/plugin/src/shared/sc/plugin2020/Piece.kt
@@ -7,7 +7,7 @@ import sc.api.plugins.ITeam
 @XStreamAlias(value = "piece")
 data class Piece(
         @field:XStreamAsAttribute
-        val owner: ITeam<*>,
+        val owner: ITeam,
         @field: XStreamAsAttribute
         val type: PieceType)
 
diff --git a/plugin/src/shared/sc/plugin2020/Team.kt b/plugin/src/shared/sc/plugin2020/Team.kt
@@ -2,7 +2,7 @@ package sc.plugin2020
 
 import sc.api.plugins.ITeam
 
-enum class Team(override val index: Int, val displayName: String): ITeam<Team> {
+enum class Team(override val index: Int, val displayName: String): ITeam {
     RED(0, "Rot") {
         val letter = name.first()
         
diff --git a/plugin/src/shared/sc/plugin2020/util/GameRuleLogic.kt b/plugin/src/shared/sc/plugin2020/util/GameRuleLogic.kt
@@ -28,7 +28,7 @@ object GameRuleLogic {
 
     /** @return the [Team] that has to make the next Move. */
     @JvmStatic
-    fun getCurrentPlayerColor(gameState: GameState): ITeam<*> = gameState.currentTeam
+    fun getCurrentPlayerColor(gameState: GameState): ITeam = gameState.currentTeam
 
     /** Validates & executes the [move] on the [gameState]. */
     @JvmStatic
@@ -58,7 +58,7 @@ object GameRuleLogic {
 
     /** @return number of free (empty & not obstructed) fields around the Bee - -1 if no Bee has been placed. */
     @JvmStatic
-    fun freeBeeNeighbours(board: Board, color: ITeam<*>): Int =
+    fun freeBeeNeighbours(board: Board, color: ITeam): Int =
             board.fields.find { it.pieces.contains(Piece(color, PieceType.BEE)) }
                     ?.let { getNeighbours(board, it) }?.count { field -> field.isEmpty }
                     ?: -1
diff --git a/plugin/src/shared/sc/plugin2021/Color.kt b/plugin/src/shared/sc/plugin2021/Color.kt
@@ -4,23 +4,23 @@ import com.thoughtworks.xstream.annotations.XStreamAlias
 
 @XStreamAlias(value = "color")
 enum class Color(val team: Team) {
-    BLUE  (Team.ONE),
+    BLUE(Team.ONE),
     YELLOW(Team.TWO),
-    RED   (Team.ONE),
-    GREEN (Team.TWO) { init {
-        BLUE.next   = YELLOW
-        YELLOW.next = RED
-        RED.next    = GREEN
-        GREEN.next  = BLUE
-    }};
+    RED(Team.ONE),
+    GREEN(Team.TWO);
     
-    lateinit var next: Color
-        private set
+    val next: Color
+        get() = when (this) {
+            BLUE -> YELLOW
+            YELLOW -> RED
+            RED -> GREEN
+            GREEN -> BLUE
+        }
     
-    operator fun unaryPlus(): FieldContent = when(this) {
-        BLUE   -> FieldContent.BLUE
+    operator fun unaryPlus(): FieldContent = when (this) {
+        BLUE -> FieldContent.BLUE
         YELLOW -> FieldContent.YELLOW
-        RED    -> FieldContent.RED
-        GREEN  -> FieldContent.GREEN
+        RED -> FieldContent.RED
+        GREEN -> FieldContent.GREEN
     }
 }
diff --git a/plugin/src/shared/sc/plugin2021/GameState.kt b/plugin/src/shared/sc/plugin2021/GameState.kt
@@ -42,7 +42,11 @@ class GameState @JvmOverloads constructor(
     val lastMoveMono: MutableMap<Color, Boolean> = mutableMapOf()
     
     override val currentTeam
-        get() = currentColor.team
+        get() = when(currentColor) {
+            Color.BLUE, Color.RED -> Team.ONE
+            Color.YELLOW, Color.GREEN -> Team.TWO
+        }
+//        get() = currentColor.team
     
     override val currentPlayer
         get() = getPlayer(currentTeam)!!
@@ -102,7 +106,7 @@ class GameState @JvmOverloads constructor(
         }
     }
     
-    override fun getPointsForPlayer(team: ITeam<*>): Int =
+    override fun getPointsForPlayer(team: ITeam): Int =
             (team as Team).colors.map { getPointsForColor(it) }.sum()
     
     private fun getPointsForColor(color: Color): Int {
diff --git a/plugin/src/shared/sc/plugin2021/Team.kt b/plugin/src/shared/sc/plugin2021/Team.kt
@@ -2,9 +2,10 @@ package sc.plugin2021
 
 import com.thoughtworks.xstream.annotations.XStreamAlias
 import sc.api.plugins.ITeam
+import sc.shared.WelcomeMessage
 
 @XStreamAlias(value = "team")
-enum class Team(override val index: Int, val colors: List<Color>): ITeam<Team> {
+enum class Team(override val index: Int, val colors: List<Color>): ITeam {
     ONE(0, listOf(Color.BLUE, Color.YELLOW)) {
         override fun opponent(): Team = TWO
         override fun toString(): String = "One"
@@ -13,4 +14,7 @@ enum class Team(override val index: Int, val colors: List<Color>): ITeam<Team> {
         override fun opponent(): Team = ONE
         override fun toString(): String = "Two"
     };
-}
+}
+
+val WelcomeMessage.playerColor
+    get() = Team.valueOf(color)
diff --git a/server/test/sc/server/helpers/TestTeam.kt b/server/test/sc/server/helpers/TestTeam.kt
@@ -2,7 +2,7 @@ package sc.server.helpers
 
 import sc.api.plugins.ITeam
 
-enum class TestTeam(override val index: Int, val displayName: String): ITeam<TestTeam> {
+enum class TestTeam(override val index: Int, val displayName: String): ITeam {
     RED(0, "Rot") {
         val letter = name.first()
         
diff --git a/server/test/sc/server/plugins/TestPlayer.java b/server/test/sc/server/plugins/TestPlayer.java
@@ -8,7 +8,7 @@
 public class TestPlayer extends Player {
   private static Logger logger = LoggerFactory.getLogger(TestPlayer.class);
 
-  public TestPlayer(ITeam<?> pc) {
+  public TestPlayer(ITeam pc) {
     super(pc);
   }
 
diff --git a/socha-sdk/src/framework/sc/shared/WelcomeMessage.kt b/socha-sdk/src/framework/sc/shared/WelcomeMessage.kt
@@ -10,11 +10,7 @@ import sc.protocol.responses.ProtocolMessage
 @XStreamAlias(value = "welcomeMessage")
 data class WelcomeMessage
 private constructor(
-        @XStreamAsAttribute private val color: String
+        @XStreamAsAttribute val color: String
 ): ProtocolMessage {
-    
-    constructor(color: ITeam<*>): this(color.toString().toLowerCase())
-    
-    val playerColor: String
-        get() = color
+    constructor(color: ITeam): this(color.toString())
 }
diff --git a/socha-sdk/src/framework/sc/shared/WinCondition.java b/socha-sdk/src/framework/sc/shared/WinCondition.java
@@ -5,12 +5,12 @@
 public class WinCondition implements Cloneable {
 
   /** Farbe des Gewinners */
-  private final ITeam<? extends ITeam<?>> winner;
+  private final ITeam winner;
 
   /** Sieggrund */
   private final IWinReason reason;
 
-  public ITeam<?> getWinner() {
+  public ITeam getWinner() {
     return winner;
   }
 
@@ -24,7 +24,7 @@ public IWinReason getReason() {
    * @param winner Farbe des Siegers
    * @param reason Text, der Sieg beschreibt
    */
-  public WinCondition(ITeam <? extends ITeam<?>> winner, IWinReason reason) {
+  public WinCondition(ITeam winner, IWinReason reason) {
     this.winner = winner;
     this.reason = reason;
   }
diff --git a/socha-sdk/src/server-api/sc/api/plugins/ITeam.kt b/socha-sdk/src/server-api/sc/api/plugins/ITeam.kt
@@ -2,9 +2,9 @@ package sc.api.plugins
 
 /** This represents the team a player is in / is playing for.
  *  Concrete implementations belong into the corresponding plugin. */
-interface ITeam<out T> {
+interface ITeam {
     val index: Int
     
-    fun opponent(): ITeam<*>
+    fun opponent(): ITeam
     override fun toString(): String
 }
diff --git a/socha-sdk/src/server-api/sc/api/plugins/TwoPlayerGameState.kt b/socha-sdk/src/server-api/sc/api/plugins/TwoPlayerGameState.kt
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory
 import sc.framework.plugins.Player
 
 abstract class TwoPlayerGameState<P : Player>(
-        @XStreamAsAttribute val startTeam: ITeam<*>
+        @XStreamAsAttribute val startTeam: ITeam
 ) : IGameState {
     
     @XStreamOmitField
@@ -21,7 +21,7 @@ abstract class TwoPlayerGameState<P : Player>(
         get() = listOf(first, second)
     
     /** The Team active in the current turn. */
-    abstract val currentTeam: ITeam<*>
+    abstract val currentTeam: ITeam
 
     /** The Player whose team's turn it is. */
     open val currentPlayer: P
@@ -32,7 +32,7 @@ abstract class TwoPlayerGameState<P : Player>(
         get() = getPlayer(otherTeam)!!
 
     /** The Team opposite to the currently active one. */
-    val otherTeam: ITeam<*>
+    val otherTeam: ITeam
         get() = currentTeam.opponent()
 
     /** Der Spieler, der das Spiel begonnen hat. */
@@ -49,19 +49,19 @@ abstract class TwoPlayerGameState<P : Player>(
     fun getOpponent(player: P) =
             getPlayer(player.color.opponent())
 
-    fun getPlayer(team: ITeam<*>): P? = when(team.index) {
+    fun getPlayer(team: ITeam): P? = when(team.index) {
         0 -> first
         1 -> second
         else -> null
     }
     
     /** Calculates the color of the current player from the [turn] and the [startTeam].
      * Based on the assumption that the current player switches every turn. */
-    fun currentPlayerFromTurn(): ITeam<*> =
+    fun currentPlayerFromTurn(): ITeam =
             if(turn.rem(2) == 0) startTeam else startTeam.opponent()
 
     /** Gibt die angezeigte Punktzahl des Spielers zurueck. */
-    abstract fun getPointsForPlayer(team: ITeam<*>): Int
+    abstract fun getPointsForPlayer(team: ITeam): Int
 
     override fun toString() =
             "GameState(turn=$turn,currentPlayer=${currentPlayer.color})"
diff --git a/socha-sdk/src/server-api/sc/framework/plugins/Player.kt b/socha-sdk/src/server-api/sc/framework/plugins/Player.kt
@@ -14,7 +14,7 @@ private val logger = LoggerFactory.getLogger(Player::class.java)
 
 @XStreamAlias(value = "player")
 open class Player @JvmOverloads constructor(
-        @XStreamAsAttribute var color: ITeam<*>,
+        @XStreamAsAttribute var color: ITeam,
         @XStreamAsAttribute var displayName: String = "") : Cloneable {
     
     public override fun clone() = Player(color, displayName)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void onRoomMessage(String roomId, Object data) {`
`80`	`80`	`if(data instanceof MoveRequest) {`
`81`	`81`	`this.handler.onRequestAction();`
`82`	`82`	`} else if(data instanceof WelcomeMessage) {`
`83`		`- this.color = Team.valueOf(((WelcomeMessage) data).getPlayerColor());`
	`83`	`+ this.color = Team.valueOf(((WelcomeMessage)data).getColor());`
`84`	`84`	`}`
`85`	`85`	`this.roomId = roomId;`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ abstract class AbstractClient @Throws(IOException::class) constructor(`
`74`	`74`	`handler.onRequestAction()`
`75`	`75`	`}`
`76`	`76`	`if(data is WelcomeMessage) {`
`77`		`- team = Team.valueOf(data.playerColor.toUpperCase())`
	`77`	`+ team = Team.valueOf(data.color.toUpperCase())`
`78`	`78`	`}`
`79`	`79`	`roomID = roomId`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class GameState @JvmOverloads constructor(`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- override fun getPointsForPlayer(team: ITeam<*>): Int {`
	`74`	`+ override fun getPointsForPlayer(team: ITeam): Int {`
`75`	`75`	`return GameRuleLogic.freeBeeNeighbours(this.board, team)`
`76`	`76`	`}`
`77`	`77`