jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1814102 - in /jmeter/trunk/src: components/org/apache/jmeter/assertions/gui/ components/org/apache/jmeter/extractor/json/jsonpath/ components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/samplers/ core/org/apache/jmeter/save/ core...
Date Thu, 02 Nov 2017 20:04:25 GMT
Author: pmouawad
Date: Thu Nov  2 20:04:25 2017
New Revision: 1814102

URL: http://svn.apache.org/viewvc?rev=1814102&view=rev
Log:
Removed commented out code
Contributed by Graham Russell
This comments #319

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
    jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
    jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
    jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java Thu
Nov  2 20:04:25 2017
@@ -213,8 +213,6 @@ public class HTMLAssertionGui extends Ab
         // doctype
         HorizontalPanel docTypePanel = new HorizontalPanel();
         docTypeBox = new JComboBox<>(new String[] { "omit", "auto", "strict", "loose"
});
-        // docTypePanel.add(new
-        // JLabel(JMeterUtils.getResString("duration_assertion_label"))); //$NON-NLS-1$
         docTypePanel.add(new JLabel("Doctype:"));
         docTypePanel.add(docTypeBox);
         assertionPanel.add(docTypePanel);

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
Thu Nov  2 20:04:25 2017
@@ -86,8 +86,6 @@ public class JSONPostProcessor extends A
         String[] defaultValues = getDefaultValues().split(SEPARATOR);
         int[] matchNumbers = getMatchNumbersAsInt(defaultValues.length);
 
-        //jsonResponse = jsonResponse.replaceAll("'", "\""); // $NON-NLS-1$  $NON-NLS-2$
-
         if (refNames.length != jsonPathExpressions.length ||
                 refNames.length != defaultValues.length) {
             log.error("Number of JSON Path variables must match number of default values
and json-path expressions, check you use separator ';' if you have many values"); // $NON-NLS-1$

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java Thu Nov
 2 20:04:25 2017
@@ -74,9 +74,8 @@ public class RenderAsRegexp implements R
     /** {@inheritDoc} */
     @Override
     public void clearData() {
+        // N.B. don't set regexpField to empty to keep regexp
         this.regexpDataField.setText(""); // $NON-NLS-1$
-        // don't set empty to keep regexp
-        // regexpField.setText(""); // $NON-NLS-1$
         this.regexpResultField.setText(""); // $NON-NLS-1$
     }
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java Thu Nov 
2 20:04:25 2017
@@ -89,9 +89,8 @@ public class RenderAsXPath implements Re
     /** {@inheritDoc} */
     @Override
     public void clearData() {
+        // N.B. don't set xpathExpressionField to empty to keep xpath
         this.xmlDataField.setText(""); // $NON-NLS-1$
-        // don't set empty to keep xpath
-        // xpathExpressionField.setText(""); // $NON-NLS-1$
         this.xpathResultField.setText(""); // $NON-NLS-1$
     }
 

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTreePanel.java Thu Nov
 2 20:04:25 2017
@@ -86,8 +86,7 @@ public class SearchTreePanel extends JPa
      * @deprecated only for use by test code
      */
     @Deprecated
-    public SearchTreePanel(){
-//        log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
+    public SearchTreePanel() {
     }
 
     private class EnterAction extends AbstractAction {

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java Thu Nov  2
20:04:25 2017
@@ -36,11 +36,6 @@ public interface RemoteSampleListener ex
 
     void testEnded(String host) throws RemoteException;
 
-    // Not currently needed by any Remoteable classes
-    // Anyway, would probably be too expensive in terms of network traffic
-    // 
-    // void testIterationStart(LoopIterationEvent event);
-    
     /**
      * This method is called remotely and fires a list of samples events
      * received locally. The function is to reduce network load when using

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Thu Nov  2 20:04:25 2017
@@ -751,7 +751,6 @@ public final class CSVSaveService {
         // quotes:
         public void append(String s) {
             addDelim();
-            // if (s == null) return;
             sb.append(quoteDelimiters(s, specials));
         }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Thu Nov  2 20:04:25 2017
@@ -373,7 +373,6 @@ public class SaveService {
     static List<String> checkClasses(){
         final ClassLoader classLoader = SaveService.class.getClassLoader();
         List<String> missingClasses = new ArrayList<>();
-        //boolean OK = true;
         for (Object clazz : classToAlias.keySet()) {
             String name = (String) clazz;
             if (!NameUpdater.isMapped(name)) {// don't bother checking class is present if
it is to be updated

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Thu
Nov  2 20:04:25 2017
@@ -58,8 +58,6 @@ public class SampleResultConverter exten
     protected static final String TAG_REDIRECT_LOCATION = "redirectLocation"; //$NON-NLS-1$
     protected static final String TAG_REQUEST_HEADER    = "requestHeader";    //$NON-NLS-1$
 
-    //NOT USED protected   static final String TAG_URL               = "requestUrl";    
  //$NON-NLS-1$
-
     protected static final String TAG_RESPONSE_DATA     = "responseData";     //$NON-NLS-1$
     protected static final String TAG_RESPONSE_HEADER   = "responseHeader";   //$NON-NLS-1$
     protected static final String TAG_SAMPLER_DATA      = "samplerData";      //$NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Thu
Nov  2 20:04:25 2017
@@ -538,24 +538,6 @@ public class GenericTestBeanCustomizer e
         }
     }
 
-//  /**
-//   * Find the index of the property of the given name.
-//   *
-//   * @param name
-//   *            the name of the property
-//   * @return the index of that property in the descriptors array, or -1 if
-//   *         there's no property of this name.
-//   */
-//  private int descriptorIndex(String name) // NOTUSED
-//  {
-//      for (int i = 0; i < descriptors.length; i++) {
-//          if (descriptors[i].getName().equals(name)) {
-//              return i;
-//          }
-//      }
-//      return -1;
-//  }
-
     /**
      * Initialize the GUI.
      */

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Thu Nov  2 20:04:25
2017
@@ -218,8 +218,6 @@ public TestElement createTestElement() {
             if(initialized) {
                 setValues(element);
             }
-            // configure(element);
-            // super.clear(); // set name, enabled.
             modifyTestElement(element); // put the default values back into the
             // new element
             return element;

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java?rev=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java Thu Nov  2 20:04:25
2017
@@ -91,7 +91,6 @@ public class BeanShellClient {
 
         public SockRead(InputStream _is) {
             this.is=_is;
-            //this.setDaemon(true);
         }
 
         @Override

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=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Thu Nov  2 20:04:25 2017
@@ -211,8 +211,6 @@ public class JMeterUtils implements Unit
                 }
                 p.load(is);
             } catch (IOException ex) {
-                // JMeter.fail("Could not read internal resource. " +
-                // "Archive is broken.");
             }
         } finally {
             JOrphanUtils.closeQuietly(is);

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=1814102&r1=1814101&r2=1814102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java Thu Nov  2 20:04:25 2017
@@ -129,13 +129,9 @@ public class JsseSSLManager extends SSLM
     @Override
     public void setContext(HttpURLConnection conn) {
         if (conn instanceof HttpsURLConnection) {
-/*
- * No point doing this on a per-connection basis, as there is currently no way to configure
it.
- * So we leave it to the defaults set up in the SSL Context
- *
- */
-//          HttpsURLConnection secureConn = (HttpsURLConnection) conn;
-//          secureConn.setSSLSocketFactory(this.getContext().getSocketFactory());
+             // No point doing this on a per-connection basis,
+             // as there is currently no way to configure it.
+             // So we leave it to the defaults set up in the SSL Context
         } else {
             if (log.isWarnEnabled()) {
                 log.warn("Unexpected HttpURLConnection class: {}", conn.getClass().getName());



Mime
View raw message