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 <[email protected]> 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;
