[jmeter] branch master updated: Use ThreadLocal#withInitial to make code more concise

[fschumacher]

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


The following commit(s) were added to refs/heads/master by this push:
     new 1f70275  Use ThreadLocal#withInitial to make code more concise
1f70275 is described below

commit 1f70275e068e852eb13b61e11a631bc18cc34d1b
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Sat Aug 17 11:12:37 2019 +0200

    Use ThreadLocal#withInitial to make code more concise
---
 .../java/org/apache/jmeter/modifiers/CounterConfig.java    | 14 ++------------
 .../src/main/java/org/apache/jmeter/util/JMeterUtils.java  |  7 +------
 .../main/java/org/apache/jmeter/functions/FileWrapper.java |  7 +------
 .../java/org/apache/jmeter/functions/IterationCounter.java |  7 +------
 .../java/org/apache/jmeter/functions/XPathWrapper.java     |  7 +------
 5 files changed, 6 insertions(+), 36 deletions(-)

diff --git 
a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java 
b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
index 49b68d9..fb6d11b 100644
--- 
a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
+++ 
b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
@@ -68,18 +68,8 @@ public class CounterConfig extends AbstractTestElement
     private static final Logger log = 
LoggerFactory.getLogger(CounterConfig.class);
 
     private void init() { // WARNING: called from ctor so must not be 
overridden (i.e. must be private or final)
-        perTheadNumber = new ThreadLocal<Long>() {
-            @Override
-            protected Long initialValue() {
-                return Long.valueOf(getStart());
-            }
-        };
-        perTheadLastIterationNumber = new ThreadLocal<Long>() {
-            @Override
-            protected Long initialValue() {
-                return Long.valueOf(1);
-            }
-        };
+        perTheadNumber = ThreadLocal.withInitial(()-> 
Long.valueOf(getStart()));
+        perTheadLastIterationNumber = ThreadLocal.withInitial(() -> 
Long.valueOf(1));
     }
 
 
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java 
b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 2ab2497..7f5568e 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -122,12 +122,7 @@ public class JMeterUtils implements UnitTestManager {
 
     private static volatile boolean ignoreResorces = false; // Special flag 
for use in debugging resources
 
-    private static final ThreadLocal<Perl5Matcher> localMatcher = new 
ThreadLocal<Perl5Matcher>() {
-        @Override
-        protected Perl5Matcher initialValue() {
-            return new Perl5Matcher();
-        }
-    };
+    private static final ThreadLocal<Perl5Matcher> localMatcher = 
ThreadLocal.withInitial(Perl5Matcher::new);
 
     /**
      * Gets Perl5Matcher for this thread.
diff --git 
a/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java 
b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
index 840e883..51ec0ac 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/FileWrapper.java
@@ -52,12 +52,7 @@ public final class FileWrapper {
 
     /* The cache of file packs - used to improve thread access */
     private static final ThreadLocal<Map<String, FileWrapper>> filePacks =
-        new ThreadLocal<Map<String, FileWrapper>>() {
-        @Override
-        protected Map<String, FileWrapper> initialValue() {
-            return new HashMap<>();
-        }
-    };
+        ThreadLocal.withInitial(HashMap::new);
 
     private final FileRowColContainer container;
 
diff --git 
a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java 
b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
index 59071c4..7b90388 100644
--- 
a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
+++ 
b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
@@ -49,12 +49,7 @@ public class IterationCounter extends AbstractFunction {
        synchronized(this){
            globalCounter=0;
        }
-       perThreadInt = new ThreadLocal<Integer>(){
-            @Override
-            protected Integer initialValue() {
-                return Integer.valueOf(0);
-            }
-        };
+        perThreadInt = ThreadLocal.withInitial(() -> Integer.valueOf(0));
     }
 
     static {
diff --git 
a/src/functions/src/main/java/org/apache/jmeter/functions/XPathWrapper.java 
b/src/functions/src/main/java/org/apache/jmeter/functions/XPathWrapper.java
index abb8951..40203bb 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/XPathWrapper.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/XPathWrapper.java
@@ -52,12 +52,7 @@ final class XPathWrapper {
 
     /* The cache of file packs - for faster local access */
     private static final ThreadLocal<Map<String, XPathFileContainer>> 
filePacks =
-        new ThreadLocal<Map<String, XPathFileContainer>>() {
-        @Override
-        protected Map<String, XPathFileContainer> initialValue() {
-            return new HashMap<>();
-        }
-    };
+        ThreadLocal.withInitial(HashMap::new);
 
     private XPathWrapper() {// Prevent separate instantiation
         super();