Merge pull request #24 from briancorbinxyz/jdk24

JDK24

Author: briancorbinxyz

.gitignore

@@ -34,5 +34,6 @@ Cargo.lock
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
-bin/
+*/bin/
 native/src/main/resources/native/
+buildSrc/.kotlin

.idea/.gitignore

@@ -97,6 +97,7 @@
             "name": "App",
             "request": "launch",
             "mainClass": "org.xxdc.oss.example.App",
+            "vmArgs": "-XX:+UseZGC --enable-preview",
             "projectName": "app",
         },
         {

.idea/compiler.xml

@@ -6,7 +6,7 @@
             "workingDirectory": "${workspaceFolder}",
             "vmArgs": [
                 "--enable-native-access=ALL-UNNAMED",
-                "-Djava.library.path=${env:LIB_PATH}",
+                "-Djava.library.path=${env:LIB_PATH}"
             ],
             "env": {
                 "LIB_PATH": "${workspaceFolder}/app/build/cargo/debug",

.idea/gradle.xml

@@ -5,12 +5,18 @@ Over-Engineering Tic-Tac-Toe
 
 Tic-Tac-Toe in Java deliberately over-engineered to apply features of Java introduced over time.
 
-Developed to pair with the ongoing blog post: [Road to JDK 25 - Over-Engineering Tic-Tac-Toe](https://thelifeof.briancorbin.xyz/Library/03-Resources/Road-to-JDK-25---Over-Engineering-Tic-Tac-Toe!) also serialized to Medium @ [Road to JDK 25 - Over-Engineering Tic-Tac-Toe On Medium](https://briancorbinxyz.medium.com/list/road-to-jdk-25-d0f656f66a8f)
+Developed to pair with the ongoing blog post: [Road to JDK 25 - Over-Engineering Tic-Tac-Toe](https://sympatheticengineering.com/Library/03-Resources/Road-to-JDK-25---Over-Engineering-Tic-Tac-Toe!) also serialized to Medium @ [Road to JDK 25 - Over-Engineering Tic-Tac-Toe On Medium](https://briancorbinxyz.medium.com/list/road-to-jdk-25-d0f656f66a8f)
 
 ---
 
 ### Features
 
+https://openjdk.org/projects/jdk/24/
+- **JEP496**:   Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism
+- **JEP485**:   Stream Gatherers
+- **JEP483**:   Ahead-of-Time Class Loading & Linking
+- **JEP484**:   Class-File API
+
 https://openjdk.org/projects/jdk/23/
 
 - **JEP467**:   Markdown Documentation Comments	
@@ -73,7 +79,7 @@ The following algorithms are used by the AI BOT in this project - for a detailed
 
 - To run the single game application, use the following command: `./gradlew run`
 
-- If you don't have Java 23 installed on your system you can install it first with [SDKMAN](https://sdkman.io/):
+- If you don't have Java installed on your system you can install it first with [SDKMAN](https://sdkman.io/) to build with a JDK 24 toolchain:
 
 ```bash
 curl -s "https://get.sdkman.io" | bash

.idea/kotlinc.xml

@@ -24,7 +24,6 @@ dependencies {
     testRuntimeOnly("org.slf4j:slf4j-api:2.0.13")
     testRuntimeOnly("org.slf4j:slf4j-jdk-platform-logging:2.0.13")
 
-
     // JDK23: JMH (Third-Party) Not required, added for benchmarking
     // https://github.com/openjdk/jmh
     testImplementation("org.openjdk.jmh:jmh-core:1.37")
@@ -90,12 +89,37 @@ publishing {
     }
 }
 
-tasks.withType<Test>().all {
-    // JDK22: Foreign Function Interface (FFI)
-    // Resolves Warning:
-    // WARNING: A restricted method in java.lang.foreign.SymbolLookup has been called
-    // WARNING: java.lang.foreign.SymbolLookup::libraryLookup has been called by org.xxdc.oss.example.GameBoardNativeImpl in an unnamed module
-    // WARNING: Use --enable-native-access=ALL-UNNAMED to avoid a warning for callers in this module
-    // WARNING: Restricted methods will be blocked in a future release unless native access is enabled
-    jvmArgs = listOf("--enable-native-access=ALL-UNNAMED", "-XX:+UseZGC")
+// TODO: Disable preview features on the branch when the next JDK is released
+val enablePreviewFeatures = true
+
+val collectorArgs = listOf(
+    "-XX:+UseZGC"
+)
+val standardArgs = listOf(
+    "--enable-native-access=ALL-UNNAMED",
+) + collectorArgs
+
+tasks.named<Test>("test") {
+    jvmArgs = if (enablePreviewFeatures) {
+        listOf("--enable-preview") + standardArgs
+    } else {
+        standardArgs
+    }
+}
+
+if (enablePreviewFeatures) {
+    tasks.withType<JavaCompile>().configureEach {
+        options.compilerArgs.addAll(listOf("--enable-preview"))
+    }
+    
+    tasks.withType<JavaExec>().configureEach {
+        jvmArgs("--enable-preview")
+    }
+    
+    tasks.withType<Javadoc>() {
+        (options as StandardJavadocDocletOptions).apply {
+            addBooleanOption("-enable-preview", true)    
+            source = "24"
+        }
+    }
 }

.idea/material_theme_project_new.xml

@@ -9,7 +9,9 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Optional;
+import java.util.SequencedCollection;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 /**
  * Represents a game of Tic-Tac-Toe, including the game board, players, and game state. The game can
@@ -76,12 +78,35 @@ public static Game from(File gameFile) throws IOException, ClassNotFoundExceptio
     return persistence.loadFrom(gameFile);
   }
 
+  /**
+   * Constructs a new {@link Game} instance with a 3x3 game board, persistence disabled, and a bot
+   * player as player 'X' and a bot player as player 'O'.
+   */
+  public static Game ofBots() {
+    return new Game(
+        3,
+        false,
+        new PlayerNode.Local<>("X", new BotPlayer()),
+        new PlayerNode.Local<>("O", new BotPlayer()));
+  }
+
   /**
    * Plays the game, rendering the board, applying player moves, and persisting the game state if
    * enabled. The game continues until a winning player is found or there are no more moves
    * available, at which point the winner or tie is logged.
    */
   public void play() {
+    playWithAction(null);
+  }
+
+  /**
+   * Plays the game, rendering the board, applying player moves, and persisting the game state if
+   * enabled. The game continues until a winning player is found or there are no more moves
+   * available, at which point the winner or tie is logged.
+   *
+   * @param postMoveAction The action to perform after a move is made (if any)
+   */
+  public void playWithAction(Consumer<Game> postMoveAction) {
     try {
       GamePersistence persistence = new GamePersistence();
       File persistenceDir = gameFileDirectory();
@@ -104,6 +129,9 @@ public void play() {
         winningPlayer = checkWon(state);
         movesAvailable = state.hasMovesAvailable();
         currentPlayer = playerNodes.byIndex(state.currentPlayerIndex());
+        if (postMoveAction != null) {
+          postMoveAction.accept(this);
+        }
       }
 
       winningPlayer.ifPresentOrElse(
@@ -116,6 +144,49 @@ public void play() {
     }
   }
 
+  /**
+   * Returns the unique identifier for this game instance (Deprecated).
+   *
+   * @return the game ID
+   * @deprecated use {@link #id()} instead
+   */
+  @Deprecated(since = "1.5.0", forRemoval = true)
+  public UUID getGameId() {
+    return gameId;
+  }
+
+  /**
+   * Returns the unique identifier for this game instance.
+   *
+   * @return the game ID
+   */
+  public UUID id() {
+    return gameId;
+  }
+
+  @Override
+  public void close() throws Exception {
+    playerNodes.close();
+  }
+
+  /**
+   * Returns the number of players in the game.
+   *
+   * @return the number of players
+   */
+  public int numberOfPlayers() {
+    return playerNodes.playerMarkerList().size();
+  }
+
+  /** Returns the history of the game, including all moves made. */
+  public SequencedCollection<GameState> history() {
+    return gameState;
+  }
+
+  public int moveNumber() {
+    return moveNumber;
+  }
+
   private Optional<String> checkWon(GameState state) {
     return state.lastMove() > -1 && state.lastPlayerHasChain()
         ? Optional.of(state.playerMarkers().get(state.lastPlayerIndex()))
@@ -135,20 +206,6 @@ private GameState pushGameState(GameState state) {
     return state;
   }
 
-  /**
-   * Returns the unique identifier for this game instance.
-   *
-   * @return the game ID
-   */
-  public UUID getGameId() {
-    return gameId;
-  }
-
-  @Override
-  public void close() throws Exception {
-    playerNodes.close();
-  }
-
   private void renderBoard() {
     log.log(Level.INFO, "\n" + currentGameState().board());
   }

.idea/misc.xml

@@ -52,6 +52,15 @@ default boolean isEmpty() {
     return true;
   }
 
+  /**
+   * Checks if the given player is present at the given location on the game board.
+   *
+   * @param playerMarker the marker representing the player to check
+   * @param location the location on the game board to check
+   * @return true if the player is present at the given location, false otherwise
+   */
+  boolean hasPlayer(String playerMarker, int location);
+
   /**
    * Checks if the given player has a winning chain of connected game pieces on the game board.
    *

.idea/modules/api/overengineering-tictactoe.api.test.iml

@@ -144,6 +144,14 @@ public GameBoard clone() {
     return new GameBoardLocalImpl(dimension, getBoardCopy());
   }
 
+  @Override
+  public boolean hasPlayer(String playerMarker, int location) {
+    return location >= 0
+        && location < content.length
+        && content[location] != null
+        && content[location].equals(playerMarker);
+  }
+
   private String[] getBoardCopy() {
     String[] boardCopy = new String[dimension * dimension];
     System.arraycopy(content, 0, boardCopy, 0, boardCopy.length);

.idea/vcs.xml

@@ -149,7 +149,7 @@ public boolean lastPlayerHasChain() {
    * @return the last player's marker
    * @throws GameServiceException if there is no last move or the board is empty
    */
-  private String lastPlayer() {
+  public String lastPlayer() {
     if (lastMove < 0 || board.isEmpty()) {
       throw new GameServiceException("null last player");
     }