You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/16 08:13:25 UTC
[jmeter] branch master updated (f3fb343 -> da4857c)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from f3fb343 Use new Sonar instance in docs
new 9b6f3e9 Added extra checkstyle rule Only java files should be in src/*/java
new 168a234 Formatting/whitespace
new 8ba1e93 Fix Log messages
new 6ec1758 Use correct logging class
new f035e12 Use ThreadLocal.withInitial
new da4857c Other minor cleanups
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
config/checkstyle/checkstyle.xml | 12 ++++++------
.../org/apache/jmeter/assertions/BSFAssertion.java | 4 +---
.../apache/jmeter/assertions/BeanShellAssertion.java | 6 ++----
.../org/apache/jmeter/assertions/CompareAssertion.java | 4 ++--
.../apache/jmeter/assertions/JSONPathAssertion.java | 3 +--
.../apache/jmeter/assertions/ResponseAssertion.java | 9 +++++----
.../org/apache/jmeter/assertions/gui/AssertionGui.java | 1 -
.../org/apache/jmeter/config/RandomVariableConfig.java | 10 ++++------
.../org/apache/jmeter/extractor/XPath2Extractor.java | 13 ++++++-------
.../extractor/json/jsonpath/JSONPostProcessor.java | 11 ++++-------
.../org/apache/jmeter/visualizers/RenderAsXPath2.java | 3 +--
.../apache/jmeter/visualizers/SamplerResultTab.java | 2 +-
.../java/org/apache/jmeter/control/IfController.java | 11 +++--------
.../apache/jmeter/functions/gui/FunctionHelper.java | 3 +--
.../report/config/ReportGeneratorConfiguration.java | 6 ++----
.../jmeter/report/dashboard/TemplateVisitor.java | 5 +++--
.../main/java/org/apache/jmeter/functions/CSVRead.java | 2 +-
.../org/apache/jorphan/logging/LoggingManager.java | 2 +-
.../apache/jmeter/protocol/http/gui/DNSCachePanel.java | 2 +-
.../jmeter/protocol/java/sampler/JavaSampler.java | 3 +--
.../protocol/java/sampler/JavaSamplerContext.java | 3 +--
.../apache/jmeter/protocol/java/test/SleepTest.java | 18 ++++++------------
22 files changed, 53 insertions(+), 80 deletions(-)
[jmeter] 05/06: Use ThreadLocal.withInitial
Posted by fs...@apache.org.
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 f035e1251a05d5848daf78ae2a495b7b18acc236
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:31:27 2019 +0100
Use ThreadLocal.withInitial
Part of #479 on github
---
.../java/org/apache/jmeter/config/RandomVariableConfig.java | 10 ++++------
.../jmeter/extractor/json/jsonpath/JSONPostProcessor.java | 7 +------
.../src/main/java/org/apache/jmeter/control/IfController.java | 11 +++--------
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
index 92acf02..922d8ad 100644
--- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java
@@ -68,12 +68,10 @@ public class RandomVariableConfig extends ConfigTestElement
private transient ThreadLocal<Random> perThreadRandom = initThreadLocal();
private ThreadLocal<Random> initThreadLocal() {
- return new ThreadLocal<Random>() {
- @Override
- protected Random initialValue() {
- init();
- return createRandom();
- }};
+ return ThreadLocal.withInitial(() -> {
+ init();
+ return createRandom();
+ });
}
private Object readResolve(){
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 1f04905..e129145 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
@@ -57,12 +57,7 @@ public class JSONPostProcessor
private static final String SEPARATOR = ";"; // $NON-NLS-1$
public static final boolean COMPUTE_CONCATENATION_DEFAULT_VALUE = false;
- private static final ThreadLocal<JSONManager> localMatcher = new ThreadLocal<JSONManager>() {
- @Override
- protected JSONManager initialValue() {
- return new JSONManager();
- }
- };
+ private static final ThreadLocal<JSONManager> localMatcher = ThreadLocal.withInitial(JSONManager::new);
@Override
public void process() {
diff --git a/src/core/src/main/java/org/apache/jmeter/control/IfController.java b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
index 1e1b0e2..a73d747 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/IfController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/IfController.java
@@ -81,14 +81,9 @@ public class IfController extends GenericController implements Serializable, Thr
getInstance().getEngineByName(NASHORN_ENGINE_NAME) == null;
- private static final ThreadLocal<ScriptEngine> NASHORN_ENGINE = new ThreadLocal<ScriptEngine>() {
-
- @Override
- protected ScriptEngine initialValue() {
- return getInstance().getEngineByName("nashorn");//$NON-NLS-N$
- }
-
- };
+ private static final ThreadLocal<ScriptEngine> NASHORN_ENGINE = ThreadLocal.withInitial(() -> {
+ return getInstance().getEngineByName("nashorn");//$NON-NLS-N$
+ });
private interface JsEvaluator {
boolean evaluate(String testElementName, String condition);
[jmeter] 03/06: Fix Log messages
Posted by fs...@apache.org.
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 8ba1e935107c88f97052c9dedd00de3c2dc0fa08
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:26:39 2019 +0100
Fix Log messages
Part of #479 on github
---
.../src/main/java/org/apache/jmeter/assertions/BSFAssertion.java | 4 +---
.../main/java/org/apache/jmeter/assertions/BeanShellAssertion.java | 6 ++----
.../apache/jmeter/report/config/ReportGeneratorConfiguration.java | 5 ++---
.../java/org/apache/jmeter/report/dashboard/TemplateVisitor.java | 5 +++--
.../src/main/java/org/apache/jmeter/functions/CSVRead.java | 2 +-
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
index d950c14..05fdd99 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
@@ -43,9 +43,7 @@ public class BSFAssertion extends BSFTestElement implements Cloneable, Assertion
processFileOrScript(mgr);
result.setError(false);
} catch (BSFException e) {
- if (log.isWarnEnabled()) {
- log.warn("Problem in BSF script {}", e.toString());
- }
+ log.warn("Problem in BSF script", e);
result.setFailure(true);
result.setError(true);
result.setFailureMessage(e.toString());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java
index b3ca680..c0e1681 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java
@@ -112,7 +112,7 @@ public class BeanShellAssertion extends BeanShellTestElement implements Assertio
result.setError(false);
}
catch (NoClassDefFoundError ex) { // NOSONAR explicitly trap this error to make tests work better
- log.error("BeanShell Jar missing? " + ex.toString());
+ log.error("BeanShell Jar missing?", ex);
result.setError(true);
result.setFailureMessage("BeanShell Jar missing? " + ex.toString());
response.setStopThread(true); // No point continuing
@@ -120,9 +120,7 @@ public class BeanShellAssertion extends BeanShellTestElement implements Assertio
{
result.setError(true);
result.setFailureMessage(ex.toString());
- if (log.isWarnEnabled()) {
- log.warn(ex.toString());
- }
+ log.warn("Error in BeanShellAssertion", ex);
}
return result;
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 84bc8d1..78ac34b 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
@@ -730,9 +730,8 @@ public class ReportGeneratorConfiguration {
public static Map<String, Long[]> getApdexPerTransactionParts(String apdexPerTransaction) {
Map <String, Long[]> specificApdexes = new HashMap<>();
if (StringUtils.isEmpty(apdexPerTransaction) ||
- apdexPerTransaction.trim().length()==0) {
- log.info(
- "apdex_per_transaction : {} is empty, not APDEX per transaction customization");
+ apdexPerTransaction.trim().length() == 0) {
+ log.info("apdex_per_transaction is empty, not APDEX per transaction customization");
} else {
// data looks like : sample(\d+):1000|2000;samples12:3000|4000;scenar01-12:5000|6000
String[] parts = apdexPerTransaction.split("[;]");
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
index 6e2be00..95e7efc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
@@ -89,8 +89,9 @@ public class TemplateVisitor extends SimpleFileVisitor<Path> {
try {
Files.copy(file, newDir);
} catch (FileAlreadyExistsException ex) {
- LOGGER.info("Copying folder from '{}' to '{}', got message:{}, found non empty folder with following content {}, will be ignored",
- file, newDir, newDir.toFile().listFiles());
+ LOGGER.info("Copying folder from '{}' to '{}', got message: " +
+ "{}, found non empty folder with following content {}, will be ignored",
+ file, newDir, ex.getMessage(), newDir.toFile().listFiles());
}
return FileVisitResult.CONTINUE;
}
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
index 67fa80c..820d1f7 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
@@ -121,7 +121,7 @@ public class CSVRead extends AbstractFunction {
FileWrapper.getCurrentRow(fileName), e.toString());
}
- log.debug("execute value: {}");
+ log.debug("execute value: {}", myValue);
return myValue;
}
[jmeter] 06/06: Other minor cleanups
Posted by fs...@apache.org.
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 da4857c1f985f8edd48eefde3b28e010c4da6f93
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:31:48 2019 +0100
Other minor cleanups
Part of #479 on github
---
.../java/org/apache/jmeter/extractor/XPath2Extractor.java | 4 +---
.../main/java/org/apache/jorphan/logging/LoggingManager.java | 2 +-
.../java/org/apache/jmeter/protocol/java/test/SleepTest.java | 12 ++++--------
3 files changed, 6 insertions(+), 12 deletions(-)
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 577409b..c9572fa 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
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.processor.PostProcessor;
@@ -221,11 +220,10 @@ public class XPath2Extractor
* @param matchNumber int Match Number
* @param responseData String that contains the entire Document
* @throws SaxonApiException
- * @throws XMLStreamException
* @throws FactoryConfigurationError
*/
private void getValuesForXPath(String query, List<String> matchStrings, int matchNumber, String responseData)
- throws SaxonApiException, XMLStreamException, FactoryConfigurationError {
+ throws SaxonApiException, FactoryConfigurationError {
XPathUtil.putValuesForXPathInListUsingSaxon(responseData, query, matchStrings, getFragment(), matchNumber, getNamespaces());
}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java b/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
index 7b5dc84..7ba2c56 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/logging/LoggingManager.java
@@ -91,7 +91,7 @@ public final class LoggingManager {
}
/**
- * @deprecated
+ * @deprecated since 3.2, use SLF4J for logging
*/
@Deprecated
private static final String PACKAGE_PREFIX = "org.apache."; //$NON_NLS-1$
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 f0d4547..50ef9c9 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
@@ -53,15 +53,11 @@ public class SleepTest extends AbstractJavaSamplerClient implements Serializable
private static final long serialVersionUID = 240L;
- /**
- * The default value of the SleepTime parameter, in milliseconds.
- */
- public static final long DEFAULT_SLEEP_TIME = 1000;
+ /** The default value of the SleepTime parameter, in milliseconds. */
+ private static final long DEFAULT_SLEEP_TIME = 1000;
- /**
- * The default value of the SleepMask parameter.
- */
- public static final long DEFAULT_SLEEP_MASK = 0x3ff;
+ /** The default value of the SleepMask parameter. */
+ private static final long DEFAULT_SLEEP_MASK = 0x3ff;
/** The base number of milliseconds to sleep during each sample. */
private long sleepTime;
[jmeter] 02/06: Formatting/whitespace
Posted by fs...@apache.org.
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 <gr...@ham1.co.uk>
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;
/**
[jmeter] 01/06: Added extra checkstyle rule Only java files should
be in src/*/java
Posted by fs...@apache.org.
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 9b6f3e9fddf1f7e6f3982a248fac947a5e3bf3af
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:23:35 2019 +0100
Added extra checkstyle rule Only java files should be in src/*/java
Part of #479 on github
---
config/checkstyle/checkstyle.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index d4252f6..ed0c42c 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -50,12 +50,12 @@
<property name="fileExtensions" value="java, kt, kts, groovy, xml, properties"/>
<property name="message" value="Unnecessary consecutive lines"/>
</module>
- <!--<module name="RegexpOnFilename">-->
- <!--<property name="folderPattern" value="[\\/]src[\\/]\w+[\\/]java[\\/]"/>-->
- <!--<property name="fileNamePattern" value="\.java$"/>-->
- <!--<property name="match" value="false"/>-->
- <!--<message key="regexp.filepath.mismatch" value="Only java files should be located in the ''src/*/java'' folders."/>-->
- <!--</module>-->
+ <module name="RegexpOnFilename">
+ <property name="folderPattern" value="[\\/]src[\\/]\w+[\\/]java[\\/]"/>
+ <property name="fileNamePattern" value="\.java$"/>
+ <property name="match" value="false"/>
+ <message key="regexp.filepath.mismatch" value="Only java files should be located in the ''src/*/java'' folders."/>
+ </module>
<module name="UniqueProperties">
<property name="fileExtensions" value="properties"/>
</module>
[jmeter] 04/06: Use correct logging class
Posted by fs...@apache.org.
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 6ec175809eba611e9b44c1c394d498a0844905c2
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:27:48 2019 +0100
Use correct logging class
Part of #479 on github
---
.../src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java | 3 +--
.../src/main/java/org/apache/jmeter/visualizers/RenderAsXPath2.java | 2 +-
.../src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java | 2 +-
.../src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java | 3 +--
.../main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java | 2 +-
.../main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java | 3 +--
.../org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java | 3 +--
.../src/main/java/org/apache/jmeter/protocol/java/test/SleepTest.java | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
index df25435..88ad21b 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/JSONPathAssertion.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
import java.text.DecimalFormat;
import java.util.Map;
-import org.apache.jmeter.extractor.json.jsonpath.JSONPostProcessor;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -40,7 +39,7 @@ import com.jayway.jsonpath.JsonPath;
* @since 4.0
*/
public class JSONPathAssertion extends AbstractTestElement implements Serializable, Assertion {
- private static final Logger log = LoggerFactory.getLogger(JSONPostProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(JSONPathAssertion.class);
private static final long serialVersionUID = 1L;
public static final String JSONPATH = "JSON_PATH";
public static final String EXPECTEDVALUE = "EXPECTED_VALUE";
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 61b2cad..74a2d5d 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
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
*/
public class RenderAsXPath2 implements ResultRenderer, ActionListener {
- private static final Logger log = LoggerFactory.getLogger(RenderAsXPath.class);
+ private static final Logger log = LoggerFactory.getLogger(RenderAsXPath2.class);
private static final String XPATH_TESTER_COMMAND = "xpath_tester"; // $NON-NLS-1$
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
index 821381f..d0f1622 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -73,7 +73,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class SamplerResultTab implements ResultRenderer {
- private static final Logger LOGGER = LoggerFactory.getLogger(RenderAsText.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SamplerResultTab.class);
// N.B. these are not multi-threaded, so don't make it static
private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"); // ISO format $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
index 6d5bcb6..14431df 100644
--- a/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
+++ b/src/core/src/main/java/org/apache/jmeter/functions/gui/FunctionHelper.java
@@ -45,7 +45,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
-import org.apache.jmeter.engine.ClientJMeterEngine;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.functions.Function;
import org.apache.jmeter.gui.action.ActionNames;
@@ -75,7 +74,7 @@ import org.slf4j.LoggerFactory;
public class FunctionHelper extends JDialog implements ActionListener, ChangeListener, LocaleChangeListener {
private static final long serialVersionUID = 240L;
- private static final Logger log = LoggerFactory.getLogger(ClientJMeterEngine.class);
+ private static final Logger log = LoggerFactory.getLogger(FunctionHelper.class);
private static final String GENERATE = "GENERATE";
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
index 3a2dacc..27a8b55 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*/
public class DNSCachePanel extends AbstractConfigGui implements ActionListener {
- private static final Logger LOGGER = LoggerFactory.getLogger(DNSCacheManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DNSCachePanel.class);
private static final long serialVersionUID = 2120L;
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
index 08e5fd3..abfff0e 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.protocol.java.test.JavaTest;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.Interruptible;
@@ -46,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/
public class JavaSampler extends AbstractSampler implements TestStateListener, Interruptible {
- private static final Logger log = LoggerFactory.getLogger(JavaTest.class);
+ private static final Logger log = LoggerFactory.getLogger(JavaSampler.class);
private static final long serialVersionUID = 233L; // Remember to change this when the class changes ...
diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
index b7874cc..ddd0810 100644
--- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
+++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Properties;
import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.protocol.java.test.JavaTest;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
@@ -51,7 +50,7 @@ public class JavaSamplerContext {
*/
/** Logging */
- private static final Logger log = LoggerFactory.getLogger(JavaTest.class);
+ private static final Logger log = LoggerFactory.getLogger(JavaSamplerContext.class);
/**
* Map containing the initialization parameters for the JavaSamplerClient.
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 b640649..f0d4547 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
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
*/
public class SleepTest extends AbstractJavaSamplerClient implements Serializable, Interruptible {
- private static final Logger LOG = LoggerFactory.getLogger(JavaTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SleepTest.class);
private static final long serialVersionUID = 240L;