Undo other hacks

Author: nicktindall

server/src/main/java/org/elasticsearch/common/Randomness.java

@@ -87,12 +87,7 @@ public static Random get(Settings settings, Setting<Long> setting) {
      *                               RandomizedContext or tests are
      *                               running but tests.seed is not set
      */
-    @SuppressForbidden(reason = "Need to hack something for virtual threads")
     public static Random get() {
-        if (Thread.currentThread().isVirtual()) {
-            // Need to work out how to propagate context to virtual threads
-            return ThreadLocalRandom.current();
-        }
         if (currentMethod != null && getRandomMethod != null) {
             try {
                 Object randomizedContext = currentMethod.invoke(null);

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

@@ -207,7 +207,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -1037,15 +1036,6 @@ public static boolean randomBoolean() {
         return random().nextBoolean();
     }
 
-    public static Random random() {
-        // I don't think carrotsearch's random context work with virtual threads at the moment
-        if (Thread.currentThread().isVirtual()) {
-            return ThreadLocalRandom.current();
-        } else {
-            return LuceneTestCase.random();
-        }
-    }
-
     public static Boolean randomOptionalBoolean() {
         return randomBoolean() ? Boolean.TRUE : randomFrom(Boolean.FALSE, null);
     }