Author: fschumacher
Date: Mon Feb 12 12:00:48 2018
New Revision: 1823949

URL: http://svn.apache.org/viewvc?rev=1823949&view=rev
Log:
Get down to a maximum length of 160 chars

Part of #358 on github. Based on contribution by Graham Russell (graham at 
ham1.co.uk)

Modified:
    jmeter/trunk/checkstyle.xml
    jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
    
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java
    
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
    
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
    
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
    jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
    
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
    
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
    
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
    
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/checkstyle.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/checkstyle.xml?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- jmeter/trunk/checkstyle.xml (original)
+++ jmeter/trunk/checkstyle.xml Mon Feb 12 12:00:48 2018
@@ -170,7 +170,7 @@
     </module>
     <module name="LineLength">
       <!-- TODO: reduce this to 120 -->
-      <property name="max" value="165"/>
+      <property name="max" value="160"/>
     </module>
 
     <!-- whitespace -->

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java 
Mon Feb 12 12:00:48 2018
@@ -92,9 +92,10 @@ public class HTMLAssertion extends Abstr
         try {
             if (log.isDebugEnabled()) {
                 log.debug(
-                        "Setting up tidy... doctype: {}, errors only: {}, 
error threshold: {}, warning threshold: {}, html mode: {}, xhtml mode: {}, xml 
mode: {}.",
-                        getDoctype(), isErrorsOnly(), getErrorThreshold(), 
getWarningThreshold(), isHTML(), isXHTML(),
-                        isXML());
+                        "Setting up tidy... doctype: {}, errors only: {}, 
error threshold: {},"
+                                + "warning threshold: {}, html mode: {}, xhtml 
mode: {}, xml mode: {}.",
+                        getDoctype(), isErrorsOnly(), getErrorThreshold(),
+                        getWarningThreshold(), isHTML(), isXHTML(), isXML());
             }
             tidy = new Tidy();
             tidy.setInputEncoding(StandardCharsets.UTF_8.name());

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
 Mon Feb 12 12:00:48 2018
@@ -462,7 +462,8 @@ public class ModuleControllerGui extends
         private static final long serialVersionUID = 1129098620102526299L;
         
         /**
-         * @see 
javax.swing.tree.DefaultTreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree,
 java.lang.Object, boolean, boolean, boolean, int, boolean)
+         * @see 
javax.swing.tree.DefaultTreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree,
+         *      java.lang.Object, boolean, boolean, boolean, int, boolean)
          */
         @Override
         public Component getTreeCellRendererComponent(JTree tree, Object 
value, boolean selected, boolean expanded,

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsJSON.java 
Mon Feb 12 12:00:48 2018
@@ -37,7 +37,9 @@ public class RenderAsJSON extends Sample
     // This 'other value' regex is deliberately weak, even accepting an empty 
string, to be useful when reporting malformed data.
     private static final String OTHER_VALUE_REGEX = "[^\\{\\[\\]\\}\\,]*"; // 
$NON-NLS-1$
 
-    private static final String VALUE_OR_PAIR_REGEX = "((" + STRING_REGEX + 
"\\s*:)?\\s*(" + STRING_REGEX + "|" + OTHER_VALUE_REGEX + ")\\s*,?\\s*)"; // 
$NON-NLS-1$
+    private static final String VALUE_OR_PAIR_REGEX = "((" + STRING_REGEX
+            + "\\s*:)?\\s*(" + STRING_REGEX + "|" + OTHER_VALUE_REGEX
+            + ")\\s*,?\\s*)"; // $NON-NLS-1$
 
     private static final Pattern VALUE_OR_PAIR_PATTERN = 
Pattern.compile(VALUE_OR_PAIR_REGEX);
 

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java 
(original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java 
Mon Feb 12 12:00:48 2018
@@ -232,20 +232,58 @@ public abstract class SamplerResultTab i
                 String typeResult = samplerClass.substring(1 + 
samplerClass.lastIndexOf('.'));
                 
                 StringBuilder statsBuff = new StringBuilder(200);
-                
statsBuff.append(JMeterUtils.getResString("view_results_thread_name")).append(sampleResult.getThreadName()).append(NL);
 //$NON-NLS-1$
-                String startTime = dateFormat.format(new 
Date(sampleResult.getStartTime()));
-                
statsBuff.append(JMeterUtils.getResString("view_results_sample_start")).append(startTime).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_load_time")).append(sampleResult.getTime()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_connect_time")).append(sampleResult.getConnectTime()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_latency")).append(sampleResult.getLatency()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_size_in_bytes")).append(sampleResult.getBytesAsLong()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_sent_bytes")).append(sampleResult.getSentBytes()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_size_headers_in_bytes")).append(sampleResult.getHeadersSize()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_size_body_in_bytes")).append(sampleResult.getBodySizeAsLong()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_sample_count")).append(sampleResult.getSampleCount()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_error_count")).append(sampleResult.getErrorCount()).append(NL);
 //$NON-NLS-1$
-                
statsBuff.append(JMeterUtils.getResString("view_results_datatype")).append(sampleResult.getDataType()).append(NL);
 //$NON-NLS-1$
-                statsDoc.insertString(statsDoc.getLength(), 
statsBuff.toString(), null);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_thread_name")) 
//$NON-NLS-1$
+                        .append(sampleResult.getThreadName()).append(NL);
+                String startTime = dateFormat
+                        .format(new Date(sampleResult.getStartTime()));
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_sample_start")) 
//$NON-NLS-1$
+                        .append(startTime).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_load_time")) 
//$NON-NLS-1$
+                        .append(sampleResult.getTime()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_connect_time")) 
//$NON-NLS-1$
+                        .append(sampleResult.getConnectTime()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_latency")) 
//$NON-NLS-1$
+                        .append(sampleResult.getLatency()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_size_in_bytes")) 
//$NON-NLS-1$
+                        .append(sampleResult.getBytesAsLong()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_sent_bytes")) 
//$NON-NLS-1$
+                        .append(sampleResult.getSentBytes()).append(NL);
+                statsBuff
+                        .append(JMeterUtils.getResString(
+                                "view_results_size_headers_in_bytes")) 
//$NON-NLS-1$
+                        .append(sampleResult.getHeadersSize()).append(NL);
+                statsBuff
+                        .append(JMeterUtils.getResString(
+                                "view_results_size_body_in_bytes")) 
//$NON-NLS-1$
+                        .append(sampleResult.getBodySizeAsLong()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_sample_count")) 
//$NON-NLS-1$
+                        .append(sampleResult.getSampleCount()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_error_count")) 
//$NON-NLS-1$
+                        .append(sampleResult.getErrorCount()).append(NL);
+                statsBuff
+                        .append(JMeterUtils
+                                .getResString("view_results_datatype")) 
//$NON-NLS-1$
+                        .append(sampleResult.getDataType()).append(NL);
+                statsDoc.insertString(statsDoc.getLength(),
+                        statsBuff.toString(), null);
                 statsBuff.setLength(0); // reset for reuse
 
                 String responseCode = sampleResult.getResponseCode();
@@ -281,31 +319,76 @@ public abstract class SamplerResultTab i
                 // response message label
                 String responseMsgStr = sampleResult.getResponseMessage();
 
-                
statsBuff.append(JMeterUtils.getResString("view_results_response_message")).append(responseMsgStr).append(NL);
 //$NON-NLS-1$
+                statsBuff
+                        .append(JMeterUtils
+                                
.getResString("view_results_response_message")) //$NON-NLS-1$
+                        .append(responseMsgStr).append(NL);
                 statsBuff.append(NL);
-                
statsBuff.append(JMeterUtils.getResString("view_results_response_headers")).append(NL);
 //$NON-NLS-1$
+                statsBuff
+                        .append(JMeterUtils
+                                
.getResString("view_results_response_headers")) //$NON-NLS-1$
+                        .append(NL);
                 statsBuff.append(sampleResult.getResponseHeaders()).append(NL);
                 statsBuff.append(NL);
-                statsBuff.append(typeResult + " "+ 
JMeterUtils.getResString("view_results_fields")).append(NL); //$NON-NLS-1$ 
$NON-NLS-2$
-                statsBuff.append("ContentType: 
").append(sampleResult.getContentType()).append(NL); //$NON-NLS-1$
-                statsBuff.append("DataEncoding: 
").append(sampleResult.getDataEncodingNoDefault()).append(NL); //$NON-NLS-1$
+                statsBuff
+                        .append(typeResult + " " //$NON-NLS-1$
+                                + JMeterUtils
+                                        .getResString("view_results_fields"))
+                        .append(NL); // $NON-NLS-2$
+                statsBuff.append("ContentType: ") //$NON-NLS-1$
+                        .append(sampleResult.getContentType()).append(NL);
+                statsBuff.append("DataEncoding: ") //$NON-NLS-1$
+                        .append(sampleResult.getDataEncodingNoDefault())
+                        .append(NL);
                 statsDoc.insertString(statsDoc.getLength(), 
statsBuff.toString(), null);
                 statsBuff = null; // NOSONAR Help gc
                 
                 // Tabbed results: fill table
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_thread_name"), 
sampleResult.getThreadName())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_sample_start"), startTime)); 
//$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_load_time"), 
sampleResult.getTime())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_connect_time"), 
sampleResult.getConnectTime())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_latency"), 
sampleResult.getLatency())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_size_in_bytes"), 
sampleResult.getBytesAsLong())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_sent_bytes"),sampleResult.getSentBytes()));
 //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_size_headers_in_bytes"), 
sampleResult.getHeadersSize())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_size_body_in_bytes"), 
sampleResult.getBodySizeAsLong())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_sample_count"), 
sampleResult.getSampleCount())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_error_count"), 
sampleResult.getErrorCount())); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_response_code"), 
responseCode)); //$NON-NLS-1$
-                resultModel.addRow(new 
RowResult(JMeterUtils.getParsedLabel("view_results_response_message"), 
responseMsgStr)); //$NON-NLS-1$
+                resultModel.addRow(new RowResult(
+                        
JMeterUtils.getParsedLabel("view_results_thread_name"), //$NON-NLS-1$
+                        sampleResult.getThreadName()));
+                resultModel.addRow(new RowResult(
+                        
JMeterUtils.getParsedLabel("view_results_sample_start"), //$NON-NLS-1$
+                        startTime));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils.getParsedLabel("view_results_load_time"), 
//$NON-NLS-1$
+                        sampleResult.getTime()));
+                resultModel.addRow(new RowResult(
+                        
JMeterUtils.getParsedLabel("view_results_connect_time"), //$NON-NLS-1$
+                        sampleResult.getConnectTime()));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils.getParsedLabel("view_results_latency"), 
//$NON-NLS-1$
+                        sampleResult.getLatency()));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils
+                                .getParsedLabel("view_results_size_in_bytes"), 
//$NON-NLS-1$
+                        sampleResult.getBytesAsLong()));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils.getParsedLabel("view_results_sent_bytes"), 
//$NON-NLS-1$
+                        sampleResult.getSentBytes()));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils.getParsedLabel(
+                                "view_results_size_headers_in_bytes"), 
//$NON-NLS-1$
+                        sampleResult.getHeadersSize()));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils.getParsedLabel(
+                                "view_results_size_body_in_bytes"), 
//$NON-NLS-1$
+                        sampleResult.getBodySizeAsLong()));
+                resultModel.addRow(new RowResult(
+                        
JMeterUtils.getParsedLabel("view_results_sample_count"), //$NON-NLS-1$
+                        sampleResult.getSampleCount()));
+                resultModel.addRow(new RowResult(
+                        
JMeterUtils.getParsedLabel("view_results_error_count"), //$NON-NLS-1$
+                        sampleResult.getErrorCount()));
+                resultModel
+                        .addRow(new RowResult(
+                                JMeterUtils.getParsedLabel(
+                                        "view_results_response_code"), 
//$NON-NLS-1$
+                                responseCode));
+                resultModel.addRow(new RowResult(
+                        JMeterUtils.getParsedLabel(
+                                "view_results_response_message"), //$NON-NLS-1$
+                        responseMsgStr));
                 
                 // Parsed response headers
                 LinkedHashMap<String, String> lhm = 
JMeterUtils.parseHeaders(sampleResult.getResponseHeaders());

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
 Mon Feb 12 12:00:48 2018
@@ -164,11 +164,21 @@ public class GraphiteBackendListenerClie
             }
         }        
         UserMetric userMetric = getUserMetrics();
-        graphiteMetricsManager.addMetric(timestampInSeconds, 
TEST_CONTEXT_NAME, METRIC_MIN_ACTIVE_THREADS, 
Integer.toString(userMetric.getMinActiveThreads()));
-        graphiteMetricsManager.addMetric(timestampInSeconds, 
TEST_CONTEXT_NAME, METRIC_MAX_ACTIVE_THREADS, 
Integer.toString(userMetric.getMaxActiveThreads()));
-        graphiteMetricsManager.addMetric(timestampInSeconds, 
TEST_CONTEXT_NAME, METRIC_MEAN_ACTIVE_THREADS, 
Integer.toString(userMetric.getMeanActiveThreads()));
-        graphiteMetricsManager.addMetric(timestampInSeconds, 
TEST_CONTEXT_NAME, METRIC_STARTED_THREADS, 
Integer.toString(userMetric.getStartedThreads()));
-        graphiteMetricsManager.addMetric(timestampInSeconds, 
TEST_CONTEXT_NAME, METRIC_FINISHED_THREADS, 
Integer.toString(userMetric.getFinishedThreads()));
+        graphiteMetricsManager.addMetric(timestampInSeconds, TEST_CONTEXT_NAME,
+                METRIC_MIN_ACTIVE_THREADS,
+                Integer.toString(userMetric.getMinActiveThreads()));
+        graphiteMetricsManager.addMetric(timestampInSeconds, TEST_CONTEXT_NAME,
+                METRIC_MAX_ACTIVE_THREADS,
+                Integer.toString(userMetric.getMaxActiveThreads()));
+        graphiteMetricsManager.addMetric(timestampInSeconds, TEST_CONTEXT_NAME,
+                METRIC_MEAN_ACTIVE_THREADS,
+                Integer.toString(userMetric.getMeanActiveThreads()));
+        graphiteMetricsManager.addMetric(timestampInSeconds, TEST_CONTEXT_NAME,
+                METRIC_STARTED_THREADS,
+                Integer.toString(userMetric.getStartedThreads()));
+        graphiteMetricsManager.addMetric(timestampInSeconds, TEST_CONTEXT_NAME,
+                METRIC_FINISHED_THREADS,
+                Integer.toString(userMetric.getFinishedThreads()));
 
         graphiteMetricsManager.writeAndSendMetrics();
     }
@@ -185,14 +195,24 @@ public class GraphiteBackendListenerClie
 
         // See https://bz.apache.org/bugzilla/show_bug.cgi?id=57350
         if(metric.getTotal() > 0) { 
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_OK_COUNT, Integer.toString(metric.getSuccesses()));
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_KO_COUNT, Integer.toString(metric.getFailures()));
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_ALL_COUNT, Integer.toString(metric.getTotal()));
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_ALL_HITS_COUNT, Integer.toString(metric.getHits()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_OK_COUNT, Integer.toString(metric.getSuccesses()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_KO_COUNT, Integer.toString(metric.getFailures()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_ALL_COUNT, Integer.toString(metric.getTotal()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_ALL_HITS_COUNT, Integer.toString(metric.getHits()));
             if(metric.getSuccesses()>0) {
-                graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, METRIC_OK_MIN_RESPONSE_TIME, 
Double.toString(metric.getOkMinTime()));
-                graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, METRIC_OK_MAX_RESPONSE_TIME, 
Double.toString(metric.getOkMaxTime()));
-                graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, METRIC_OK_AVG_RESPONSE_TIME, Double.toString(metric.getOkMean()));
+                graphiteMetricsManager.addMetric(timestampInSeconds,
+                        contextName, METRIC_OK_MIN_RESPONSE_TIME,
+                        Double.toString(metric.getOkMinTime()));
+                graphiteMetricsManager.addMetric(timestampInSeconds,
+                        contextName, METRIC_OK_MAX_RESPONSE_TIME,
+                        Double.toString(metric.getOkMaxTime()));
+                graphiteMetricsManager.addMetric(timestampInSeconds,
+                        contextName, METRIC_OK_AVG_RESPONSE_TIME,
+                        Double.toString(metric.getOkMean()));
                 for (Map.Entry<String, Float> entry : 
okPercentiles.entrySet()) {
                     graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, 
                             entry.getKey(), 
@@ -200,18 +220,30 @@ public class GraphiteBackendListenerClie
                 }
             } 
             if(metric.getFailures()>0) {
-                graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, METRIC_KO_MIN_RESPONSE_TIME, 
Double.toString(metric.getKoMinTime()));
-                graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, METRIC_KO_MAX_RESPONSE_TIME, 
Double.toString(metric.getKoMaxTime()));
-                graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, METRIC_KO_AVG_RESPONSE_TIME, Double.toString(metric.getKoMean()));
+                graphiteMetricsManager.addMetric(timestampInSeconds,
+                        contextName, METRIC_KO_MIN_RESPONSE_TIME,
+                        Double.toString(metric.getKoMinTime()));
+                graphiteMetricsManager.addMetric(timestampInSeconds,
+                        contextName, METRIC_KO_MAX_RESPONSE_TIME,
+                        Double.toString(metric.getKoMaxTime()));
+                graphiteMetricsManager.addMetric(timestampInSeconds,
+                        contextName, METRIC_KO_AVG_RESPONSE_TIME,
+                        Double.toString(metric.getKoMean()));
                 for (Map.Entry<String, Float> entry : 
koPercentiles.entrySet()) {
                     graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, 
                             entry.getKey(), 
                             
Double.toString(metric.getKoPercentile(entry.getValue().floatValue())));
                 }   
             }
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_ALL_MIN_RESPONSE_TIME, Double.toString(metric.getAllMinTime()));
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_ALL_MAX_RESPONSE_TIME, Double.toString(metric.getAllMaxTime()));
-            graphiteMetricsManager.addMetric(timestampInSeconds, contextName, 
METRIC_ALL_AVG_RESPONSE_TIME, Double.toString(metric.getAllMean()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_ALL_MIN_RESPONSE_TIME,
+                    Double.toString(metric.getAllMinTime()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_ALL_MAX_RESPONSE_TIME,
+                    Double.toString(metric.getAllMaxTime()));
+            graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+                    METRIC_ALL_AVG_RESPONSE_TIME,
+                    Double.toString(metric.getAllMean()));
             for (Map.Entry<String, Float> entry : allPercentiles.entrySet()) {
                 graphiteMetricsManager.addMetric(timestampInSeconds, 
contextName, 
                         entry.getKey(), 

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java
 Mon Feb 12 12:00:48 2018
@@ -29,9 +29,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Pickle Graphite format 
- * Partly based on 
https://github.com/BrightcoveOS/metrics-graphite-pickle/blob/master/src/main/java/com/brightcove/metrics/reporting/GraphitePickleReporter.java
 
- * as per license 
https://github.com/BrightcoveOS/metrics-graphite-pickle/blob/master/LICENSE.txt
+ * Pickle Graphite format Partly based on
+ * 
https://github.com/BrightcoveOS/metrics-graphite-pickle/blob/master/src/main/java/com/brightcove/metrics/reporting/GraphitePickleReporter.java
+ * as per license
+ * 
https://github.com/BrightcoveOS/metrics-graphite-pickle/blob/master/LICENSE.txt
+ * 
  * @since 2.13
  */
 class PickleGraphiteMetricsSender extends AbstractGraphiteMetricsSender {
@@ -81,8 +83,12 @@ class PickleGraphiteMetricsSender extend
                 prefix);
     }
     
-    /* (non-Javadoc)
-     * @see 
org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#addMetric(long,
 java.lang.String, java.lang.String, java.lang.String)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.apache.jmeter.visualizers.backend.graphite.GraphiteMetricsSender#
+     * addMetric(long, java.lang.String, java.lang.String, java.lang.String)
      */
     @Override
     public void addMetric(long timestamp, String contextName, String 
metricName, String metricValue) {

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java 
Mon Feb 12 12:00:48 2018
@@ -214,7 +214,10 @@ public class TransactionController exten
                 }
                 res.setIdleTime(pauseTime+res.getIdleTime());
                 res.sampleEnd();
-                
res.setResponseMessage(TransactionController.NUMBER_OF_SAMPLES_IN_TRANSACTION_PREFIX
 + calls + ", number of failing samples : " + noFailingSamples);
+                res.setResponseMessage(
+                        
TransactionController.NUMBER_OF_SAMPLES_IN_TRANSACTION_PREFIX
+                                + calls + ", number of failing samples : "
+                                + noFailingSamples);
                 if(res.isSuccessful()) {
                     res.setResponseCodeOK();
                 }
@@ -249,7 +252,10 @@ public class TransactionController exten
                 res.setIdleTime(pauseTime + res.getIdleTime());
                 res.sampleEnd();
                 
res.setSuccessful(TRUE.equals(JMeterContextService.getContext().getVariables().get(JMeterThread.LAST_SAMPLE_OK)));
-                
res.setResponseMessage(TransactionController.NUMBER_OF_SAMPLES_IN_TRANSACTION_PREFIX
 + calls + ", number of failing samples : " + noFailingSamples);
+                res.setResponseMessage(
+                        
TransactionController.NUMBER_OF_SAMPLES_IN_TRANSACTION_PREFIX
+                                + calls + ", number of failing samples : "
+                                + noFailingSamples);
                 notifyListeners();
             }
         } else {

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
 (original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
 Mon Feb 12 12:00:48 2018
@@ -253,9 +253,13 @@ public class HtmlTemplateExporter extend
                                             || isController
                                             || !showControllerSeriesOnly;
                                     if(log.isDebugEnabled()) {
-                                        log.debug("name:{} matches pattern:{}, 
supportsControllerDiscrimination:{}, isController:{}, 
showControllerSeriesOnly:{}", 
-                                            name, filterPattern.pattern(), 
-                                            supportsControllerDiscrimination, 
isController, showControllerSeriesOnly);
+                                        log.debug(
+                                                "name:{} matches pattern:{}, 
supportsControllerDiscrimination:{}, "
+                                                + "isController:{}, 
showControllerSeriesOnly:{}",
+                                                name, filterPattern.pattern(),
+                                                
supportsControllerDiscrimination,
+                                                isController,
+                                                showControllerSeriesOnly);
                                     }
                                 } else {
                                     // If the name does not match the pattern,

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AbstractSampleSender.java 
Mon Feb 12 12:00:48 2018
@@ -31,7 +31,9 @@ public abstract class AbstractSampleSend
     private final boolean isClientConfigured = 
JMeterUtils.getPropDefault("sample_sender_client_configured", true); // 
$NON-NLS-1$
 
     /**
-     * @return boolean indicates how SampleSender configuration is done, true 
means use client properties and send to servers, false means use server 
configurations
+     * @return boolean indicates how SampleSender configuration is done, 
@{code true}
+     *         means use client properties and send to servers, {@code false} 
means use
+     *         server configurations
      */
     public boolean isClientConfigured() {
         return isClientConfigured;

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=1823949&r1=1823948&r2=1823949&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 
Mon Feb 12 12:00:48 2018
@@ -109,7 +109,8 @@ public final class JmeterKeyStore {
      *             if the key can not be recovered from the store (should not
      *             happen here, either)
      */
-    public void load(InputStream is, String pword) throws 
NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException, 
UnrecoverableKeyException {
+    public void load(InputStream is, String pword)
+            throws NoSuchAlgorithmException, CertificateException, 
IOException, KeyStoreException, UnrecoverableKeyException {
         char[] pw = pword==null ? null : pword.toCharArray();
         store.load(is, pw);
     

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 Mon Feb 12 12:00:48 2018
@@ -77,7 +77,8 @@ public class DefaultSamplerCreator exten
 
     /**
      * 
-     * @see 
org.apache.jmeter.protocol.http.proxy.SamplerCreator#createSampler(org.apache.jmeter.protocol.http.proxy.HttpRequestHdr,
 java.util.Map, java.util.Map)
+     * @see 
org.apache.jmeter.protocol.http.proxy.SamplerCreator#createSampler(org.apache.jmeter.protocol.http.proxy.HttpRequestHdr,
+     *      java.util.Map, java.util.Map)
      */
     @Override
     public HTTPSamplerBase createSampler(HttpRequestHdr request,

Modified: 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
 (original)
+++ 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
 Mon Feb 12 12:00:48 2018
@@ -405,7 +405,9 @@ public abstract class TestCacheManagerBa
     public void testClearCache() throws Exception {
         assertTrue("ThreadCache should be empty initially.", 
getThreadCache().isEmpty());
         cacheResultWithGivenCode("200");
-        assertFalse("ThreadCache should be populated after saving details for 
HttpMethod with SampleResult with response code 200.", 
getThreadCache().isEmpty());
+        assertFalse(
+                "ThreadCache should be populated after saving details for 
HttpMethod with SampleResult with response code 200.",
+                getThreadCache().isEmpty());
         this.cacheManager.clear();
         assertTrue("ThreadCache should be emptied by call to clear.", 
getThreadCache().isEmpty());
     }
@@ -422,7 +424,8 @@ public abstract class TestCacheManagerBa
         Field threadLocalfield = 
CacheManager.class.getDeclaredField("threadCache");
         threadLocalfield.setAccessible(true);
         @SuppressWarnings("unchecked")
-        ThreadLocal<Map<String, CacheManager.CacheEntry>> threadLocal = 
(ThreadLocal<Map<String, CacheManager.CacheEntry>>) 
threadLocalfield.get(this.cacheManager);
+        ThreadLocal<Map<String, CacheManager.CacheEntry>> threadLocal = 
(ThreadLocal<Map<String, CacheManager.CacheEntry>>) threadLocalfield
+                .get(this.cacheManager);
         return threadLocal.get();
     }
 

Modified: 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
 (original)
+++ 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
 Mon Feb 12 12:00:48 2018
@@ -606,7 +606,8 @@ public class TestHttpRequestHdr extends
         return postBody;
     }
 
-    private String createMultipartFileUploadBody(String fileField, String 
fileName, String fileMimeType, String fileContent, String boundary, String 
endOfLine) {
+    private String createMultipartFileUploadBody(String fileField, String 
fileName,
+            String fileMimeType, String fileContent, String boundary, String 
endOfLine) {
         // File upload multipart
         String postBody = "--" + boundary + endOfLine
             + "Content-Disposition: form-data; name=\"" + fileField + "\" 
filename=\"" + fileName + "\"" + endOfLine

Modified: 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
 (original)
+++ 
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
 Mon Feb 12 12:00:48 2018
@@ -543,8 +543,9 @@ public class PostWriterTest {
         checkContentLength(connection, expectedUrl.length);
         checkArraysHaveSameContent(expectedUrl, 
connection.getOutputStreamContent());
         assertEquals(
-                URLDecoder.decode(new String(expectedUrl, "US-ASCII"), 
"ISO-8859-1"), // HTTPSampler uses ISO-8859-1 as default encoding
-                URLDecoder.decode(new 
String(connection.getOutputStreamContent(), "US-ASCII"), "ISO-8859-1")); // 
HTTPSampler uses ISO-8859-1 as default encoding
+                // HTTPSampler uses ISO-8859-1 as default encoding
+                URLDecoder.decode(new String(expectedUrl, "US-ASCII"), 
"ISO-8859-1"), 
+                URLDecoder.decode(new 
String(connection.getOutputStreamContent(), "US-ASCII"), "ISO-8859-1"));
         connection.disconnect();
 
         // Test sending data as ISO-8859-1
@@ -686,7 +687,9 @@ public class PostWriterTest {
             String titleValue,
             String descriptionValue,
             byte[] fileContent) throws IOException {
-        return createExpectedOutput(boundaryString, contentEncoding, "title", 
titleValue, "description", descriptionValue, "upload", fileContent);
+        return createExpectedOutput(boundaryString, contentEncoding, "title",
+                titleValue, "description", descriptionValue, "upload",
+                fileContent);
     }
 
     /**

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1823949&r1=1823948&r2=1823949&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Feb 12 12:00:48 2018
@@ -118,7 +118,7 @@ Summary
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
-    <li><pr>365</pr><pr>375</pr>Updated to latest checkstyle (v8.8). Expanded 
Checkstyle to files
+    <li><pr>358</pr><pr>365</pr><pr>375</pr>Updated to latest checkstyle 
(v8.8). Expanded Checkstyle to files
       in <code>src</code> and <code>test</code>; fixed newly checked files. 
Based on contribution
       by Graham Russell (graham at ham1.co.uk)</li>
     <li><bug>62095</bug>Correct description for right boundary parameter in 
Boundary Extractor. Contributed by orimarko (orimarko at gmail.com)</li>


Reply via email to