Author: sebb
Date: Mon Dec 14 18:02:40 2015
New Revision: 1719978
URL: http://svn.apache.org/viewvc?rev=1719978&view=rev
Log:
Explicit boxing
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.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/AbstractOverTimeGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java Mon
Dec 14 18:02:40 2015
@@ -133,7 +133,7 @@ public class SampleMetadata {
this.columns = columns;
int size = columns.size();
for (int i = 0; i < size; i++) {
- index.put(this.columns.get(i).trim(), i);
+ index.put(this.columns.get(i).trim(), Integer.valueOf(i));
}
}
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=1719978&r1=1719977&r2=1719978&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
Mon Dec 14 18:02:40 2015
@@ -215,7 +215,7 @@ public class ReportGenerator {
@Override
public Double select(Sample sample) {
- return (double) sample.getStartTime();
+ return Double.valueOf(sample.getStartTime());
}
});
beginDateConsumer.setName(BEGIN_DATE_CONSUMER_NAME);
@@ -226,7 +226,7 @@ public class ReportGenerator {
@Override
public Double select(Sample sample) {
- return (double) sample.getEndTime();
+ return Double.valueOf(sample.getEndTime());
}
});
endDateConsumer.setName(END_DATE_CONSUMER_NAME);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
Mon Dec 14 18:02:40 2015
@@ -154,11 +154,11 @@ abstract public class AbstractSampleCons
@Override
public void setConsumedMetadata(SampleMetadata sampleMetadata, int
channel) {
- consumedMetadata.put(channel, sampleMetadata);
+ consumedMetadata.put(Integer.valueOf(channel), sampleMetadata);
}
public SampleMetadata getConsumedMetadata(int channel) {
- return consumedMetadata.get(channel);
+ return consumedMetadata.get(Integer.valueOf(channel));
}
public int getConsumedChannelCount() {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java
Mon Dec 14 18:02:40 2015
@@ -110,7 +110,7 @@ public class AggregateConsumer extends A
*/
@Override
public void stopConsuming() {
- setDataToContext(getName(), new
ValueResultData(aggregator.getResult()));
+ setDataToContext(getName(), new
ValueResultData(Double.valueOf(aggregator.getResult())));
super.stopProducing();
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
Mon Dec 14 18:02:40 2015
@@ -64,12 +64,12 @@ public class ApdexSummaryConsumer extend
@Override
protected ListResultData createDataResult(String key, ApdexSummaryData
data) {
ListResultData result = new ListResultData();
- result.addResult(new ValueResultData(getApdex(data)));
+ result.addResult(new ValueResultData(Double.valueOf(getApdex(data))));
ApdexThresholdsInfo thresholdsInfo = data.getApdexThresholdInfo();
- result.addResult(new ValueResultData(thresholdsInfo
- .getSatisfiedThreshold()));
- result.addResult(new ValueResultData(thresholdsInfo
- .getToleratedThreshold()));
+ result.addResult(new ValueResultData(Long.valueOf(thresholdsInfo
+ .getSatisfiedThreshold())));
+ result.addResult(new ValueResultData(Long.valueOf(thresholdsInfo
+ .getToleratedThreshold())));
result.addResult(new ValueResultData(key != null ? key : JMeterUtils
.getResString("reportgenerator_summary_total")));
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=1719978&r1=1719977&r2=1719978&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
Mon Dec 14 18:02:40 2015
@@ -69,10 +69,10 @@ public class RequestsSummaryConsumer ext
@Override
public void stopConsuming() {
MapResultData result = new MapResultData();
- result.setResult("KoPercent", new ValueResultData((double) errorCount
- * 100 / count));
+ result.setResult("KoPercent", new
ValueResultData(Double.valueOf(((double) errorCount
+ * 100 / count))));
result.setResult("OkPercent", new ValueResultData(
- (double) (count - errorCount) * 100 / count));
+ Double.valueOf(((double) (count - errorCount) * 100 /
count))));
setDataToContext(getName(), result);
super.stopProducing();
}
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=1719978&r1=1719977&r2=1719978&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
Mon Dec 14 18:02:40 2015
@@ -111,16 +111,16 @@ public class StatisticsSummaryConsumer e
key != null ? key :
JMeterUtils.getResString("reportgenerator_summary_total")));
long total = data.getTotal();
long errors = data.getErrors();
- result.addResult(new ValueResultData(total));
- result.addResult(new ValueResultData(errors));
- result.addResult(new ValueResultData((double) errors * 100 / total));
- result.addResult(new
ValueResultData(data.getPercentile1().getResult()));
- result.addResult(new
ValueResultData(data.getPercentile2().getResult()));
- result.addResult(new
ValueResultData(data.getPercentile3().getResult()));
- result.addResult(new ValueResultData(data.getThroughput()));
- result.addResult(new ValueResultData(data.getKBytesPerSecond()));
- result.addResult(new ValueResultData(data.getMin()));
- result.addResult(new ValueResultData(data.getMax()));
+ result.addResult(new ValueResultData(Long.valueOf(total)));
+ result.addResult(new ValueResultData(Long.valueOf(errors)));
+ result.addResult(new ValueResultData(Double.valueOf((double) errors *
100 / total)));
+ result.addResult(new
ValueResultData(Double.valueOf(data.getPercentile1().getResult())));
+ result.addResult(new
ValueResultData(Double.valueOf(data.getPercentile2().getResult())));
+ result.addResult(new
ValueResultData(Double.valueOf(data.getPercentile3().getResult())));
+ result.addResult(new
ValueResultData(Double.valueOf(data.getThroughput())));
+ result.addResult(new
ValueResultData(Double.valueOf(data.getKBytesPerSecond())));
+ result.addResult(new ValueResultData(Long.valueOf(data.getMin())));
+ result.addResult(new ValueResultData(Long.valueOf(data.getMax())));
return result;
}
@@ -157,15 +157,15 @@ public class StatisticsSummaryConsumer e
titles.addResult(new ValueResultData(
String.format(
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
- PERCENTILE_INDEX1)));
+ Integer.valueOf(PERCENTILE_INDEX1))));
titles.addResult(new ValueResultData(
String.format(
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
- PERCENTILE_INDEX2)));
+ Integer.valueOf(PERCENTILE_INDEX2))));
titles.addResult(new ValueResultData(
String.format(
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
- PERCENTILE_INDEX3)));
+ Integer.valueOf(PERCENTILE_INDEX3))));
titles.addResult(new
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_throughput")));
titles.addResult(new
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_kbytes")));
titles.addResult(new
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_min")));
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=1719978&r1=1719977&r2=1719978&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
Mon Dec 14 18:02:40 2015
@@ -277,23 +277,23 @@ public abstract class AbstractGraphConsu
} else {
series = String.format(aggregatedKeysSeriesFormat, series);
aggInfo = new HashMap<>();
- aggInfo.put(seriesData.getKeysAggregator().getResult(),
+
aggInfo.put(Double.valueOf(seriesData.getKeysAggregator().getResult()),
seriesData.getValuesAggregator());
}
if (!renderPercentiles) {
for (Map.Entry<Double, Aggregator> entry : aggInfo.entrySet()) {
// Init key and value depending on revertsKeysAndValues
property
Double key = entry.getKey();
- Double value = entry.getValue().getResult();
+ Double value = Double.valueOf(entry.getValue().getResult());
// Create result storage for coordinates
ListResultData coordResult = new ListResultData();
if (!revertsKeysAndValues) {
key = entry.getKey();
- value = entry.getValue().getResult();
+ value = Double.valueOf(entry.getValue().getResult());
} else {
- key = entry.getValue().getResult();
+ key = Double.valueOf(entry.getValue().getResult());
value = entry.getKey();
}
coordResult.addResult(new ValueResultData(key));
@@ -393,10 +393,10 @@ public abstract class AbstractGraphConsu
private MapResultData createResult() {
MapResultData result = new MapResultData();
- result.setResult(RESULT_MIN_X, new ValueResultData(Double.MAX_VALUE));
- result.setResult(RESULT_MAX_X, new ValueResultData(Double.MIN_VALUE));
- result.setResult(RESULT_MIN_Y, new ValueResultData(Double.MAX_VALUE));
- result.setResult(RESULT_MAX_Y, new ValueResultData(Double.MIN_VALUE));
+ result.setResult(RESULT_MIN_X, new
ValueResultData(Double.valueOf(Double.MAX_VALUE)));
+ result.setResult(RESULT_MAX_X, new
ValueResultData(Double.valueOf(Double.MIN_VALUE)));
+ result.setResult(RESULT_MIN_Y, new
ValueResultData(Double.valueOf(Double.MAX_VALUE)));
+ result.setResult(RESULT_MAX_Y, new
ValueResultData(Double.valueOf(Double.MIN_VALUE)));
result.setResult(RESULT_SERIES, new ListResultData());
boolean supportsControllersDiscrimination = true;
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
Mon Dec 14 18:02:40 2015
@@ -103,6 +103,6 @@ public abstract class AbstractOverTimeGr
@Override
protected void initializeExtraResults(MapResultData parentResult) {
parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(
- granularity));
+ Long.valueOf(granularity)));
}
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
Mon Dec 14 18:02:40 2015
@@ -58,7 +58,7 @@ public class IndexedNameSelector impleme
names.addLast(name);
index = names.size() - 1;
}
- return (double) index;
+ return Double.valueOf(index);
}
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
Mon Dec 14 18:02:40 2015
@@ -80,7 +80,7 @@ public class TimeStampKeysSelector imple
@Override
public Double select(Sample sample) {
long time = selectBeginTime ? sample.getStartTime() :
sample.getEndTime();
- return (double) (time - time % granularity);
+ return Double.valueOf(((double) time - time % granularity));
}
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
Mon Dec 14 18:02:40 2015
@@ -72,7 +72,7 @@ public class ResponseTimeDistributionGra
@Override
public Double select(Sample sample) {
long elapsed = sample.getElapsedTime();
- return (double) (elapsed - elapsed % granularity);
+ return Double.valueOf(((double) (elapsed - elapsed %
granularity)));
}
};
@@ -105,7 +105,7 @@ public class ResponseTimeDistributionGra
protected void initializeExtraResults(MapResultData parentResult) {
parentResult.setResult(
AbstractOverTimeGraphConsumer.RESULT_CTX_GRANULARITY,
- new ValueResultData(granularity));
+ new ValueResultData(Long.valueOf(granularity)));
}
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
Mon Dec 14 18:02:40 2015
@@ -76,7 +76,7 @@ public class ResponseTimePerSampleGraphC
factory.setPercentileIndex(property);
StaticSeriesSelector seriesSelector = new StaticSeriesSelector();
seriesSelector.setSeriesName(String.format(
- RESPONSE_TIME_PER_SAMPLE_SERIES_FORMAT, property));
+ RESPONSE_TIME_PER_SAMPLE_SERIES_FORMAT,
Integer.valueOf(property)));
return new GroupInfo(factory, seriesSelector,
new ElapsedTimeValueSelector(), false, false);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
Mon Dec 14 18:02:40 2015
@@ -55,7 +55,7 @@ public class ResponseTimePercentilesGrap
@Override
public Double select(Sample sample) {
- return (double) sample.getElapsedTime();
+ return Double.valueOf(sample.getElapsedTime());
}
};
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java?rev=1719978&r1=1719977&r2=1719978&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
Mon Dec 14 18:02:40 2015
@@ -48,7 +48,7 @@ public class TimeVSThreadGraphConsumer e
@Override
public Double select(Sample sample) {
- return (double) sample.getAllThreads();
+ return Double.valueOf(sample.getAllThreads());
}
};
}
