jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1697162 [3/4] - in /jmeter/trunk/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/control/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/modifiers/gui...
Date Sun, 23 Aug 2015 10:39:39 GMT
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java Sun Aug 23 10:39:36 2015
@@ -52,7 +52,7 @@ public class JMeterContext {
 
     private boolean restartNextLoop = false;
 
-    private ConcurrentHashMap<String, Object> samplerContext = new ConcurrentHashMap<String, Object>(5);
+    private ConcurrentHashMap<String, Object> samplerContext = new ConcurrentHashMap<>(5);
 
     JMeterContext() {
         clear0();

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Sun Aug 23 10:39:36 2015
@@ -140,7 +140,7 @@ public class JMeterThread implements Run
         testTree = test;
         compiler = new TestCompiler(testTree);
         controller = (Controller) testTree.getArray()[0];
-        SearchByClass<TestIterationListener> threadListenerSearcher = new SearchByClass<TestIterationListener>(TestIterationListener.class); // TL - IS
+        SearchByClass<TestIterationListener> threadListenerSearcher = new SearchByClass<>(TestIterationListener.class); // TL - IS
         test.traverse(threadListenerSearcher);
         testIterationStartListeners = threadListenerSearcher.getSearchResults();
         notifier = note;
@@ -510,7 +510,7 @@ public class JMeterThread implements Run
         List<SampleListener> sampleListeners = samplePack.getSampleListeners();
         // Do not send subsamples to listeners which receive the transaction sample
         if(transactionSampler != null) {
-            ArrayList<SampleListener> onlySubSamplerListeners = new ArrayList<SampleListener>();
+            ArrayList<SampleListener> onlySubSamplerListeners = new ArrayList<>();
             List<SampleListener> transListeners = transactionPack.getSampleListeners();
             for(SampleListener listener : sampleListeners) {
                 // Check if this instance is present in transaction listener list

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java Sun Aug 23 10:39:36 2015
@@ -32,7 +32,7 @@ import org.apache.jmeter.util.JMeterUtil
  * These are similar to properties, but they are local to a single thread.
  */
 public class JMeterVariables {
-    private final Map<String, Object> variables = new HashMap<String, Object>();
+    private final Map<String, Object> variables = new HashMap<>();
 
     private int iteration = 0;
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ import org.apache.log.Logger;
 public class RemoteThreadsListenerImpl extends UnicastRemoteObject implements
         RemoteThreadsListener, ThreadListener {
     private static final Logger log = LoggingManager.getLoggerForClass();
-    private final List<RemoteThreadsLifeCycleListener> listeners = new ArrayList<RemoteThreadsLifeCycleListener>();
+    private final List<RemoteThreadsLifeCycleListener> listeners = new ArrayList<>();
 
     /**
      * 

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java Sun Aug 23 10:39:36 2015
@@ -76,14 +76,14 @@ public class TestCompiler implements Has
      * If the ObjectPair (child, parent) is present, then the child has been added.
      * Otherwise, the child is added to the parent and the pair is added to the Set.
      */
-    private static final Set<ObjectPair> PAIRING = new HashSet<ObjectPair>();
+    private static final Set<ObjectPair> PAIRING = new HashSet<>();
 
-    private final LinkedList<TestElement> stack = new LinkedList<TestElement>();
+    private final LinkedList<TestElement> stack = new LinkedList<>();
 
-    private final Map<Sampler, SamplePackage> samplerConfigMap = new HashMap<Sampler, SamplePackage>();
+    private final Map<Sampler, SamplePackage> samplerConfigMap = new HashMap<>();
 
     private final Map<TransactionController, SamplePackage> transactionControllerConfigMap =
-        new HashMap<TransactionController, SamplePackage>();
+            new HashMap<>();
 
     private final HashTree testTree;
 
@@ -204,17 +204,17 @@ public class TestCompiler implements Has
     }
 
     private void saveSamplerConfigs(Sampler sam) {
-        List<ConfigTestElement> configs = new LinkedList<ConfigTestElement>();
-        List<Controller> controllers = new LinkedList<Controller>();
-        List<SampleListener> listeners = new LinkedList<SampleListener>();
-        List<Timer> timers = new LinkedList<Timer>();
-        List<Assertion> assertions = new LinkedList<Assertion>();
-        LinkedList<PostProcessor> posts = new LinkedList<PostProcessor>();
-        LinkedList<PreProcessor> pres = new LinkedList<PreProcessor>();
+        List<ConfigTestElement> configs = new LinkedList<>();
+        List<Controller> controllers = new LinkedList<>();
+        List<SampleListener> listeners = new LinkedList<>();
+        List<Timer> timers = new LinkedList<>();
+        List<Assertion> assertions = new LinkedList<>();
+        LinkedList<PostProcessor> posts = new LinkedList<>();
+        LinkedList<PreProcessor> pres = new LinkedList<>();
         for (int i = stack.size(); i > 0; i--) {
             addDirectParentControllers(controllers, stack.get(i - 1));
-            List<PreProcessor>  tempPre = new LinkedList<PreProcessor> ();
-            List<PostProcessor> tempPost = new LinkedList<PostProcessor>();
+            List<PreProcessor>  tempPre = new LinkedList<>();
+            List<PostProcessor> tempPost = new LinkedList<>();
             for (Object item : testTree.list(stack.subList(0, i))) {
                 if ((item instanceof ConfigTestElement)) {
                     configs.add((ConfigTestElement) item);
@@ -247,13 +247,13 @@ public class TestCompiler implements Has
     }
 
     private void saveTransactionControllerConfigs(TransactionController tc) {
-        List<ConfigTestElement> configs = new LinkedList<ConfigTestElement>();
-        List<Controller> controllers = new LinkedList<Controller>();
-        List<SampleListener> listeners = new LinkedList<SampleListener>();
-        List<Timer> timers = new LinkedList<Timer>();
-        List<Assertion> assertions = new LinkedList<Assertion>();
-        LinkedList<PostProcessor> posts = new LinkedList<PostProcessor>();
-        LinkedList<PreProcessor> pres = new LinkedList<PreProcessor>();
+        List<ConfigTestElement> configs = new LinkedList<>();
+        List<Controller> controllers = new LinkedList<>();
+        List<SampleListener> listeners = new LinkedList<>();
+        List<Timer> timers = new LinkedList<>();
+        List<Assertion> assertions = new LinkedList<>();
+        LinkedList<PostProcessor> posts = new LinkedList<>();
+        LinkedList<PreProcessor> pres = new LinkedList<>();
         for (int i = stack.size(); i > 0; i--) {
             addDirectParentControllers(controllers, stack.get(i - 1));
             for (Object item : testTree.list(stack.subList(0, i))) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java Sun Aug 23 10:39:36 2015
@@ -77,7 +77,7 @@ public class ThreadGroup extends Abstrac
     private transient Thread threadStarter;
 
     // List of active threads
-    private final Map<JMeterThread, Thread> allThreads = new ConcurrentHashMap<JMeterThread, Thread>();
+    private final Map<JMeterThread, Thread> allThreads = new ConcurrentHashMap<>();
 
     /**
      * Is test (still) running?

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sun Aug 23 10:39:36 2015
@@ -83,7 +83,7 @@ public class JMeterUtils implements Unit
 
     private static volatile Properties appProperties;
 
-    private static final Vector<LocaleChangeListener> localeChangeListeners = new Vector<LocaleChangeListener>();
+    private static final Vector<LocaleChangeListener> localeChangeListeners = new Vector<>();
 
     private static volatile Locale locale;
 
@@ -668,7 +668,7 @@ public class JMeterUtils implements Unit
     // TODO - does not appear to be called directly
     public static Vector<Object> getControllers(Properties properties) {
         String name = "controller."; // $NON-NLS-1$
-        Vector<Object> v = new Vector<Object>();
+        Vector<Object> v = new Vector<>();
         Enumeration<?> names = properties.keys();
         while (names.hasMoreElements()) {
             String prop = (String) names.nextElement();
@@ -735,7 +735,7 @@ public class JMeterUtils implements Unit
      * @return The Vector value
      */
     public static Vector<String> getVector(Properties properties, String name) {
-        Vector<String> v = new Vector<String>();
+        Vector<String> v = new Vector<>();
         Enumeration<?> names = properties.keys();
         while (names.hasMoreElements()) {
             String prop = (String) names.nextElement();
@@ -767,7 +767,7 @@ public class JMeterUtils implements Unit
      *         the prefix removed
      */
     public static Hashtable<String, String> getHashtable(Properties properties, String prefix) {
-        Hashtable<String, String> t = new Hashtable<String, String>();
+        Hashtable<String, String> t = new Hashtable<>();
         Enumeration<?> names = properties.keys();
         final int length = prefix.length();
         while (names.hasMoreElements()) {
@@ -970,7 +970,7 @@ public class JMeterUtils implements Unit
      * @return Description of the Returned Value
      */
     public static Vector<Object> instantiate(Vector<String> v, String className) {
-        Vector<Object> i = new Vector<Object>();
+        Vector<Object> i = new Vector<>();
         try {
             Class<?> c = Class.forName(className);
             Enumeration<String> elements = v.elements();
@@ -1289,7 +1289,7 @@ public class JMeterUtils implements Unit
      * @return a map name/value for each header
      */
     public static LinkedHashMap<String, String> parseHeaders(String headers) {
-        LinkedHashMap<String, String> linkedHeaders = new LinkedHashMap<String, String>();
+        LinkedHashMap<String, String> linkedHeaders = new LinkedHashMap<>();
         String[] list = headers.split("\n"); // $NON-NLS-1$
         for (String header : list) {
             int colon = header.indexOf(':'); // $NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JSR223BeanInfoSupport.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ public abstract class JSR223BeanInfoSupp
     public static final String[][] LANGUAGE_NAMES;
 
     static {
-        Map<String, ScriptEngineFactory> nameMap = new HashMap<String, ScriptEngineFactory>();
+        Map<String, ScriptEngineFactory> nameMap = new HashMap<>();
         ScriptEngineManager sem = new ScriptEngineManager();
         final List<ScriptEngineFactory> engineFactories = sem.getEngineFactories();
         for(ScriptEngineFactory fact : engineFactories){

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java Sun Aug 23 10:39:36 2015
@@ -112,7 +112,7 @@ public class JsseSSLManager extends SSLM
                 log.debug("Creating shared context");
                 this.defaultContext = createContext();
             } else {
-                this.threadlocal = new ThreadLocal<SSLContext>();
+                this.threadlocal = new ThreadLocal<>();
             }
 
             HttpsURLConnection.setDefaultSSLSocketFactory(new HttpSSLProtocolSocketFactory(this, CPS));

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ import org.w3c.dom.Node;
 public class PropertiesBasedPrefixResolver extends PrefixResolverDefault {
     private static final Logger logger = LoggingManager.getLoggerForClass();
     private static final String XPATH_NAMESPACE_CONFIG = "xpath.namespace.config";
-    private static final Map<String, String> NAMESPACE_MAP = new HashMap<String, String>();
+    private static final Map<String, String> NAMESPACE_MAP = new HashMap<>();
     static {
         String pathToNamespaceConfig = JMeterUtils.getPropDefault(XPATH_NAMESPACE_CONFIG, "");
         if(!StringUtils.isEmpty(pathToNamespaceConfig)) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java Sun Aug 23 10:39:36 2015
@@ -59,8 +59,8 @@ public final class JmeterKeyStore {
     private String clientCertAliasVarName;
 
     private String[] names = new String[0]; // default empty array to prevent NPEs
-    private Map<String, PrivateKey> privateKeyByAlias = new HashMap<String, PrivateKey>();
-    private Map<String, X509Certificate[]> certsByAlias = new HashMap<String, X509Certificate[]>();
+    private Map<String, PrivateKey> privateKeyByAlias = new HashMap<>();
+    private Map<String, X509Certificate[]> certsByAlias = new HashMap<>();
 
     //@GuardedBy("this")
     private int last_user;
@@ -114,9 +114,9 @@ public final class JmeterKeyStore {
         char pw[] = pword==null ? null : pword.toCharArray();
         store.load(is, pw);
     
-        ArrayList<String> v_names = new ArrayList<String>();
-        this.privateKeyByAlias = new HashMap<String, PrivateKey>();
-        this.certsByAlias = new HashMap<String, X509Certificate[]>();
+        ArrayList<String> v_names = new ArrayList<>();
+        this.privateKeyByAlias = new HashMap<>();
+        this.certsByAlias = new HashMap<>();
 
         if (null != is){ // No point checking an empty keystore
             PrivateKey _key = null;

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractHostIPName.java Sun Aug 23 10:39:36 2015
@@ -30,7 +30,7 @@ import org.apache.jmeter.util.JMeterUtil
 
 abstract class AbstractHostIPName extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     static {
         // desc.add("Use fully qualified host name: TRUE/FALSE (Default FALSE)");

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ public class BeanShell extends AbstractF
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__BeanShell"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java Sun Aug 23 10:39:36 2015
@@ -55,7 +55,7 @@ public class CSVRead extends AbstractFun
 
     private static final String KEY = "__CSVRead"; // Function name //$NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private Object[] values; // Parameter list
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java Sun Aug 23 10:39:36 2015
@@ -37,7 +37,7 @@ public class CharFunction extends Abstra
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__char"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java Sun Aug 23 10:39:36 2015
@@ -49,7 +49,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class EscapeHtml extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__escapeHtml"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeOroRegexpChars.java Sun Aug 23 10:39:36 2015
@@ -38,7 +38,7 @@ import org.apache.oro.text.regex.Perl5Co
 public class EscapeOroRegexpChars extends AbstractFunction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__escapeOroRegexpChars"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class EvalFunction extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__eval"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java Sun Aug 23 10:39:36 2015
@@ -44,7 +44,7 @@ public class EvalVarFunction extends Abs
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__evalVar"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/FileRowColContainer.java Sun Aug 23 10:39:36 2015
@@ -58,7 +58,7 @@ public class FileRowColContainer {
         fileName = file;
         delimiter = delim;
         nextRow = 0;
-        fileData = new ArrayList<List<String>>();
+        fileData = new ArrayList<>();
         load();
     }
 
@@ -67,7 +67,7 @@ public class FileRowColContainer {
         fileName = file;
         delimiter = DELIMITER;
         nextRow = 0;
-        fileData = new ArrayList<List<String>>();
+        fileData = new ArrayList<>();
         load();
     }
 
@@ -144,7 +144,7 @@ public class FileRowColContainer {
      *         the line
      */
     private static List<String> splitLine(String theLine, String delim) {
-        ArrayList<String> result = new ArrayList<String>();
+        ArrayList<String> result = new ArrayList<>();
         StringTokenizer tokener = new StringTokenizer(theLine, delim, true);
         /*
          * the beginning of the line is a "delimiter" so that ,a,b,c returns ""

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java Sun Aug 23 10:39:36 2015
@@ -51,7 +51,7 @@ import org.apache.log.Logger;
 public class FileToString extends AbstractFunction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__FileToString";//$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java Sun Aug 23 10:39:36 2015
@@ -48,15 +48,14 @@ public final class FileWrapper {
      * - maps file names to  containers
      * - ensures only one container per file across all threads
      */
-    private static final Map<String, FileRowColContainer> fileContainers =
-        new HashMap<String, FileRowColContainer>();
+    private static final Map<String, FileRowColContainer> fileContainers = new HashMap<>();
 
     /* 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<String, FileWrapper>();
+            return new HashMap<>();
         }
     };
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ import org.apache.jmeter.util.JMeterUtil
  * @since 1.8.1
  */
 public class IntSum extends AbstractFunction {
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__intSum"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class IterationCounter extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__counter"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ import org.mozilla.javascript.Scriptable
  */
 public class JavaScript extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__javaScript"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java Sun Aug 23 10:39:36 2015
@@ -46,9 +46,9 @@ public class Jexl2Function extends Abstr
 
     private static final String KEY = "__jexl2"; //$NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
-    private static final ThreadLocal<JexlEngine> threadLocalJexl = new ThreadLocal<JexlEngine>();
+    private static final ThreadLocal<JexlEngine> threadLocalJexl = new ThreadLocal<>();
 
     static
     {

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java Sun Aug 23 10:39:36 2015
@@ -46,7 +46,7 @@ public class JexlFunction extends Abstra
 
     private static final String KEY = "__jexl"; //$NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     static
     {

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java Sun Aug 23 10:39:36 2015
@@ -49,7 +49,7 @@ import org.apache.log.Priority;
 public class LogFunction extends AbstractFunction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__log"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java Sun Aug 23 10:39:36 2015
@@ -47,7 +47,7 @@ import org.apache.log.Logger;
 public class LogFunction2 extends AbstractFunction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__logn"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class LongSum extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__longSum"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java Sun Aug 23 10:39:36 2015
@@ -44,7 +44,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class Property extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__property"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java Sun Aug 23 10:39:36 2015
@@ -49,7 +49,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class Property2 extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__P"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class Random extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
     private static final String KEY = "__Random"; //$NON-NLS-1$
 
     static {

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java Sun Aug 23 10:39:36 2015
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
 public class RandomString extends AbstractFunction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__RandomString"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java Sun Aug 23 10:39:36 2015
@@ -57,7 +57,7 @@ public class RegexFunction extends Abstr
 
     private Object[] values;// Parameters are stored here
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String TEMPLATE_PATTERN = "\\$(\\d+)\\$";  //$NON-NLS-1$
     /** initialised to the regex \$(\d+)\$ */
@@ -151,7 +151,7 @@ public class RegexFunction extends Abstr
             return defaultValue;
         }
 
-        List<MatchResult> collectAllMatches = new ArrayList<MatchResult>();
+        List<MatchResult> collectAllMatches = new ArrayList<>();
         try {
             PatternMatcher matcher = JMeterUtils.getMatcher();
             PatternMatcherInput input = new PatternMatcherInput(textToMatch);
@@ -246,9 +246,9 @@ public class RegexFunction extends Abstr
     }
 
     private Object[] generateTemplate(String rawTemplate) {
-        List<String> pieces = new ArrayList<String>();
+        List<String> pieces = new ArrayList<>();
         // String or Integer
-        List<Object> combined = new LinkedList<Object>();
+        List<Object> combined = new LinkedList<>();
         PatternMatcher matcher = JMeterUtils.getMatcher();
         Util.split(pieces, matcher, templatePattern, rawTemplate);
         PatternMatcherInput input = new PatternMatcherInput(rawTemplate);

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ public class SamplerName extends Abstrac
 
     private static final String KEY = "__samplerName"; //$NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     static {
         // desc.add("Use fully qualified host name: TRUE/FALSE (Default FALSE)");

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java Sun Aug 23 10:39:36 2015
@@ -43,7 +43,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class SetProperty extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__setProperty"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java Sun Aug 23 10:39:36 2015
@@ -57,7 +57,7 @@ import org.apache.log.Logger;
 public class SplitFunction extends AbstractFunction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__split";// $NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java Sun Aug 23 10:39:36 2015
@@ -67,7 +67,7 @@ public class StringFromFile extends Abst
     private static final Logger log = LoggingManager.getLoggerForClass();
 
     // Only modified by static block so no need to synchronize subsequent read-only access
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__StringFromFile";//$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ import org.apache.jmeter.services.FileSe
  */
 public class TestPlanName extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__TestPlanName"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java Sun Aug 23 10:39:36 2015
@@ -34,7 +34,7 @@ public class ThreadNumber extends Abstra
 
     private static final String KEY = "__threadNum"; //$NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     /** {@inheritDoc} */
     @Override

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java Sun Aug 23 10:39:36 2015
@@ -42,10 +42,10 @@ public class TimeFunction extends Abstra
 
     private static final String KEY = "__time"; // $NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     // Only modified in class init
-    private static final Map<String, String> aliases = new HashMap<String, String>();
+    private static final Map<String, String> aliases = new HashMap<>();
 
     static {
         desc.add(JMeterUtils.getResString("time_format")); //$NON-NLS-1$

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class UnEscape extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__unescape"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java Sun Aug 23 10:39:36 2015
@@ -45,7 +45,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class UnEscapeHtml extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__unescapeHtml"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlDecode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlDecode.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlDecode.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlDecode.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ public class UrlDecode extends AbstractF
 
     private static final String CHARSET_ENCODING = "UTF-8"; //$NON-NLS-1$
     
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__urldecode"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlEncode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlEncode.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlEncode.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UrlEncode.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ public class UrlEncode extends AbstractF
 
     private static final String CHARSET_ENCODING = "UTF-8"; //$NON-NLS-1$
     
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__urlencode"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Uuid.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Uuid.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Uuid.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Uuid.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ import java.util.UUID;
  */
 public class Uuid extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__UUID"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class Variable extends AbstractFunction {
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private static final String KEY = "__V"; //$NON-NLS-1$
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java Sun Aug 23 10:39:36 2015
@@ -54,7 +54,7 @@ public class XPath extends AbstractFunct
     // }
     private static final String KEY = "__XPath"; // Function name //$NON-NLS-1$
 
-    private static final List<String> desc = new LinkedList<String>();
+    private static final List<String> desc = new LinkedList<>();
 
     private Object[] values; // Parameter list
 

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java Sun Aug 23 10:39:36 2015
@@ -50,14 +50,14 @@ final class XPathWrapper {
      */
     //@GuardedBy("fileContainers")
     private static final Map<String, XPathFileContainer> fileContainers =
-        new HashMap<String, XPathFileContainer>();
+            new HashMap<>();
 
     /* 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<String, XPathFileContainer>();
+            return new HashMap<>();
         }
     };
 

Modified: jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java Sun Aug 23 10:39:36 2015
@@ -223,7 +223,7 @@ public final class CLArgsParser {
     public CLArgsParser(final String[] args, final CLOptionDescriptor[] optionDescriptors, final ParserControl control) {
         m_optionDescriptors = optionDescriptors;
         m_control = control;
-        m_options = new Vector<CLOption>();
+        m_options = new Vector<>();
         m_args = args;
 
         try {
@@ -666,7 +666,7 @@ public final class CLArgsParser {
      */
     private final void buildOptionIndex() {
         final int size = m_options.size();
-        m_optionIndex = new Hashtable<Object, CLOption>(size * 2);
+        m_optionIndex = new Hashtable<>(size * 2);
 
         for (int i = 0; i < size; i++) {
             final CLOption option = m_options.get(i);

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java Sun Aug 23 10:39:36 2015
@@ -57,8 +57,8 @@ public class Data implements Serializabl
      * Constructor - takes no arguments.
      */
     public Data() {
-        header = new ArrayList<String>();
-        data = new HashMap<String, List<Object>>();
+        header = new ArrayList<>();
+        data = new HashMap<>();
         currentPos = -1;
         size = currentPos + 1;
     }
@@ -151,10 +151,10 @@ public class Data implements Serializabl
 
     public void addRow() {
         String[] headers = getHeaders();
-        List<Object> tempList = new ArrayList<Object>();
+        List<Object> tempList = new ArrayList<>();
         for (int i = 0; i < headers.length; i++) {
             if ((tempList = data.get(header.get(i))) == null) {
-                tempList = new ArrayList<Object>();
+                tempList = new ArrayList<>();
                 data.put(headers[i], tempList);
             }
             tempList.add("");
@@ -271,7 +271,7 @@ public class Data implements Serializabl
     public void addColumnValue(String column, Object value) {
         List<Object> tempList;
         if ((tempList = data.get(column)) == null) {
-            tempList = new ArrayList<Object>();
+            tempList = new ArrayList<>();
             data.put(column, tempList);
         }
         int s = tempList.size();
@@ -320,7 +320,7 @@ public class Data implements Serializabl
     public void setColumnValue(String column, Object value) {
         List<Object> tempList;
         if ((tempList = data.get(column)) == null) {
-            tempList = new ArrayList<Object>();
+            tempList = new ArrayList<>();
             data.put(column, tempList);
         }
 
@@ -468,10 +468,10 @@ public class Data implements Serializabl
      */
     public void setHeaders(String[] h) {
         int x = 0;
-        header = new ArrayList<String>(h.length);
+        header = new ArrayList<>(h.length);
         for (x = 0; x < h.length; x++) {
             header.add(h[x]);
-            data.put(h[x], new ArrayList<Object>());
+            data.put(h[x], new ArrayList<>());
         }
     }
 
@@ -597,7 +597,7 @@ public class Data implements Serializabl
      */
     public void addHeader(String s) {
         header.add(s);
-        data.put(s, new ArrayList<Object>(Math.max(size(), 100)));
+        data.put(s, new ArrayList<>(Math.max(size(), 100)));
     }
 
     /**

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java Sun Aug 23 10:39:36 2015
@@ -98,7 +98,7 @@ public class HashTree implements Seriali
         if(_map != null) {
             data = _map;
         } else {
-            data = new HashMap<Object, HashTree>();
+            data = new HashMap<>();
         }
         if(key != null) {
             data.put(key, new HashTree());
@@ -215,7 +215,7 @@ public class HashTree implements Seriali
      *            a collection of objects to be added to the created HashTree.
      */
     public HashTree(Collection<?> keys) {
-        data = new HashMap<Object, HashTree>();
+        data = new HashMap<>();
         for (Object o : keys) {
             data.put(o, new HashTree());
         }
@@ -229,7 +229,7 @@ public class HashTree implements Seriali
      *            array with names for the new top-level nodes
      */
     public HashTree(Object[] keys) {
-        data = new HashMap<Object, HashTree>();
+        data = new HashMap<>();
         for (int x = 0; x < keys.length; x++) {
             data.put(keys[x], new HashTree());
         }

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java Sun Aug 23 10:39:36 2015
@@ -45,7 +45,7 @@ public class ListedHashTree extends Hash
 
     public ListedHashTree() {
         super();
-        order = new LinkedList<Object>();
+        order = new LinkedList<>();
     }
 
     public ListedHashTree(Object key) {

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java Sun Aug 23 10:39:36 2015
@@ -54,9 +54,9 @@ import java.util.Map;
  *            Class that should be searched for
  */
 public class SearchByClass<T> implements HashTreeTraverser {
-    private final List<T> objectsOfClass = new LinkedList<T>();
+    private final List<T> objectsOfClass = new LinkedList<>();
 
-    private final Map<Object, ListedHashTree> subTrees = new HashMap<Object, ListedHashTree>();
+    private final Map<Object, ListedHashTree> subTrees = new HashMap<>();
 
     private final Class<T> searchClass;
 

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Sun Aug 23 10:39:36 2015
@@ -136,7 +136,7 @@ public class KeyToolUtils {
             throws IOException {
         final File workingDir = keystore.getParentFile();
         final SystemCommand nativeCommand = new SystemCommand(workingDir, null);
-        final List<String> arguments = new ArrayList<String>();
+        final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
         arguments.add("-genkeypair"); // $NON-NLS-1$
         arguments.add("-alias"); // $NON-NLS-1$
@@ -305,7 +305,7 @@ public class KeyToolUtils {
     public static String list(final File keystore, final String storePass) throws IOException {
         final File workingDir = keystore.getParentFile();
         final SystemCommand nativeCommand = new SystemCommand(workingDir, null);
-        final List<String> arguments = new ArrayList<String>();
+        final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
         arguments.add("-list"); // $NON-NLS-1$
         arguments.add("-v"); // $NON-NLS-1$
@@ -368,7 +368,7 @@ public class KeyToolUtils {
             throws IOException {
         final File workingDir = keystore.getParentFile();
         final SystemCommand nativeCommand = new SystemCommand(workingDir, 0L, 0, null, input, output, null);
-        final List<String> arguments = new ArrayList<String>();
+        final List<String> arguments = new ArrayList<>();
         arguments.add(getKeyToolPath());
         arguments.add(command);
         arguments.add("-keystore"); // $NON-NLS-1$
@@ -420,7 +420,7 @@ public class KeyToolUtils {
      */
     private static boolean checkKeytool(String keytoolPath) {
         final SystemCommand nativeCommand = new SystemCommand(null, null);
-        final List<String> arguments = new ArrayList<String>();
+        final List<String> arguments = new ArrayList<>();
         arguments.add(keytoolPath);
         arguments.add("-help"); // $NON-NLS-1$
         try {

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java Sun Aug 23 10:39:36 2015
@@ -36,11 +36,11 @@ public abstract class AbstractTreeTableM
     protected final TreeNode rootNode;
     protected final EventListenerList listener = new EventListenerList();
 
-    protected transient final List<Object> objects = new ArrayList<Object>();
+    protected transient final List<Object> objects = new ArrayList<>();
 
-    protected transient final List<String> headers = new ArrayList<String>();
+    protected transient final List<String> headers = new ArrayList<>();
 
-    protected transient final List<Class<?>> classes = new ArrayList<Class<?>>();
+    protected transient final List<Class<?>> classes = new ArrayList<>();
 
     protected transient final List<Functor> readFunctors;
 
@@ -48,8 +48,8 @@ public abstract class AbstractTreeTableM
 
     public AbstractTreeTableModel(TreeNode root) {
         this.rootNode = root;
-        readFunctors = new ArrayList<Functor>();
-        writeFunctors = new ArrayList<Functor>();
+        readFunctors = new ArrayList<>();
+        writeFunctors = new ArrayList<>();
     }
 
     public AbstractTreeTableModel(String[] headers,
@@ -59,8 +59,8 @@ public abstract class AbstractTreeTableM
         this.rootNode = null;
         this.headers.addAll(Arrays.asList(headers));
         this.classes.addAll(Arrays.asList(editorClasses));
-        this.readFunctors = new ArrayList<Functor>(Arrays.asList(readFunctors));
-        this.writeFunctors = new ArrayList<Functor>(Arrays.asList(writeFunctors));
+        this.readFunctors = new ArrayList<>(Arrays.asList(readFunctors));
+        this.writeFunctors = new ArrayList<>(Arrays.asList(writeFunctors));
     }
 
     /**

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java Sun Aug 23 10:39:36 2015
@@ -125,7 +125,7 @@ public final class GuiUtils {
         Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
         Transferable trans = clipboard.getContents(null);
         DataFlavor[] flavourList = trans.getTransferDataFlavors();
-        Collection<DataFlavor> flavours = new ArrayList<DataFlavor>(flavourList.length);
+        Collection<DataFlavor> flavours = new ArrayList<>(flavourList.length);
         if (Collections.addAll(flavours, flavourList) && flavours.contains(DataFlavor.stringFlavor)) {
             return (String) trans.getTransferData(DataFlavor.stringFlavor);
         } else {

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java Sun Aug 23 10:39:36 2015
@@ -43,7 +43,7 @@ public class JLabeledChoice extends JPan
     private final JComboBox<String> choiceList;
 
     // Maybe move to vector if MT problems occur
-    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3);
+    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<>(3);
 
     private JButton delete, add;
 
@@ -95,7 +95,7 @@ public class JLabeledChoice extends JPan
      */
     @Override
     public List<JComponent> getComponentList() {
-        List<JComponent> comps = new LinkedList<JComponent>();
+        List<JComponent> comps = new LinkedList<>();
         comps.add(mLabel);
         comps.add(choiceList);
         return comps;

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java Sun Aug 23 10:39:36 2015
@@ -50,7 +50,7 @@ public class JLabeledTextArea extends JP
     private final JTextArea mTextArea;
 
     // Maybe move to vector if MT problems occur
-    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3);
+    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<>(3);
 
     // A temporary cache for the focus listener
     private String oldValue = "";
@@ -94,7 +94,7 @@ public class JLabeledTextArea extends JP
      */
     @Override
     public List<JComponent> getComponentList() {
-        List<JComponent> comps = new LinkedList<JComponent>();
+        List<JComponent> comps = new LinkedList<>();
         comps.add(mLabel);
         comps.add(mTextArea);
         return comps;

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java Sun Aug 23 10:39:36 2015
@@ -49,7 +49,7 @@ public class JLabeledTextField extends J
     private JTextField mTextField;
 
     // Maybe move to vector if MT problems occur
-    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3);
+    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<>(3);
 
     // A temporary cache for the focus listener
     private String oldValue = "";
@@ -94,7 +94,7 @@ public class JLabeledTextField extends J
      */
     @Override
     public List<JComponent> getComponentList() {
-        List<JComponent> comps = new LinkedList<JComponent>();
+        List<JComponent> comps = new LinkedList<>();
         comps.add(mLabel);
         comps.add(mTextField);
         return comps;

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java Sun Aug 23 10:39:36 2015
@@ -39,15 +39,15 @@ public class ObjectTableModel extends De
 
     private static final long serialVersionUID = 240L;
 
-    private transient ArrayList<Object> objects = new ArrayList<Object>();
+    private transient ArrayList<Object> objects = new ArrayList<>();
 
-    private transient List<String> headers = new ArrayList<String>();
+    private transient List<String> headers = new ArrayList<>();
 
-    private transient ArrayList<Class<?>> classes = new ArrayList<Class<?>>();
+    private transient ArrayList<Class<?>> classes = new ArrayList<>();
 
-    private transient ArrayList<Functor> readFunctors = new ArrayList<Functor>();
+    private transient ArrayList<Functor> readFunctors = new ArrayList<>();
 
-    private transient ArrayList<Functor> writeFunctors = new ArrayList<Functor>();
+    private transient ArrayList<Functor> writeFunctors = new ArrayList<>();
 
     private transient Class<?> objectClass = null; // if provided
     
@@ -98,8 +98,8 @@ public class ObjectTableModel extends De
     public ObjectTableModel(String[] headers, Functor[] readFunctors, Functor[] writeFunctors, Class<?>[] editorClasses) {
         this.headers.addAll(Arrays.asList(headers));
         this.classes.addAll(Arrays.asList(editorClasses));
-        this.readFunctors = new ArrayList<Functor>(Arrays.asList(readFunctors));
-        this.writeFunctors = new ArrayList<Functor>(Arrays.asList(writeFunctors));
+        this.readFunctors = new ArrayList<>(Arrays.asList(readFunctors));
+        this.writeFunctors = new ArrayList<>(Arrays.asList(writeFunctors));
 
         int numHeaders = headers.length;
 
@@ -121,11 +121,11 @@ public class ObjectTableModel extends De
     }
 
     private Object readResolve() {
-        objects = new ArrayList<Object>();
-        headers = new ArrayList<String>();
-        classes = new ArrayList<Class<?>>();
-        readFunctors = new ArrayList<Functor>();
-        writeFunctors = new ArrayList<Functor>();
+        objects = new ArrayList<>();
+        headers = new ArrayList<>();
+        classes = new ArrayList<>();
+        readFunctors = new ArrayList<>();
+        writeFunctors = new ArrayList<>();
         return this;
     }
 
@@ -202,7 +202,7 @@ public class ObjectTableModel extends De
     /** {@inheritDoc} */
     @Override
     public void moveRow(int start, int end, int to) {
-        List<Object> subList = new ArrayList<Object>(objects.subList(start, end));
+        List<Object> subList = new ArrayList<>(objects.subList(start, end));
         for (int x = end - 1; x >= start; x--) {
             objects.remove(x);
         }

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ import org.apache.commons.lang3.mutable.
 public abstract class StatCalculator<T extends Number & Comparable<? super T>> {
 
     // key is the type to collect (usually long), value = count of entries
-    private final Map<T, MutableLong> valuesMap = new TreeMap<T, MutableLong>();
+    private final Map<T, MutableLong> valuesMap = new TreeMap<>();
     // We use a TreeMap because we need the entries to be sorted
 
     // Running values, updated for each sample
@@ -165,7 +165,7 @@ public abstract class StatCalculator<T e
      * TODO - why is the key value also stored in the entry array? See Bug 53825
      */
     public Map<Number, Number[]> getDistribution() {
-        Map<Number, Number[]> items = new HashMap<Number, Number[]>();
+        Map<Number, Number[]> items = new HashMap<>();
 
         for (Entry<T, MutableLong> entry : valuesMap.entrySet()) {
             Number[] dis = new Number[2];

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Sun Aug 23 10:39:36 2015
@@ -167,7 +167,7 @@ public final class ClassFinder {
 
     // For each directory in the search path, add all the jars found there
     private static String[] addJarsInPath(String[] paths) {
-        Set<String> fullList = new HashSet<String>();
+        Set<String> fullList = new HashSet<>();
         for (int i = 0; i < paths.length; i++) {
             final String path = paths[i];
             fullList.add(path); // Keep the unexpanded path
@@ -317,7 +317,7 @@ public final class ClassFinder {
 //            }
 //        }
 
-        return new ArrayList<String>(listClasses);//subClassList);
+        return new ArrayList<>(listClasses);//subClassList);
     }
 
     /*
@@ -335,7 +335,7 @@ public final class ClassFinder {
         }
 
         // find all jar files or paths that end with strPathOrJar
-        ArrayList<String> listPaths = new ArrayList<String>();
+        ArrayList<String> listPaths = new ArrayList<>();
         String strPath = null;
         while (stPaths.hasMoreTokens()) {
             strPath = fixPathEntry(stPaths.nextToken());

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Sun Aug 23 10:39:36 2015
@@ -92,7 +92,7 @@ public final class JOrphanUtils {
                 splittee = splittee.substring(0,splittee.length()-splitLength);
             }
         }
-        List<String> returns = new ArrayList<String>();
+        List<String> returns = new ArrayList<>();
         final int length = splittee.length(); // This is the new length
         int start = 0;
         spot = 0;
@@ -145,7 +145,7 @@ public final class JOrphanUtils {
     public static String[] split(String splittee, String delims, String def) {
         StringTokenizer tokens = new StringTokenizer(splittee,delims,def!=null);
         boolean lastWasDelim=false;
-        List<String> strList=new ArrayList<String>();
+        List<String> strList = new ArrayList<>();
         while (tokens.hasMoreTokens()) {
             String tok=tokens.nextToken();
             if (   tok.length()==1 // we have a single character; could be a token

Modified: jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java (original)
+++ jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java Sun Aug 23 10:39:36 2015
@@ -372,7 +372,7 @@ implements ChangeListener, ActionListene
     private String[] getMethodNames(Class<?> clazz)
     {
         Method[] meths = clazz.getMethods();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (int idx=0; idx < meths.length; idx++){
             final Method method = meths[idx];
             final String name = method.getName();

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java Sun Aug 23 10:39:36 2015
@@ -57,8 +57,8 @@ public class MonitorAccumModel implement
      *
      */
     public MonitorAccumModel() {
-        serverListMap = new HashMap<String, List<MonitorModel>>();
-        listeners = new LinkedList<MonitorListener>();
+        serverListMap = new HashMap<>();
+        listeners = new LinkedList<>();
     }
 
     public int getBufferSize() {

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java Sun Aug 23 10:39:36 2015
@@ -38,7 +38,7 @@ import org.apache.jmeter.util.JMeterUtil
 public class MonitorHealthPanel extends JPanel implements MonitorListener, Clearable {
     private static final long serialVersionUID = 240L;
 
-    private final Map<String, ServerPanel> serverPanelMap = new HashMap<String, ServerPanel>();
+    private final Map<String, ServerPanel> serverPanelMap = new HashMap<>();
 
     private JPanel servers = null;
 

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java Sun Aug 23 10:39:36 2015
@@ -118,7 +118,7 @@ public class MonitorPerformancePanel ext
      */
     public MonitorPerformancePanel(MonitorAccumModel model, MonitorGraph graph) {
         super();
-        this.SERVERMAP = new HashMap<String, DefaultMutableTreeNode>();
+        this.SERVERMAP = new HashMap<>();
         this.MODEL = model;
         this.MODEL.addListener(this);
         this.GRAPH = graph;

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ public class StatusImpl implements Statu
      */
     public StatusImpl() {
         super();
-        connectors = new LinkedList<Connector>();
+        connectors = new LinkedList<>();
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java Sun Aug 23 10:39:36 2015
@@ -31,7 +31,7 @@ public class WorkersImpl implements Work
      */
     public WorkersImpl() {
         super();
-        worker = new LinkedList<Worker>();
+        worker = new LinkedList<>();
     }
 
     @Override

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java Sun Aug 23 10:39:36 2015
@@ -71,7 +71,7 @@ public class MonitorHandler extends Defa
     public void startDocument() throws SAXException {
         // this.startDoc = true;
         // Reset all work variables so reusing the instance starts afresh.
-        this.stacktree = new Stack<Object>();
+        this.stacktree = new Stack<>();
         this.status = null;
         this.jvm = null;
         this.memory = null;

Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (original)
+++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java Sun Aug 23 10:39:36 2015
@@ -58,7 +58,7 @@ public class FTPSampler extends Abstract
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<String>(
+    private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
             Arrays.asList(new String[]{
                     "org.apache.jmeter.config.gui.LoginConfigGui",
                     "org.apache.jmeter.protocol.ftp.config.gui.FtpConfigGui",

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java Sun Aug 23 10:39:36 2015
@@ -121,7 +121,7 @@ public class AuthManager extends ConfigT
      * Default Constructor.
      */
     public AuthManager() {
-        setProperty(new CollectionProperty(AUTH_LIST, new ArrayList<Object>()));
+        setProperty(new CollectionProperty(AUTH_LIST, new ArrayList<>()));
     }
 
     /** {@inheritDoc} */
@@ -129,7 +129,7 @@ public class AuthManager extends ConfigT
     public void clear() {
         super.clear();
         kerberosManager.clearSubjects();
-        setProperty(new CollectionProperty(AUTH_LIST, new ArrayList<Object>()));
+        setProperty(new CollectionProperty(AUTH_LIST, new ArrayList<>()));
     }
 
     /**

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Sun Aug 23 10:39:36 2015
@@ -316,7 +316,7 @@ public class CookieManager extends Confi
      */
     private void clearCookies() {
         log.debug("Clear all cookies from store");
-        setProperty(new CollectionProperty(COOKIES, new ArrayList<Object>()));
+        setProperty(new CollectionProperty(COOKIES, new ArrayList<>()));
     }
 
     /**

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java Sun Aug 23 10:39:36 2015
@@ -100,7 +100,7 @@ public class DNSCacheManager extends Con
     public Object clone() {
         DNSCacheManager clone = (DNSCacheManager) super.clone();
         clone.systemDefaultDnsResolver = new SystemDefaultDnsResolver();
-        clone.cache = new LinkedHashMap<String, InetAddress[]>();
+        clone.cache = new LinkedHashMap<>();
         CollectionProperty dnsServers = getServers();
         try {
             String[] serverNames = new String[dnsServers.size()];

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java Sun Aug 23 10:39:36 2015
@@ -166,7 +166,7 @@ public class HC4CookieHandler implements
      */
     List<org.apache.http.cookie.Cookie> getCookiesForUrl(
             CollectionProperty cookiesCP, URL url, boolean allowVariableCookie) {
-        List<org.apache.http.cookie.Cookie> cookies = new ArrayList<org.apache.http.cookie.Cookie>();
+        List<org.apache.http.cookie.Cookie> cookies = new ArrayList<>();
 
         for (PropertyIterator iter = cookiesCP.iterator(); iter.hasNext();) {
             Cookie jmcookie = (Cookie) iter.next().getObjectValue();
@@ -187,7 +187,7 @@ public class HC4CookieHandler implements
 
         CookieOrigin cookieOrigin = new CookieOrigin(host, port, path, secure);
 
-        List<org.apache.http.cookie.Cookie> cookiesValid = new ArrayList<org.apache.http.cookie.Cookie>();
+        List<org.apache.http.cookie.Cookie> cookiesValid = new ArrayList<>();
         for (org.apache.http.cookie.Cookie cookie : cookies) {
             if (cookieSpec.match(cookie, cookieOrigin)) {
                 cookiesValid.add(cookie);



Mime
View raw message