This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit f035e1251a05d5848daf78ae2a495b7b18acc236 Author: Graham Russell <[email protected]> AuthorDate: Thu Aug 15 10:31:27 2019 +0100 Use ThreadLocal.withInitial Part of #479 on github --- .../java/org/apache/jmeter/config/RandomVariableConfig.java | 10 ++++------ .../jmeter/extractor/json/jsonpath/JSONPostProcessor.java | 7 +------ .../src/main/java/org/apache/jmeter/control/IfController.java | 11 +++-------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java index 92acf02..922d8ad 100644 --- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java +++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java @@ -68,12 +68,10 @@ public class RandomVariableConfig extends ConfigTestElement private transient ThreadLocal<Random> perThreadRandom = initThreadLocal(); private ThreadLocal<Random> initThreadLocal() { - return new ThreadLocal<Random>() { - @Override - protected Random initialValue() { - init(); - return createRandom(); - }}; + return ThreadLocal.withInitial(() -> { + init(); + return createRandom(); + }); } private Object readResolve(){ diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java index 1f04905..e129145 100644 --- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java @@ -57,12 +57,7 @@ public class JSONPostProcessor private static final String SEPARATOR = ";"; // $NON-NLS-1$ public static final boolean COMPUTE_CONCATENATION_DEFAULT_VALUE = false; - private static final ThreadLocal<JSONManager> localMatcher = new ThreadLocal<JSONManager>() { - @Override - protected JSONManager initialValue() { - return new JSONManager(); - } - }; + private static final ThreadLocal<JSONManager> localMatcher = ThreadLocal.withInitial(JSONManager::new); @Override public void process() { diff --git a/src/core/src/main/java/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java index 1e1b0e2..a73d747 100644 --- a/src/core/src/main/java/org/apache/jmeter/control/IfController.java +++ b/src/core/src/main/java/org/apache/jmeter/control/IfController.java @@ -81,14 +81,9 @@ public class IfController extends GenericController implements Serializable, Thr getInstance().getEngineByName(NASHORN_ENGINE_NAME) == null; - private static final ThreadLocal<ScriptEngine> NASHORN_ENGINE = new ThreadLocal<ScriptEngine>() { - - @Override - protected ScriptEngine initialValue() { - return getInstance().getEngineByName("nashorn");//$NON-NLS-N$ - } - - }; + private static final ThreadLocal<ScriptEngine> NASHORN_ENGINE = ThreadLocal.withInitial(() -> { + return getInstance().getEngineByName("nashorn");//$NON-NLS-N$ + }); private interface JsEvaluator { boolean evaluate(String testElementName, String condition);
