You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/07 22:23:17 UTC
svn commit: r1782087 - in /jmeter/trunk/src/components/org/apache/jmeter:
config/ control/ extractor/ extractor/json/jsonpath/ extractor/json/render/
Author: pmouawad
Date: Tue Feb 7 22:23:17 2017
New Revision: 1782087
URL: http://svn.apache.org/viewvc?rev=1782087&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Contributed by Woonsan Ko
This closes #264
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java
jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java Tue Feb 7 22:23:17 2017
@@ -37,10 +37,10 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterStopThreadException;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Read lines from a file and split int variables.
@@ -69,9 +69,9 @@ import org.apache.log.Logger;
*/
public class CSVDataSet extends ConfigTestElement
implements TestBean, LoopIterationListener, NoConfigMerge {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(CSVDataSet.class);
- private static final long serialVersionUID = 232L;
+ private static final long serialVersionUID = 233L;
private static final String EOFVALUE = // value to return at EOF
JMeterUtils.getPropDefault("csvdataset.eofstring", "<EOF>"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -129,7 +129,7 @@ public class CSVDataSet extends ConfigTe
for(String resKey : CSVDataSetBeanInfo.getShareTags()) {
if (propValue.equals(rb.getString(resKey))) {
if (log.isDebugEnabled()) {
- log.debug("Converted " + propName + "=" + propValue + " to " + resKey + " using Locale: " + rb.getLocale());
+ log.debug("Converted {}={} to {} using Locale: {}", propName, propValue, resKey, rb.getLocale());
}
((StringProperty) property).setValue(resKey); // reset the value
super.setProperty(property);
@@ -137,7 +137,7 @@ public class CSVDataSet extends ConfigTe
}
}
// This could perhaps be a variable name
- log.warn("Could not translate " + propName + "=" + propValue + " using Locale: " + rb.getLocale());
+ log.warn("Could not translate {}={} using Locale: {}", propName, propValue, rb.getLocale());
} catch (IntrospectionException e) {
log.error("Could not find BeanInfo; cannot translate shareMode entries", e);
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfig.java Tue Feb 7 22:23:17 2017
@@ -23,17 +23,17 @@ import org.apache.jmeter.testbeans.TestB
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.SSLManager;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterStopTestException;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Configure Keystore
*/
public class KeystoreConfig extends ConfigTestElement implements TestBean, TestStateListener {
- private static final long serialVersionUID = -5781402012242794890L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = LoggerFactory.getLogger(KeystoreConfig.class);
private static final String KEY_STORE_START_INDEX = "https.keyStoreStartIndex"; // $NON-NLS-1$
private static final String KEY_STORE_END_INDEX = "https.keyStoreEndIndex"; // $NON-NLS-1$
@@ -76,7 +76,8 @@ public class KeystoreConfig extends Conf
try {
startIndexAsInt = Integer.parseInt(this.startIndex);
} catch(NumberFormatException e) {
- log.warn("Failed parsing startIndex :'"+this.startIndex+"', will default to:'"+startIndexAsInt+"', error message:"+ e.getMessage(), e);
+ log.warn("Failed parsing startIndex: {}, will default to: {}, error message: {}", this.startIndex,
+ startIndexAsInt, e, e);
}
}
@@ -84,15 +85,16 @@ public class KeystoreConfig extends Conf
try {
endIndexAsInt = Integer.parseInt(this.endIndex);
} catch(NumberFormatException e) {
- log.warn("Failed parsing endIndex :'"+this.endIndex+"', will default to:'"+endIndexAsInt+"', error message:"+ e.getMessage(), e);
+ log.warn("Failed parsing endIndex: {}, will default to: {}, error message: {}", this.endIndex,
+ endIndexAsInt, e, e);
}
}
if(startIndexAsInt>endIndexAsInt) {
throw new JMeterStopTestException("Keystore Config error : Alias start index must be lower than Alias end index");
}
- log.info("Configuring Keystore with (preload:"+preload+", startIndex:"+
- startIndexAsInt+", endIndex:"+endIndexAsInt+
- ", clientCertAliasVarName:'" + clientCertAliasVarName +"')");
+ log.info(
+ "Configuring Keystore with (preload: '{}', startIndex: {}, endIndex: {}, clientCertAliasVarName: '{}')",
+ preload, startIndexAsInt, endIndexAsInt, clientCertAliasVarName);
SSLManager.getInstance().configureKeystore(Boolean.parseBoolean(preload),
startIndexAsInt,
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java Tue Feb 7 22:23:17 2017
@@ -29,15 +29,15 @@ import org.apache.jmeter.engine.util.NoT
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RandomVariableConfig extends ConfigTestElement
implements TestBean, LoopIterationListener, NoThreadClone, NoConfigMerge
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RandomVariableConfig.class);
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
/*
* N.B. this class is shared between threads (NoThreadClone) so all access to variables
@@ -92,12 +92,12 @@ public class RandomVariableConfig extend
long maximum = NumberUtils.toLong(maxAsString);
long rangeL=maximum-minimum+1; // This can overflow
if (minimum >= maximum){
- log.error("maximum("+maxAsString+") must be > minimum"+minAsString+")");
+ log.error("maximum({}) must be > minimum({})", maxAsString, minAsString);
range=0;// This is used as an error indicator
return;
}
if (rangeL > Integer.MAX_VALUE || rangeL <= 0){// check for overflow too
- log.warn("maximum("+maxAsString+") - minimum"+minAsString+") must be <="+Integer.MAX_VALUE);
+ log.warn("maximum({}) - minimum({}) must be <= {}", maxAsString, minAsString, Integer.MAX_VALUE);
rangeL=Integer.MAX_VALUE;
}
range = (int)rangeL;
@@ -135,7 +135,7 @@ public class RandomVariableConfig extend
DecimalFormat myFormatter = new DecimalFormat(format);
return myFormatter.format(value);
} catch (IllegalArgumentException ignored) {
- log.warn("Exception formatting value:"+value + " at format:"+format+", using default");
+ log.warn("Exception formatting value: {} at format: {}, using default", value, format);
}
}
return Long.toString(value);
@@ -202,7 +202,7 @@ public class RandomVariableConfig extend
seed = Long.parseLong(randomSeed);
} catch (NumberFormatException e) {
seed = System.currentTimeMillis();
- log.warn("Cannot parse seed "+e.getLocalizedMessage());
+ log.warn("Cannot parse seed: {}. {}", randomSeed, e.getLocalizedMessage());
}
}
return seed;
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java Tue Feb 7 22:23:17 2017
@@ -26,8 +26,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.ThreadListener;
import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a Critical Section Controller; it will execute the set of statements
@@ -61,12 +61,9 @@ import org.apache.log.Logger;
public class CriticalSectionController extends GenericController implements
ThreadListener, TestStateListener {
- /**
- *
- */
- private static final long serialVersionUID = 4362876132435968088L;
+ private static final long serialVersionUID = 1L;
- private static final Logger logger = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(CriticalSectionController.class);
private static final String LOCK_NAME = "CriticalSectionController.lockName"; //$NON-NLS-1$
@@ -129,8 +126,7 @@ public class CriticalSectionController e
@Override
public Sampler next() {
if (StringUtils.isEmpty(getLockName())) {
- logger.warn("Empty lock name in Critical Section Controller:"
- + getName());
+ log.warn("Empty lock name in Critical Section Controller: {}", getName());
return super.next();
}
if (isFirst()) {
@@ -141,11 +137,9 @@ public class CriticalSectionController e
}
this.currentLock.lock();
long endTime = System.currentTimeMillis();
- if (logger.isDebugEnabled()) {
- logger.debug(Thread.currentThread().getName()
- + " acquired lock:'" + getLockName()
- + "' in Critical Section Controller " + getName()
- + " in:" + (endTime - startTime) + " ms");
+ if (log.isDebugEnabled()) {
+ log.debug("Thread ('{}') acquired lock: '{}' in Critical Section Controller {} in: {} ms",
+ Thread.currentThread(), getLockName(), getName(), endTime - startTime);
}
}
return super.next();
@@ -176,8 +170,7 @@ public class CriticalSectionController e
public void threadFinished() {
if (this.currentLock != null
&& this.currentLock.isHeldByCurrentThread()) {
- logger.warn("Lock " + getLockName() + " not released in:"
- + getName() + ", releasing in threadFinished");
+ log.warn("Lock '{}' not released in: {}, releasing in threadFinished", getLockName(), getName());
this.currentLock.unlock();
}
this.currentLock = null;
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java Tue Feb 7 22:23:17 2017
@@ -30,13 +30,13 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IncludeController extends GenericController implements ReplaceableController {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(IncludeController.class);
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
private static final String INCLUDE_PATH = "IncludeController.includepath"; //$NON-NLS-1$
@@ -125,15 +125,14 @@ public class IncludeController extends G
try {
File file = new File(fileName.trim());
final String absolutePath = file.getAbsolutePath();
- log.info("loadIncludedElements -- try to load included module: "+absolutePath);
+ log.info("loadIncludedElements -- try to load included module: {}", absolutePath);
if(!file.exists() && !file.isAbsolute()){
- log.info("loadIncludedElements -failed for: "+absolutePath);
+ log.info("loadIncludedElements -failed for: {}", absolutePath);
file = new File(FileServer.getFileServer().getBaseDir(), includePath);
- log.info("loadIncludedElements -Attempting to read it from: " + file.getAbsolutePath());
+ log.info("loadIncludedElements -Attempting to read it from: {}", file.getAbsolutePath());
if(!file.canRead() || !file.isFile()){
- log.error("Include Controller \""
- + this.getName()+"\" can't load \""
- + fileName+"\" - see log for details");
+ log.error("Include Controller '{}' can't load '{}' - see log for details", this.getName(),
+ fileName);
throw new IOException("loadIncludedElements -failed for: " + absolutePath +
" and " + file.getAbsolutePath());
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java Tue Feb 7 22:23:17 2017
@@ -29,8 +29,8 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.IntegerProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class represents a controller that can control the number of times that
@@ -44,9 +44,9 @@ import org.apache.log.Logger;
public class ThroughputController extends GenericController implements Serializable, LoopIterationListener,
TestStateListener {
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ThroughputController.class);
public static final int BYNUMBER = 0;
public static final int BYPERCENT = 1;
@@ -140,7 +140,7 @@ public class ThroughputController extend
try {
retVal = Integer.parseInt(prop.getStringValue());
} catch (NumberFormatException e) {
- log.warn("Error parsing "+prop.getStringValue(),e);
+ log.warn("Error parsing {}", prop.getStringValue(), e);
}
}
return retVal;
@@ -167,7 +167,7 @@ public class ThroughputController extend
try {
retVal = Float.parseFloat(prop.getStringValue());
} catch (NumberFormatException e) {
- log.warn("Error parsing "+prop.getStringValue(),e);
+ log.warn("Error parsing {}", prop.getStringValue(),e);
}
}
return retVal;
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java Tue Feb 7 22:23:17 2017
@@ -23,14 +23,14 @@ import org.apache.bsf.BSFManager;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.BSFTestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BSFPostProcessor extends BSFTestElement implements Cloneable, PostProcessor, TestBean
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BSFPostProcessor.class);
- private static final long serialVersionUID = 232L;
+ private static final long serialVersionUID = 233L;
@Override
public void process(){
@@ -39,7 +39,7 @@ public class BSFPostProcessor extends BS
mgr = getManager();
processFileOrScript(mgr);
} catch (BSFException e) {
- log.warn("Problem in BSF script "+e);
+ log.warn("Problem in BSF script {}", e.toString());
} finally {
if (mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java Tue Feb 7 22:23:17 2017
@@ -25,16 +25,16 @@ import org.apache.jmeter.threads.JMeterC
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.util.BeanShellInterpreter;
import org.apache.jmeter.util.BeanShellTestElement;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterException;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BeanShellPostProcessor extends BeanShellTestElement
implements Cloneable, PostProcessor, TestBean
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BeanShellPostProcessor.class);
- private static final long serialVersionUID = 4;
+ private static final long serialVersionUID = 5;
// can be specified in jmeter.properties
private static final String INIT_FILE = "beanshell.postprocessor.init"; //$NON-NLS-1$
@@ -63,7 +63,7 @@ public class BeanShellPostProcessor exte
bshInterpreter.set("data", prev.getResponseData());//$NON-NLS-1$
processFileOrScript(bshInterpreter);
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script "+e);
+ log.warn("Problem in BeanShell script: {}", e.toString());
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java Tue Feb 7 22:23:17 2017
@@ -31,15 +31,15 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class HtmlExtractor extends AbstractScopedTestElement implements PostProcessor, Serializable {
- private static final long serialVersionUID = 3978073849365558131L;
+ private static final long serialVersionUID = 1L;
public static final String EXTRACTOR_JSOUP = "JSOUP"; //$NON-NLS-1$
@@ -47,7 +47,7 @@ public class HtmlExtractor extends Abstr
public static final String DEFAULT_EXTRACTOR = ""; // $NON-NLS-1$
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(HtmlExtractor.class);
private static final String EXPRESSION = "HtmlExtractor.expr"; // $NON-NLS-1$
@@ -92,9 +92,8 @@ public class HtmlExtractor extends Abstr
return;
}
if(log.isDebugEnabled()) {
- log.debug("HtmlExtractor "+getName()+":processing result");
+ log.debug("HtmlExtractor {}: processing result", getName());
}
-
// Fetch some variables
JMeterVariables vars = context.getVariables();
@@ -117,8 +116,8 @@ public class HtmlExtractor extends Abstr
vars.remove(refName + REF_MATCH_NR);// ensure old value is not left defined
try {
prevCount = Integer.parseInt(prevString);
- } catch (NumberFormatException e1) {
- log.warn(getName()+":Could not parse "+prevString+" "+e1);
+ } catch (NumberFormatException nfe) {
+ log.warn("{}: Could not parse number '{}'.", getName(), prevString);
}
}
int matchCount=0;// Number of refName_n variable sets to keep
@@ -146,7 +145,7 @@ public class HtmlExtractor extends Abstr
vars.remove(refNameN);
}
} catch (RuntimeException e) {
- log.warn(getName()+":Error while generating result " + e);
+ log.warn("{}: Error while generating result. {}", getName(), e.toString());
}
}
@@ -186,7 +185,8 @@ public class HtmlExtractor extends Abstr
getExtractorImpl().extract(expression, attribute, matchNumber, inputString, result, found, "-1");
} else {
if(inputString==null) {
- log.warn("No variable '"+getVariableName()+"' found to process by Css/JQuery Extractor '"+getName()+"', skipping processing");
+ log.warn("No variable '{}' found to process by CSS/JQuery Extractor '{}', skipping processing",
+ getVariableName(), getName());
}
return Collections.emptyList();
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java Tue Feb 7 22:23:17 2017
@@ -26,14 +26,14 @@ import javax.script.ScriptException;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.JSR223TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JSR223PostProcessor extends JSR223TestElement implements Cloneable, PostProcessor, TestBean
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JSR223PostProcessor.class);
- private static final long serialVersionUID = 232L;
+ private static final long serialVersionUID = 233L;
@Override
public void process() {
@@ -41,7 +41,7 @@ public class JSR223PostProcessor extends
ScriptEngine scriptEngine = getScriptEngine();
processFileOrScript(scriptEngine, null);
} catch (ScriptException | IOException e) {
- log.error("Problem in JSR223 script "+getName(), e);
+ log.error("Problem in JSR223 script, {}", getName(), e);
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Tue Feb 7 22:23:17 2017
@@ -32,8 +32,6 @@ import org.apache.jmeter.threads.JMeterC
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.Document;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
import org.apache.oro.text.MalformedCachePatternException;
import org.apache.oro.text.regex.MatchResult;
import org.apache.oro.text.regex.Pattern;
@@ -41,14 +39,16 @@ import org.apache.oro.text.regex.Pattern
import org.apache.oro.text.regex.PatternMatcherInput;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
// @see org.apache.jmeter.extractor.TestRegexExtractor for unit tests
public class RegexExtractor extends AbstractScopedTestElement implements PostProcessor, Serializable {
- private static final long serialVersionUID = 241L;
+ private static final long serialVersionUID = 242L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RegexExtractor.class);
// What to match against. N.B. do not change the string value or test plans will break!
private static final String MATCH_AGAINST = "RegexExtractor.useHeaders"; // $NON-NLS-1$
@@ -129,8 +129,8 @@ public class RegexExtractor extends Abst
vars.remove(refName + REF_MATCH_NR);// ensure old value is not left defined
try {
prevCount = Integer.parseInt(prevString);
- } catch (NumberFormatException e1) {
- log.warn("Could not parse "+prevString+" "+e1);
+ } catch (NumberFormatException nfe) {
+ log.warn("Could not parse number: '{}', message: '{}'", prevString, nfe.toString());
}
}
int matchCount=0;// Number of refName_n variable sets to keep
@@ -169,7 +169,7 @@ public class RegexExtractor extends Abst
log.warn("Error while generating result");
}
} catch (MalformedCachePatternException e) {
- log.error("Error in pattern: " + regex);
+ log.error("Error in pattern: '{}'", regex);
} finally {
JMeterUtils.clearMatcherMemory(matcher, pattern);
}
@@ -185,16 +185,12 @@ public class RegexExtractor extends Abst
: useBodyAsDocument() ? Document.getTextFromDocument(result.getResponseData())
: result.getResponseDataAsString() // Bug 36898
;
- if (log.isDebugEnabled()) {
- log.debug("Input = " + inputString);
- }
+ log.debug("Input = '{}'", inputString);
return inputString;
}
private List<MatchResult> processMatches(Pattern pattern, String regex, SampleResult result, int matchNumber, JMeterVariables vars) {
- if (log.isDebugEnabled()) {
- log.debug("Regex = " + regex);
- }
+ log.debug("Regex = '{}'", regex);
Perl5Matcher matcher = JMeterUtils.getMatcher();
List<MatchResult> matches = new ArrayList<>();
@@ -203,7 +199,8 @@ public class RegexExtractor extends Abst
if (isScopeVariable()){
String inputString=vars.get(getVariableName());
if(inputString == null) {
- log.warn("No variable '"+getVariableName()+"' found to process by RegexExtractor '"+getName()+"', skipping processing");
+ log.warn("No variable '{}' found to process by RegexExtractor '{}', skipping processing",
+ getVariableName(), getName());
return Collections.emptyList();
}
matchStrings(matchNumber, matcher, pattern, matches, found,
@@ -253,8 +250,8 @@ public class RegexExtractor extends Abst
if (prevString!=null){
try {
previous=Integer.parseInt(prevString);
- } catch (NumberFormatException e) {
- log.warn("Could not parse "+prevString+" "+e);
+ } catch (NumberFormatException nfe) {
+ log.warn("Could not parse number: '{}', message:'{}'", prevString, nfe.toString());
}
}
//Note: match.groups() includes group 0
@@ -300,8 +297,8 @@ public class RegexExtractor extends Abst
private String generateResult(MatchResult match) {
StringBuilder result = new StringBuilder();
for (Object obj : template) {
- if (log.isDebugEnabled()) {
- log.debug("RegexExtractor: Template piece " + obj + " (" + obj.getClass().getSimpleName() + ")");
+ if(log.isDebugEnabled()) {
+ log.debug("RegexExtractor: Template piece {} ({})", obj, obj.getClass());
}
if (obj instanceof Integer) {
result.append(match.group(((Integer) obj).intValue()));
@@ -309,9 +306,7 @@ public class RegexExtractor extends Abst
result.append(obj);
}
}
- if (log.isDebugEnabled()) {
- log.debug("Regex Extractor result = " + result.toString());
- }
+ log.debug("Regex Extractor result = '{}'", result);
return result.toString();
}
@@ -327,8 +322,7 @@ public class RegexExtractor extends Abst
, Perl5Compiler.READ_ONLY_MASK
& Perl5Compiler.SINGLELINE_MASK);
if (log.isDebugEnabled()) {
- log.debug("Pattern = " + templatePattern.getPattern());
- log.debug("template = " + rawTemplate);
+ log.debug("Pattern = '{}', template = '{}'", templatePattern.getPattern(), rawTemplate);
}
int beginOffset = 0;
MatchResult currentResult;
@@ -346,10 +340,11 @@ public class RegexExtractor extends Abst
if (beginOffset < rawTemplate.length()) { // trailing string is not empty
combined.add(rawTemplate.substring(beginOffset, rawTemplate.length()));
}
- if (log.isDebugEnabled()){
- log.debug("Template item count: "+combined.size());
- for(Object o : combined){
- log.debug(o.getClass().getSimpleName()+" '"+o.toString()+"'");
+ if (log.isDebugEnabled()) {
+ log.debug("Template item count: {}", combined.size());
+ int i = 0;
+ for (Object o : combined) {
+ log.debug("Template item-{}: {} '{}'", i++, o.getClass(), o);
}
}
template = combined;
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Tue Feb 7 22:23:17 2017
@@ -37,10 +37,10 @@ import org.apache.jmeter.threads.JMeterC
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.TidyException;
import org.apache.jmeter.util.XPathUtil;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterError;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -64,9 +64,9 @@ import org.xml.sax.SAXException;
*/
public class XPathExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(XPathExtractor.class);
- private static final long serialVersionUID = 241L;
+ private static final long serialVersionUID = 242L;
private static final int DEFAULT_VALUE = -1;
public static final String DEFAULT_VALUE_AS_STRING = Integer.toString(DEFAULT_VALUE);
@@ -134,7 +134,8 @@ public class XPathExtractor extends Abst
getValuesForXPath(d,getXPathQuery(), matches, matchNumber);
}
} else {
- log.warn("No variable '"+getVariableName()+"' found to process by XPathExtractor '"+getName()+"', skipping processing");
+ log.warn("No variable '{}' found to process by XPathExtractor '{}', skipping processing",
+ getVariableName(), getName());
}
} else {
List<SampleResult> samples = getSampleList(previousResult);
@@ -163,8 +164,7 @@ public class XPathExtractor extends Abst
vars.remove(concat(refName,i));
}
}catch(IOException e){// e.g. DTD not reachable
- final String errorMessage = "IOException on ("+getXPathQuery()+")";
- log.error(errorMessage,e);
+ log.error("IOException on ({})", getXPathQuery(), e);
AssertionResult ass = new AssertionResult(getName());
ass.setError(true);
ass.setFailureMessage(new StringBuilder("IOException: ").append(e.getLocalizedMessage()).toString());
@@ -175,10 +175,10 @@ public class XPathExtractor extends Abst
log.error(errrorMessage,e);
throw new JMeterError(errrorMessage,e);
} catch (SAXException e) {// Can happen for bad input document
- log.warn("SAXException while processing ("+getXPathQuery()+") "+e.getLocalizedMessage());
+ log.warn("SAXException while processing ({}). {}", getXPathQuery(), e.getLocalizedMessage());
addAssertionFailure(previousResult, e, false); // Should this also fail the sample?
} catch (TransformerException e) {// Can happen for incorrect XPath expression
- log.warn("TransformerException while processing ("+getXPathQuery()+") "+e.getLocalizedMessage());
+ log.warn("TransformerException while processing ({}). {}", getXPathQuery(), e.getLocalizedMessage());
addAssertionFailure(previousResult, e, false);
} catch (TidyException e) {
// Will already have been logged by XPathUtil
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java Tue Feb 7 22:23:17 2017
@@ -25,17 +25,17 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option;
import com.jayway.jsonpath.PathNotFoundException;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+
/**
* Handles the extractions
* https://github.com/jayway/JsonPath/blob/master/json-path/src/test/java/com/jayway/jsonpath/ComplianceTest.java
@@ -43,7 +43,7 @@ import com.jayway.jsonpath.PathNotFoundE
*/
public class JSONManager {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JSONManager.class);
private static final Configuration DEFAULT_CONFIGURATION =
Configuration.defaultConfiguration().addOptions(Option.ALWAYS_RETURN_LIST);
/**
@@ -82,9 +82,8 @@ public class JSONManager {
extractedObjects = jsonPathParser.read(jsonString,
DEFAULT_CONFIGURATION);
} catch (PathNotFoundException e) {
- if (log.isDebugEnabled()) {
- log.debug("Could not find JSON Path " + jsonPath + " in ["
- + jsonString + "]: " + e.getLocalizedMessage());
+ if(log.isDebugEnabled()) {
+ log.debug("Could not find JSON Path {} in [{}]: {}", jsonPath, jsonString, e.getLocalizedMessage());
}
return Collections.emptyList();
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java Tue Feb 7 22:23:17 2017
@@ -29,9 +29,9 @@ import org.apache.jmeter.testelement.Thr
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JSON-PATH based extractor
@@ -39,8 +39,8 @@ import org.apache.log.Logger;
*/
public class JSONPostProcessor extends AbstractScopedTestElement implements Serializable, PostProcessor, ThreadListener{
- private static final long serialVersionUID = 1320798545214331506L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = LoggerFactory.getLogger(JSONPostProcessor.class);
private static final String JSON_PATH_EXPRESSIONS = "JSONPostProcessor.jsonPathExprs"; // $NON-NLS-1$
private static final String REFERENCE_NAMES = "JSONPostProcessor.referenceNames"; // $NON-NLS-1$
@@ -69,7 +69,7 @@ public class JSONPostProcessor extends A
if (isScopeVariable()) {
jsonResponse = vars.get(getVariableName());
if (log.isDebugEnabled()) {
- log.debug("JSON Extractor is using variable:" + getVariableName() + " which content is:" + jsonResponse);
+ log.debug("JSON Extractor is using variable: {}, which content is: {}", getVariableName(), jsonResponse);
}
} else {
SampleResult previousResult = context.getPreviousResult();
@@ -78,7 +78,7 @@ public class JSONPostProcessor extends A
}
jsonResponse = previousResult.getResponseDataAsString();
if (log.isDebugEnabled()) {
- log.debug("JSON Extractor " + getName() + " working on Response:" + jsonResponse);
+ log.debug("JSON Extractor {} working on Response: {}", getName(), jsonResponse);
}
}
String[] refNames = getRefNames().split(SEPARATOR);
@@ -112,8 +112,7 @@ public class JSONPostProcessor extends A
vars.put(currentRefName, defaultValues[i]);
vars.put(currentRefName + REF_MATCH_NR, "0"); //$NON-NLS-1$
if (matchNumber < 0 && getComputeConcatenation()) {
- log.debug("No value extracted, storing empty in:" //$NON-NLS-1$
- + currentRefName + ALL_SUFFIX);
+ log.debug("No value extracted, storing empty in: {}{}", currentRefName, ALL_SUFFIX);
vars.put(currentRefName + ALL_SUFFIX, "");
}
} else {
@@ -149,11 +148,10 @@ public class JSONPostProcessor extends A
} else {
// extract at position
if (matchNumber > extractedValues.size()) {
- if (log.isDebugEnabled()) {
- log.debug("matchNumber(" + matchNumber
- + ") exceeds number of items found("
- + extractedValues.size()
- + "), default value will be used");
+ if(log.isDebugEnabled()) {
+ log.debug(
+ "matchNumber({}) exceeds number of items found({}), default value will be used",
+ matchNumber, extractedValues.size());
}
vars.put(currentRefName, defaultValues[i]);
} else {
@@ -176,10 +174,9 @@ public class JSONPostProcessor extends A
} catch (Exception e) {
// if something wrong, default value added
if (log.isDebugEnabled()) {
- log.error("Error processing JSON content in "+ getName()+", message:"+e.getLocalizedMessage(),e);
+ log.error("Error processing JSON content in {}, message: {}", getName(), e.getLocalizedMessage(), e);
} else {
- log.error("Error processing JSON content in "+ getName()+", message:"+e.getLocalizedMessage());
-
+ log.error("Error processing JSON content in {}, message: {}", getName(), e.getLocalizedMessage());
}
vars.put(currentRefName, defaultValues[i]);
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java?rev=1782087&r1=1782086&r2=1782087&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java Tue Feb 7 22:23:17 2017
@@ -44,8 +44,8 @@ import org.apache.jmeter.visualizers.Res
import org.apache.jmeter.visualizers.ViewResultsFullVisualizer;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -54,7 +54,7 @@ import org.apache.log.Logger;
*/
public class RenderAsJsonRenderer implements ResultRenderer, ActionListener {
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(RenderAsJsonRenderer.class);
private static final String TAB_SEPARATOR = " "; //$NON-NLS-1$
@@ -153,7 +153,7 @@ public class RenderAsJsonRenderer implem
jsonDataField.setText(response == null ? "" : RenderAsJSON.prettyJSON(response, TAB_SEPARATOR)); //$NON-NLS-1$
jsonDataField.setCaretPosition(0);
} catch (Exception e) {
- LOGGER.error("Exception converting to XML: "+response+ ", message: "+e.getMessage(),e); //$NON-NLS-1$ $NON-NLS-2$
+ log.error("Exception converting to XML: {}, message: {}", response, e.getMessage(), e); //$NON-NLS-1$ $NON-NLS-2$
jsonDataField.setText("Exception converting to XML: "+response+ ", message: "+e.getMessage()); //$NON-NLS-1$ $NON-NLS-2$
jsonDataField.setCaretPosition(0);
}