replacement for ThreadLocal.withInitial()

Author: code-disaster

src/main/java/com/badlogic/gdx/concurrent/AsyncTask.java

@@ -102,7 +102,6 @@ public int await(Consumer<V> consumeAfterCompletion) throws InterruptedException
 		} catch (BrokenBarrierException e) {
 			throw new InterruptedException(e.getMessage());
 		} catch (ExecutionException e) {
-			e.printStackTrace(System.err);
 			throw new RuntimeException("Exception thrown during execution of asynchronous task!", e);
 		}
 	}

src/main/java/com/badlogic/gdx/concurrent/ThreadLocalInstance.java

@@ -0,0 +1,20 @@
+package com.badlogic.gdx.concurrent;
+
+import com.badlogic.gdx.function.Supplier;
+
+/**
+ * Substitute for {@link ThreadLocal#withInitial(Supplier)}
+ */
+public class ThreadLocalInstance<T> extends ThreadLocal<T> {
+
+	private final Supplier<? extends T> supplier;
+
+	public ThreadLocalInstance(Supplier<? extends T> supplier) {
+		this.supplier = supplier;
+	}
+
+	@Override
+	protected T initialValue() {
+		return supplier.get();
+	}
+}

src/main/java/com/badlogic/gdx/json/JsonFloatSerializer.java

@@ -1,5 +1,6 @@
 package com.badlogic.gdx.json;
 
+import com.badlogic.gdx.concurrent.ThreadLocalInstance;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.StringBuilder;
 
@@ -8,7 +9,7 @@
 
 /**
  * Utility functions to (optionally) store floats and doubles using a IEEE-754 bit masks.
- *
+ * <p>
  * Reference: http://the-witness.net/news/2011/12/engine-tech-concurrent-world-editing/
  */
 public class JsonFloatSerializer {
@@ -17,12 +18,8 @@ public class JsonFloatSerializer {
 	private static final Pattern purePattern = Pattern.compile("^" + fpRegEx + "$");
 	private static final Pattern ieeePattern = Pattern.compile("^0x([a-fA-F0-9]+)\\|" + fpRegEx + "$");
 
-	private static final ThreadLocal<StringBuilder> stringBuilder = new ThreadLocal<StringBuilder>() {
-		@Override
-		protected StringBuilder initialValue() {
-			return new StringBuilder(32);
-		}
-	};
+	private static final ThreadLocal<StringBuilder> stringBuilder =
+			new ThreadLocalInstance<>(() -> new StringBuilder(32));
 
 	public static String encodeFloatBits(float value) {
 

src/main/java/com/badlogic/gdx/lang/Box.java

@@ -1,5 +1,6 @@
 package com.badlogic.gdx.lang;
 
+import com.badlogic.gdx.concurrent.ThreadLocalInstance;
 import com.badlogic.gdx.function.Consumer;
 
 import java.lang.reflect.Array;
@@ -193,13 +194,13 @@ public void close() {
 	}
 
 	private static final ThreadLocal<BorrowChecker<Boolean>> tlsBoolean =
-			ThreadLocal.withInitial(() -> new BorrowChecker<>(Boolean.class));
+			new ThreadLocalInstance<>(() -> new BorrowChecker<>(Boolean.class));
 
 	private static final ThreadLocal<BorrowChecker<Integer>> tlsInteger =
-			ThreadLocal.withInitial(() -> new BorrowChecker<>(Integer.class));
+			new ThreadLocalInstance<>(() -> new BorrowChecker<>(Integer.class));
 
 	private static final ThreadLocal<BorrowChecker<Float>> tlsFloat =
-			ThreadLocal.withInitial(() -> new BorrowChecker<>(Float.class));
+			new ThreadLocalInstance<>(() -> new BorrowChecker<>(Float.class));
 
 	public static Boolean borrowBoolean() {
 		return tlsBoolean.get().borrow().reference();