This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 168a2342da960f8be11d0bde42ae39e4bd6fc61c Author: Graham Russell <[email protected]> AuthorDate: Thu Aug 15 10:25:28 2019 +0100 Formatting/whitespace Part of #479 on github --- .../main/java/org/apache/jmeter/assertions/CompareAssertion.java | 4 ++-- .../java/org/apache/jmeter/assertions/ResponseAssertion.java | 9 +++++---- .../main/java/org/apache/jmeter/assertions/gui/AssertionGui.java | 1 - .../main/java/org/apache/jmeter/extractor/XPath2Extractor.java | 9 +++++---- .../apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java | 4 +++- .../main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java | 1 - .../jmeter/report/config/ReportGeneratorConfiguration.java | 1 - .../java/org/apache/jmeter/protocol/java/test/SleepTest.java | 4 +--- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java index 11fa9d8..8535793 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertion.java @@ -131,12 +131,12 @@ public class CompareAssertion extends AbstractTestElement implements Assertion, private void appendResultDetails(StringBuilder buf, SampleResult result) { final String samplerData = result.getSamplerData(); - if (samplerData != null){ + if (samplerData != null) { buf.append(samplerData.trim()); } buf.append("\n"); //$NON-NLS-1$ final String requestHeaders = result.getRequestHeaders(); - if (requestHeaders != null){ + if (requestHeaders != null) { buf.append(requestHeaders); } buf.append("\n\n"); //$NON-NLS-1$ diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java index f3ef1d7..e0dc91d 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/ResponseAssertion.java @@ -368,7 +368,9 @@ public class ResponseAssertion extends AbstractScopedAssertion implements Serial result.setFailure(true); String customMsg = getCustomFailureMessage(); if (StringUtils.isEmpty(customMsg)) { - result.setFailureMessage(allCheckMessage.stream().collect(Collectors.joining("\t", "", "\t"))); + result.setFailureMessage( + allCheckMessage.stream() + .collect(Collectors.joining("\t", "", "\t"))); } else { result.setFailureMessage(customMsg); } @@ -512,7 +514,7 @@ public class ResponseAssertion extends AbstractScopedAssertion implements Serial break; } } - final String startingEqSeq; + final String startingEqSeq; if (firstDiff == 0) { startingEqSeq = ""; } else { @@ -534,8 +536,7 @@ public class ResponseAssertion extends AbstractScopedAssertion implements Serial if (endingEqSeq.length() == 0) { recDeltaSeq = trunc(true, received.substring(firstDiff, recLength)); compDeltaSeq = trunc(true, comparison.substring(firstDiff, compLength)); - } - else { + } else { recDeltaSeq = trunc(true, received.substring(firstDiff, lastRecDiff + 1)); compDeltaSeq = trunc(true, comparison.substring(firstDiff, lastCompDiff + 1)); } diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java index 05a56bb..953f534 100644 --- a/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java +++ b/src/components/src/main/java/org/apache/jmeter/assertions/gui/AssertionGui.java @@ -404,7 +404,6 @@ public class AssertionGui extends AbstractAssertionGui { gbc.weighty = 1; } - /** * Create a panel allowing the user to choose what type of test should be * performed. diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java index 67a822f..577409b 100644 --- a/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java +++ b/src/components/src/main/java/org/apache/jmeter/extractor/XPath2Extractor.java @@ -54,9 +54,11 @@ import net.sf.saxon.s9api.SaxonApiException; * </dl> see org.apache.jmeter.extractor.TestXPathExtractor for unit tests */ -public class XPath2Extractor extends AbstractScopedTestElement implements -PostProcessor, Serializable { - private static final Logger log = LoggerFactory.getLogger(XPathExtractor.class); +public class XPath2Extractor + extends AbstractScopedTestElement + implements PostProcessor, Serializable { + + private static final Logger log = LoggerFactory.getLogger(XPath2Extractor.class); private static final long serialVersionUID = 242L; @@ -82,7 +84,6 @@ PostProcessor, Serializable { return s1 + "_" + i; // $NON-NLS-1$ } - /** * Do the job - extract value from (X)HTML response using XPath Query. * Return value as variable defined by REFNAME. Returns DEFAULT value diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java index a69e20c..1f04905 100644 --- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java +++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java @@ -38,7 +38,9 @@ import org.slf4j.LoggerFactory; * JSON-PATH based extractor * @since 3.0 */ -public class JSONPostProcessor extends AbstractScopedTestElement implements Serializable, PostProcessor, ThreadListener{ +public class JSONPostProcessor + extends AbstractScopedTestElement + implements Serializable, PostProcessor, ThreadListener { private static final long serialVersionUID = 1L; private static final Logger log = LoggerFactory.getLogger(JSONPostProcessor.class); diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java index 53b0ae3..61b2cad 100644 --- a/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java +++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java @@ -48,7 +48,6 @@ import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Implement ResultsRender for XPath tester */ diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java index fb0cd24..84bc8d1 100644 --- a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java +++ b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java @@ -97,7 +97,6 @@ public class ReportGeneratorConfiguration { private static final String REPORT_GENERATOR_KEY_END_DATE = REPORT_GENERATOR_KEY_PREFIX + KEY_DELIMITER + "end_date"; - // Required graph properties // Exclude controllers public static final String GRAPH_KEY_EXCLUDE_CONTROLLERS = "exclude_controllers"; diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java index 9acb724..b640649 100644 --- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java +++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java @@ -63,9 +63,7 @@ public class SleepTest extends AbstractJavaSamplerClient implements Serializable */ public static final long DEFAULT_SLEEP_MASK = 0x3ff; - /** - * The base number of milliseconds to sleep during each sample. - */ + /** The base number of milliseconds to sleep during each sample. */ private long sleepTime; /**
