From f7e8636f47f4b7107d5b59f7ab3f8638cc7cdb23 Mon Sep 17 00:00:00 2001
From: skedwards88 <skedwards88@gmail.com>
Date: Fri, 17 Jul 2026 11:00:23 -0700
Subject: [PATCH] remove the patch forcing java client to use 2.2.1

---
 .../core/runner/drivers/ClientLanguage.java   |  3 --
 .../core/runner/drivers/impls/JavaDriver.java | 32 +++++++++----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/dtsx/docs/core/runner/drivers/ClientLanguage.java b/src/main/java/com/dtsx/docs/core/runner/drivers/ClientLanguage.java
index 20d18d0..30ee064 100644
--- a/src/main/java/com/dtsx/docs/core/runner/drivers/ClientLanguage.java
+++ b/src/main/java/com/dtsx/docs/core/runner/drivers/ClientLanguage.java
@@ -65,9 +65,6 @@ public enum ClientLanguage {
     private final SnapshotsReducer snapshotsReducer;
 
     public @Nullable String defaultArtifact() {
-        if (this == JAVA) {
-            return "files(\"" + CLI_DIR.toAbsolutePath() + "/astra-db-java-2.2.1-patched.jar\")"; // TODO remove this once Java is patched + update JavaDriver.extractClientVersion
-        }
         return defaultArtifact;
     }
 
diff --git a/src/main/java/com/dtsx/docs/core/runner/drivers/impls/JavaDriver.java b/src/main/java/com/dtsx/docs/core/runner/drivers/impls/JavaDriver.java
index 564e8c3..5d54937 100644
--- a/src/main/java/com/dtsx/docs/core/runner/drivers/impls/JavaDriver.java
+++ b/src/main/java/com/dtsx/docs/core/runner/drivers/impls/JavaDriver.java
@@ -112,22 +112,20 @@ public RunResult executeScript(BaseScriptRunnerCtx ctx, ExecutionEnvironment exe
 
     @Override
     public Optional<String> extractClientVersion(BaseScriptRunnerCtx ctx, ExecutionEnvironment execEnv) {
-        return Optional.of("v2.2.1"); // TODO remove once Java is patched and remove ClientLanguage.defaultArtifact
-
-//        val result = ExternalPrograms.custom().run(execEnv.envDir(), "./gradlew", "dependencies", "--configuration", "runtimeClasspath");
-//
-//        if (result.notOk()) {
-//            throw new RunException("Failed to extract Java client version: " + result.output());
-//        }
-//
-//        val output = result.stdout();
-//        val pattern = Pattern.compile("com\\.datastax\\.astra:astra-db-java:([\\d.]+(?:-[\\w.]+)?)");
-//        val matcher = pattern.matcher(output);
-//
-//        if (matcher.find()) {
-//            return Optional.of("v" + matcher.group(1));
-//        }
-//
-//        return Optional.of("unknown");
+       val result = ExternalPrograms.custom().run(execEnv.envDir(), "./gradlew", "dependencies", "--configuration", "runtimeClasspath");
+
+       if (result.notOk()) {
+           throw new RunException("Failed to extract Java client version: " + result.output());
+       }
+
+       val output = result.stdout();
+       val pattern = Pattern.compile("com\\.datastax\\.astra:astra-db-java:([\\d.]+(?:-[\\w.]+)?)");
+       val matcher = pattern.matcher(output);
+
+       if (matcher.find()) {
+           return Optional.of("v" + matcher.group(1));
+       }
+
+       return Optional.of("unknown");
     }
 }