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 2015/12/11 23:21:02 UTC
svn commit: r1719580 - in /jmeter/trunk/src/core/org/apache/jmeter/report:
config/ dashboard/ processor/ processor/graph/
Author: pmouawad
Date: Fri Dec 11 22:21:02 2015
New Revision: 1719580
URL: http://svn.apache.org/viewvc?rev=1719580&view=rev
Log:
Avoir == false or ==true comparison in if
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java Fri Dec 11 22:21:02 2015
@@ -143,7 +143,7 @@ public class ReportGeneratorConfiguratio
* the new overall sample filter
*/
public final void setSampleFilter(String sampleFilter) {
- if (Objects.equals(this.sampleFilter, sampleFilter) == false) {
+ if (!Objects.equals(this.sampleFilter, sampleFilter)) {
this.sampleFilter = sampleFilter;
filteredSamples.clear();
if (sampleFilter != null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java Fri Dec 11 22:21:02 2015
@@ -157,7 +157,7 @@ public class HtmlTemplateExporter extend
// Get template directory property value
File templateDirectory = getPropertyFromConfig(exportCfg, TEMPLATE_DIR,
TEMPLATE_DIR_DEFAULT, File.class);
- if (templateDirectory.isDirectory() == false) {
+ if (!templateDirectory.isDirectory()) {
String message = String.format(INVALID_TEMPLATE_DIRECTORY_FMT,
templateDirectory);
log.error(message);
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java Fri Dec 11 22:21:02 2015
@@ -188,9 +188,9 @@ public class ReportGenerator {
File tmpDir = configuration.getTempDirectory();
boolean tmpDirCreated = false;
- if (tmpDir.exists() == false) {
+ if (!tmpDir.exists()) {
tmpDirCreated = tmpDir.mkdir();
- if (tmpDirCreated == false) {
+ if (!tmpDirCreated) {
String message = String.format(
"Cannot create temporary directory \"%s\".", tmpDir);
log.error(message);
@@ -317,7 +317,7 @@ public class ReportGenerator {
try {
int i = 0;
boolean invoked = false;
- while (i < methods.length && invoked == false) {
+ while (i < methods.length && !invoked) {
Method method = methods[i];
if (method.getName().equals(setterName)) {
Class<?>[] parameterTypes = method
@@ -345,7 +345,7 @@ public class ReportGenerator {
}
i++;
}
- if (invoked == false) {
+ if (!invoked) {
log.warn(String
.format("\"%s\" is not a valid property for class \"%s\", skip it",
propertyName, className));
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java Fri Dec 11 22:21:02 2015
@@ -438,7 +438,7 @@ public class ExternalSampleSorter extend
if (l.hasNext() && r.hasNext()) {
Sample firstLeft = l.next();
Sample firstRight = r.next();
- if (revertedSort == false
+ if (!revertedSort
&& sampleComparator.compare(firstLeft, firstRight) < 0
|| revertedSort == true
&& sampleComparator.compare(firstLeft, firstRight) >= 0) {
@@ -543,7 +543,7 @@ public class ExternalSampleSorter extend
if (l.hasNext() && r.hasNext()) {
Sample firstLeft = l.peek();
Sample firstRight = r.peek();
- if (revertedSort == false
+ if (!revertedSort
&& sampleComparator.compare(firstLeft, firstRight) < 0
|| revertedSort == true
&& sampleComparator.compare(firstLeft, firstRight) >= 0) {
@@ -570,7 +570,7 @@ public class ExternalSampleSorter extend
if (l.hasNext() && r.hasNext()) {
Sample firstLeft = l.peek();
Sample firstRight = r.peek();
- if (revertedSort == false
+ if (!revertedSort
&& sampleComparator.compare(firstLeft, firstRight) < 0
|| revertedSort == true
&& sampleComparator.compare(firstLeft, firstRight) >= 0) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java Fri Dec 11 22:21:02 2015
@@ -99,10 +99,10 @@ public class FilterConsumer extends Abst
// OR
// None predicate is defined or the sample does not match when
// reverseFilter is true.
- if ((reverseFilter == false && samplePredicate != null && samplePredicate
+ if ((!reverseFilter && samplePredicate != null && samplePredicate
.matches(sample))
- || (reverseFilter == true && (samplePredicate == null || samplePredicate
- .matches(sample) == false))) {
+ || (reverseFilter && (samplePredicate == null || !samplePredicate
+ .matches(sample)))) {
super.produce(sample, channel);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java Fri Dec 11 22:21:02 2015
@@ -55,7 +55,7 @@ public class RequestsSummaryConsumer ext
@Override
public void consume(Sample sample, int channel) {
count++;
- if (sample.getSuccess() == false) {
+ if (!sample.getSuccess()) {
errorCount++;
}
super.produce(sample, channel);
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java Fri Dec 11 22:21:02 2015
@@ -50,9 +50,9 @@ public class StatisticsSummaryConsumer e
data.IncTotal();
data.IncBytes(sample.getSentBytes());
- if (sample.getSuccess() == false) {
- data.IncErrors();
- }
+ if (!sample.getSuccess()) {
+ data.IncErrors();
+ }
long elapsedTime = sample.getElapsedTime();
data.getPercentile1().addValue(elapsedTime);
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java Fri Dec 11 22:21:02 2015
@@ -270,7 +270,7 @@ public abstract class AbstractGraphConsu
// Populate it with data from groupData
Map<Double, Aggregator> aggInfo;
- if (aggregated == false) {
+ if (!aggregated) {
aggInfo = seriesData.getAggregatorInfo();
} else {
series = String.format(aggregatedKeysSeriesFormat, series);
@@ -278,7 +278,7 @@ public abstract class AbstractGraphConsu
aggInfo.put(seriesData.getKeysAggregator().getResult(),
seriesData.getValuesAggregator());
}
- if (renderPercentiles == false) {
+ if (!renderPercentiles) {
for (Map.Entry<Double, Aggregator> entry : aggInfo.entrySet()) {
// Init key and value depending on revertsKeysAndValues property
Double key = entry.getKey();
@@ -287,7 +287,7 @@ public abstract class AbstractGraphConsu
// Create result storage for coordinates
ListResultData coordResult = new ListResultData();
- if (revertsKeysAndValues == false) {
+ if (!revertsKeysAndValues) {
key = entry.getKey();
value = entry.getValue().getResult();
} else {
@@ -307,7 +307,7 @@ public abstract class AbstractGraphConsu
int rank = 0;
double percent = 0;
TreeMap<Double, Aggregator> sortedInfo = new TreeMap<>(aggInfo);
- if (revertsKeysAndValues == false) {
+ if (!revertsKeysAndValues) {
for (Map.Entry<Double, Aggregator> entry : sortedInfo
.entrySet()) {
double value = entry.getKey();
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java?rev=1719580&r1=1719579&r2=1719580&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java Fri Dec 11 22:21:02 2015
@@ -261,9 +261,9 @@ public abstract class AbstractVersusRequ
// Handle the working directory
File workDir = parent.getWorkingDirectory();
createdWorkDir = false;
- if (workDir.exists() == false) {
+ if (!workDir.exists()) {
createdWorkDir = workDir.mkdir();
- if (createdWorkDir == false) {
+ if (!createdWorkDir) {
String message = String.format(
"Cannot create create working directory \"%s\"",
workDir);