You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/11/11 18:56:48 UTC
[jmeter] 01/02: Remove unnecessary boxing
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 43990239cf71d4df70dc990c40a0f485e0138f8f
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri Oct 18 23:56:27 2019 +0300
Remove unnecessary boxing
---
.../assertions/CompareAssertionBeanInfo.java | 2 +-
.../jmeter/assertions/DurationAssertion.java | 2 +-
.../apache/jmeter/assertions/SizeAssertion.java | 2 +-
.../extractor/json/jmespath/JMESPathExtractor.java | 2 +-
.../extractor/json/jsonpath/JSONPostProcessor.java | 2 +-
.../org/apache/jmeter/modifiers/CounterConfig.java | 6 ++--
.../java/org/apache/jmeter/sampler/TestAction.java | 4 +--
.../timers/ConstantThroughputTimerBeanInfo.java | 4 +--
.../apache/jmeter/timers/SyncTimerBeanInfo.java | 4 +--
.../PreciseThroughputTimerBeanInfo.java | 10 +++---
.../visualizers/RespTimeGraphVisualizer.java | 6 ++--
.../jmeter/visualizers/StatGraphVisualizer.java | 6 ++--
.../graphite/TextGraphiteMetricsSender.java | 2 +-
.../org/apache/jmeter/timers/TimerServiceTest.java | 8 ++---
.../org/apache/jmeter/control/LoopController.java | 2 +-
.../org/apache/jmeter/gui/SavePropertyDialog.java | 2 +-
.../gui/action/CompileJSR223TestElements.java | 2 +-
.../org/apache/jmeter/gui/util/JMeterToolBar.java | 20 +++++------
.../apache/jmeter/gui/util/PowerTableModel.java | 6 ++--
.../config/ReportGeneratorConfiguration.java | 4 +--
.../org/apache/jmeter/report/core/Converters.java | 2 +-
.../apache/jmeter/report/core/CsvSampleReader.java | 2 +-
.../apache/jmeter/report/core/SampleMetadata.java | 2 +-
.../report/dashboard/HtmlTemplateExporter.java | 6 ++--
.../jmeter/report/dashboard/ReportGenerator.java | 4 +--
.../report/processor/AbstractSampleConsumer.java | 4 +--
.../report/processor/AbstractSummaryConsumer.java | 4 +--
.../jmeter/report/processor/AggregateConsumer.java | 2 +-
.../report/processor/ApdexSummaryConsumer.java | 6 ++--
.../report/processor/ErrorsSummaryConsumer.java | 12 +++----
.../report/processor/RequestsSummaryConsumer.java | 6 ++--
.../processor/StatisticsSummaryConsumer.java | 30 ++++++++--------
.../processor/Top5ErrorsBySamplerConsumer.java | 4 +--
.../report/processor/Top5ErrorsSummaryData.java | 4 +--
.../processor/graph/AbstractGraphConsumer.java | 42 +++++++++++-----------
.../graph/AbstractOverTimeGraphConsumer.java | 2 +-
.../graph/AbstractVersusRequestsGraphConsumer.java | 10 +++---
.../processor/graph/ConnectTimeValueSelector.java | 4 +--
.../report/processor/graph/CountValueSelector.java | 4 +--
.../processor/graph/ElapsedTimeValueSelector.java | 4 +--
.../processor/graph/IndexedNameSelector.java | 2 +-
.../processor/graph/LatencyValueSelector.java | 4 +--
.../graph/SuccessfulElapsedTimeValueSelector.java | 2 +-
.../processor/graph/TimeStampKeysSelector.java | 2 +-
.../graph/impl/ActiveThreadsGraphConsumer.java | 2 +-
.../graph/impl/BytesThroughputGraphConsumer.java | 7 ++--
.../processor/graph/impl/CustomGraphConsumer.java | 2 +-
.../ResponseTimeDistributionGraphConsumer.java | 4 +--
.../impl/ResponseTimePerSampleGraphConsumer.java | 2 +-
.../impl/ResponseTimePercentilesGraphConsumer.java | 2 +-
...sponseTimePercentilesOverTimeGraphConsumer.java | 2 +-
...heticResponseTimeDistributionGraphConsumer.java | 22 ++++++------
.../graph/impl/TimeVSThreadGraphConsumer.java | 2 +-
.../apache/jmeter/testbeans/BeanInfoSupport.java | 4 +--
.../apache/jmeter/testbeans/gui/EnumEditor.java | 2 +-
.../testbeans/gui/GenericTestBeanCustomizer.java | 4 +--
.../testelement/property/BooleanProperty.java | 2 +-
.../testelement/property/DoubleProperty.java | 2 +-
.../jmeter/testelement/property/FloatProperty.java | 2 +-
.../testelement/property/IntegerProperty.java | 2 +-
.../jmeter/testelement/property/LongProperty.java | 2 +-
.../apache/jmeter/util/BeanShellInterpreter.java | 2 +-
.../org/apache/jmeter/util/BeanShellServer.java | 2 +-
.../java/org/apache/jmeter/util/Calculator.java | 2 +-
.../java/org/apache/jmeter/util/SSLManager.java | 4 +--
.../java/org/apache/jmeter/util/XPathUtil.java | 2 +-
.../jmeter/visualizers/SamplingStatCalculator.java | 4 +--
.../org/apache/jmeter/junit/JMeterTestCase.java | 2 +-
.../testelement/property/MapPropertyTest.java | 2 +-
.../jmeter/examples/sampler/ExampleSampler.java | 2 +-
.../testbeans/example3/Example3BeanInfo.java | 8 ++---
.../apache/commons/cli/avalon/CLArgsParser.java | 4 +--
.../apache/jorphan/math/StatCalculatorInteger.java | 10 +++---
.../apache/jorphan/math/StatCalculatorLong.java | 10 +++---
.../org/apache/jorphan/reflect/ClassTools.java | 2 +-
.../java/org/apache/jorphan/util/Converter.java | 12 +++----
.../java/org/apache/jorphan/util/HeapDumper.java | 2 +-
.../apache/jorphan/collections/PackageTest.java | 2 +-
.../apache/jorphan/gui/MinMaxLongRendererTest.java | 6 ++--
.../apache/jorphan/math/TestStatCalculator.java | 8 ++---
.../org/apache/jorphan/util/TestJorphanUtils.java | 8 ++---
.../jmeter/protocol/http/control/AuthManager.java | 2 +-
.../protocol/http/control/HeaderManager.java | 2 +-
.../jmeter/protocol/http/curl/BasicCurlParser.java | 4 +--
.../jmeter/protocol/http/gui/CookiePanel.java | 2 +-
.../http/parser/LagartoBasedHtmlParser.java | 4 +--
.../jmeter/protocol/http/sampler/HTTPHC4Impl.java | 24 ++++++-------
.../protocol/http/visualizers/RequestViewHTTP.java | 2 +-
.../protocol/jdbc/config/DataSourceElement.java | 2 +-
.../jdbc/config/DataSourceElementBeanInfo.java | 12 +++----
.../protocol/mail/sampler/MailFileFolder.java | 2 +-
.../mongodb/config/MongoSourceElementBeanInfo.java | 16 ++++-----
92 files changed, 244 insertions(+), 247 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
index 1ec7962..7a6f424 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
@@ -37,7 +37,7 @@ public class CompareAssertionBeanInfo extends BeanInfoSupport {
p.setValue(NOT_EXPRESSION, Boolean.TRUE);
p = property("compareTime"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Long.valueOf(-1));
+ p.setValue(DEFAULT, -1L);
p.setValue(NOT_EXPRESSION, Boolean.FALSE);
p = property("stringsToSkip"); //$NON-NLS-1$
p.setPropertyEditorClass(TableEditor.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/DurationAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/DurationAssertion.java
index 34e621b..32bad40 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/DurationAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/DurationAssertion.java
@@ -52,7 +52,7 @@ public class DurationAssertion extends AbstractScopedAssertion implements Serial
// has the Sample lasted too long?
if ( responseTime > duration ) {
result.setFailure(true);
- Object[] arguments = { Long.valueOf(responseTime), Long.valueOf(duration) };
+ Object[] arguments = {responseTime, duration};
String message = MessageFormat.format(
JMeterUtils.getResString("duration_assertion_failure") // $NON-NLS-1$
, arguments);
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
index 677534e..95c6ca3 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
@@ -100,7 +100,7 @@ public class SizeAssertion extends AbstractScopedAssertion implements Serializab
final String msg = compareSize(resultSize);
if (msg.length() > 0) {
result.setFailure(true);
- Object[] arguments = { Long.valueOf(resultSize), msg, Long.valueOf(getAllowedSize()) };
+ Object[] arguments = {resultSize, msg, Long.valueOf(getAllowedSize()) };
String message = MessageFormat.format(
JMeterUtils.getResString("size_assertion_failure"), arguments); //$NON-NLS-1$
result.setFailureMessage(message);
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
index cd6325b..bdd51ae 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathExtractor.java
@@ -125,7 +125,7 @@ public class JMESPathExtractor extends AbstractScopedTestElement
if (log.isDebugEnabled()) {
log.debug(
"matchNumber({}) exceeds number of items found({}), default value will be used",
- Integer.valueOf(matchNumber), Integer.valueOf(resultList.size()));
+ matchNumber, resultList.size());
}
vars.put(refName, defaultValue);
} else {
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 74718ce..77e6dd7 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
@@ -174,7 +174,7 @@ public class JSONPostProcessor
if(log.isDebugEnabled()) {
log.debug(
"matchNumber({}) exceeds number of items found({}), default value will be used",
- Integer.valueOf(matchNumber), Integer.valueOf(extractedValues.size()));
+ matchNumber, extractedValues.size());
}
vars.put(currentRefName, defaultValues[i]);
} else {
diff --git a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
index 2420525..c6986c8 100644
--- a/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
+++ b/src/components/src/main/java/org/apache/jmeter/modifiers/CounterConfig.java
@@ -69,7 +69,7 @@ public class CounterConfig extends AbstractTestElement
private static final Logger log = LoggerFactory.getLogger(CounterConfig.class);
private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
- perTheadNumber = ThreadLocal.withInitial(()-> Long.valueOf(getStart()));
+ perTheadNumber = ThreadLocal.withInitial(this::getStart);
perTheadLastIterationNumber = ThreadLocal.withInitial(() -> Long.valueOf(1));
}
@@ -110,14 +110,14 @@ public class CounterConfig extends AbstractTestElement
// reset
current = getStart();
}
- perTheadLastIterationNumber.set(Long.valueOf(iteration));
+ perTheadLastIterationNumber.set((long) iteration);
}
variables.put(getVarName(), formatNumber(current));
current += increment;
if (current > end) {
current = start;
}
- perTheadNumber.set(Long.valueOf(current));
+ perTheadNumber.set(current);
}
}
diff --git a/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
index 6c3543e..7f114ae 100644
--- a/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
+++ b/src/components/src/main/java/org/apache/jmeter/sampler/TestAction.java
@@ -160,8 +160,8 @@ public class TestAction extends AbstractSampler implements Interruptible {
long adjustDelay = TIMER_SERVICE.adjustDelay(millis);
if (log.isDebugEnabled()) {
log.debug("Sleeping in Flow Control Action for {} ms (asked for {} ms)",
- Long.valueOf(adjustDelay),
- Long.valueOf(millis));
+ adjustDelay,
+ millis);
}
TimeUnit.MILLISECONDS.sleep(adjustDelay);
} else if (millis < 0) {
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
index e635cb5..9ac4b41 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
@@ -36,10 +36,10 @@ public class ConstantThroughputTimerBeanInfo extends BeanInfoSupport {
PropertyDescriptor p = property("throughput"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Double.valueOf(0.0));
+ p.setValue(DEFAULT, 0.0);
p = property("calcMode", ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
- p.setValue(DEFAULT, Integer.valueOf(ConstantThroughputTimer.Mode.ThisThreadOnly.ordinal()));
+ p.setValue(DEFAULT, ConstantThroughputTimer.Mode.ThisThreadOnly.ordinal());
p.setValue(NOT_UNDEFINED, Boolean.TRUE); // must be defined
}
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java
index f65246b..bcf83ed 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/SyncTimerBeanInfo.java
@@ -31,11 +31,11 @@ public class SyncTimerBeanInfo extends BeanInfoSupport {
PropertyDescriptor p = property("groupSize");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(0));
+ p.setValue(DEFAULT, 0);
p = property("timeoutInMs");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Long.valueOf(0));
+ p.setValue(DEFAULT, 0L);
}
diff --git a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java
index 0bf8c21..3b89fe2 100644
--- a/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java
+++ b/src/components/src/main/java/org/apache/jmeter/timers/poissonarrivals/PreciseThroughputTimerBeanInfo.java
@@ -40,7 +40,7 @@ public class PreciseThroughputTimerBeanInfo extends BeanInfoSupport {
PropertyDescriptor p;
p = property("throughput"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Double.valueOf(100));
+ p.setValue(DEFAULT, 100d);
p = property("throughputPeriod"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
@@ -48,7 +48,7 @@ public class PreciseThroughputTimerBeanInfo extends BeanInfoSupport {
p = property("duration"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Long.valueOf(3600));
+ p.setValue(DEFAULT, 3600L);
createPropertyGroup(
"batching", //$NON-NLS-1$
@@ -77,11 +77,11 @@ public class PreciseThroughputTimerBeanInfo extends BeanInfoSupport {
p = property("exactLimit"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(10000));
+ p.setValue(DEFAULT, 10000);
p = property("allowedThroughputSurplus"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Double.valueOf(1.0d));
+ p.setValue(DEFAULT, 1.0d);
createPropertyGroup(
"repeatability", //$NON-NLS-1$
@@ -92,6 +92,6 @@ public class PreciseThroughputTimerBeanInfo extends BeanInfoSupport {
p = property("randomSeed"); //$NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Long.valueOf(0));
+ p.setValue(DEFAULT, 0L);
}
}
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
index 7e620b8..8515f65 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
@@ -320,7 +320,7 @@ public class RespTimeGraphVisualizer extends AbstractVisualizer implements Actio
}
// List of value by sampler
Map<Long, StatCalculatorLong> subList = pList.get(sampleLabel);
- final Long startTimeIntervalLong = Long.valueOf(startTimeInterval);
+ final Long startTimeIntervalLong = startTimeInterval;
if (subList != null) {
long respTime = sampleResult.getTime();
StatCalculatorLong value = subList.get(startTimeIntervalLong);
@@ -408,7 +408,7 @@ public class RespTimeGraphVisualizer extends AbstractVisualizer implements Actio
int idx = 0;
while (idx < durationTest) {
long keyShift = minStartTime + idx;
- StatCalculatorLong value = subList.get(Long.valueOf(keyShift));
+ StatCalculatorLong value = subList.get(keyShift);
if (value != null) {
nanLast = value.getMean();
data[s][idx] = nanLast;
@@ -427,7 +427,7 @@ public class RespTimeGraphVisualizer extends AbstractVisualizer implements Actio
nanList.clear();
}
} else {
- nanList.add(Double.valueOf(Double.NaN));
+ nanList.add(Double.NaN);
nanBegin = nanLast;
data[s][idx] = Double.NaN;
}
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
index 86d0174..168a252 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/StatGraphVisualizer.java
@@ -104,9 +104,9 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable
private static final String PCT2_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct2", "95");
private static final String PCT3_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct3", "99");
- private static final Float PCT1_VALUE = Float.valueOf(Float.parseFloat(PCT1_LABEL)/100);
- private static final Float PCT2_VALUE = Float.valueOf(Float.parseFloat(PCT2_LABEL)/100);
- private static final Float PCT3_VALUE = Float.valueOf(Float.parseFloat(PCT3_LABEL)/100);
+ private static final Float PCT1_VALUE = Float.parseFloat(PCT1_LABEL) / 100;
+ private static final Float PCT2_VALUE = Float.parseFloat(PCT2_LABEL) / 100;
+ private static final Float PCT3_VALUE = Float.parseFloat(PCT3_LABEL) / 100;
private static final Logger log = LoggerFactory.getLogger(StatGraphVisualizer.class);
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
index 1d4ef33..970290a 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSender.java
@@ -111,7 +111,7 @@ class TextGraphiteMetricsSender extends AbstractGraphiteMetricsSender {
// pw is not closed as it would close the underlying pooled out
PrintWriter pw = new PrintWriter(new OutputStreamWriter(out, CHARSET_NAME), false);
for (MetricTuple metric : currentMetrics) {
- pw.printf("%s %s %d%n", metric.name, metric.value, Long.valueOf(metric.timestamp));
+ pw.printf("%s %s %d%n", metric.name, metric.value, metric.timestamp);
}
pw.flush();
if (log.isDebugEnabled()) {
diff --git a/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java b/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java
index 7a130c4..9954962 100644
--- a/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java
+++ b/src/components/src/test/java/org/apache/jmeter/timers/TimerServiceTest.java
@@ -33,7 +33,7 @@ public class TimerServiceTest {
long now = System.currentTimeMillis();
long adjustedDelay = sut.adjustDelay(Long.MAX_VALUE, now + 1000L, false);
Assert.assertThat("TimerService should return -1 as delay would lead to a time after end time",
- Long.valueOf(adjustedDelay), CoreMatchers.is(Long.valueOf(-1)));
+ adjustedDelay, CoreMatchers.is((long) -1));
}
@Test
@@ -41,7 +41,7 @@ public class TimerServiceTest {
long now = System.currentTimeMillis();
long adjustedDelay = sut.adjustDelay(Long.MAX_VALUE, now + 1000L);
Assert.assertThat("TimerService should return -1 as delay would lead to a time after end time",
- Long.valueOf(adjustedDelay), isAlmost(1000L, 200L));
+ adjustedDelay, isAlmost(1000L, 200L));
}
private BaseMatcher<Long> isAlmost(long value, long precision) {
@@ -67,13 +67,13 @@ public class TimerServiceTest {
public void testSmallInitialDelay() {
long now = System.currentTimeMillis();
Assert.assertThat("TimerService should not change the delay as the end time is far away",
- Long.valueOf(sut.adjustDelay(1000L, now + 20000L)), CoreMatchers.is(Long.valueOf(1000L)));
+ sut.adjustDelay(1000L, now + 20000L), CoreMatchers.is(1000L));
}
@Test
public void testNegativeEndTime() {
Assert.assertThat("TimerService should not change the delay as the indicated end time is far away",
- Long.valueOf(sut.adjustDelay(1000L, -1)), CoreMatchers.is(Long.valueOf(1000L)));
+ sut.adjustDelay(1000L, -1), CoreMatchers.is(1000L));
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
index 32516c2..ed67abd 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/LoopController.java
@@ -90,7 +90,7 @@ public class LoopController extends GenericController implements Serializable, I
JMeterProperty prop = getProperty(LOOPS);
nbLoops = Integer.valueOf(prop.getStringValue());
} catch (NumberFormatException e) {
- nbLoops = Integer.valueOf(0);
+ nbLoops = 0;
}
}
return nbLoops.intValue();
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/SavePropertyDialog.java b/src/core/src/main/java/org/apache/jmeter/gui/SavePropertyDialog.java
index bcff278..f8a8d05 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/SavePropertyDialog.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/SavePropertyDialog.java
@@ -134,7 +134,7 @@ public class SavePropertyDialog extends JDialog implements ActionListener {
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
Functor f = functors.get(action);
- f.invoke(saveConfig, new Object[] {Boolean.valueOf(((JCheckBox) e.getSource()).isSelected()) });
+ f.invoke(saveConfig, new Object[] {((JCheckBox) e.getSource()).isSelected()});
}
private boolean getSaveState(String methodName) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
index b991043..7150b12 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
@@ -115,7 +115,7 @@ public class CompileJSR223TestElements extends AbstractAction implements MenuCre
wholeTree.traverse(visitor);
GuiPackage.getInstance().getMainFrame().repaint();
if (visitor.getElementsWithCompilationErrors()>0) {
- JMeterUtils.reportErrorToUser(MESSAGE_FORMAT.format(new Object[]{Integer.valueOf(visitor.getElementsWithCompilationErrors())}));
+ JMeterUtils.reportErrorToUser(MESSAGE_FORMAT.format(new Object[]{visitor.getElementsWithCompilationErrors()}));
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index b4dff75..bd4e699 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -217,7 +217,7 @@ public class JMeterToolBar extends JToolBar implements LocaleChangeListener {
for (Component component : components) {
if (component instanceof JButton) {
JButton button = (JButton) component;
- buttonStates.put(button.getActionCommand(), Boolean.valueOf(button.isEnabled()));
+ buttonStates.put(button.getActionCommand(), button.isEnabled());
}
}
return buttonStates;
@@ -248,10 +248,10 @@ public class JMeterToolBar extends JToolBar implements LocaleChangeListener {
*/
public void setLocalTestStarted(boolean started) {
Map<String, Boolean> buttonStates = new HashMap<>(3);
- buttonStates.put(ActionNames.ACTION_START, Boolean.valueOf(!started));
- buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, Boolean.valueOf(!started));
- buttonStates.put(ActionNames.ACTION_STOP, Boolean.valueOf(started));
- buttonStates.put(ActionNames.ACTION_SHUTDOWN, Boolean.valueOf(started));
+ buttonStates.put(ActionNames.ACTION_START, !started);
+ buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, !started);
+ buttonStates.put(ActionNames.ACTION_STOP, started);
+ buttonStates.put(ActionNames.ACTION_SHUTDOWN, started);
updateButtons(buttonStates);
}
@@ -263,9 +263,9 @@ public class JMeterToolBar extends JToolBar implements LocaleChangeListener {
*/
public void setRemoteTestStarted(boolean started) {
Map<String, Boolean> buttonStates = new HashMap<>(3);
- buttonStates.put(ActionNames.REMOTE_START_ALL, Boolean.valueOf(!started));
- buttonStates.put(ActionNames.REMOTE_STOP_ALL, Boolean.valueOf(started));
- buttonStates.put(ActionNames.REMOTE_SHUT_ALL, Boolean.valueOf(started));
+ buttonStates.put(ActionNames.REMOTE_START_ALL, !started);
+ buttonStates.put(ActionNames.REMOTE_STOP_ALL, started);
+ buttonStates.put(ActionNames.REMOTE_SHUT_ALL, started);
updateButtons(buttonStates);
}
@@ -281,8 +281,8 @@ public class JMeterToolBar extends JToolBar implements LocaleChangeListener {
*/
public void updateUndoRedoIcons(boolean canUndo, boolean canRedo) {
Map<String, Boolean> buttonStates = new HashMap<>(2);
- buttonStates.put(ActionNames.UNDO, Boolean.valueOf(canUndo));
- buttonStates.put(ActionNames.REDO, Boolean.valueOf(canRedo));
+ buttonStates.put(ActionNames.UNDO, canUndo);
+ buttonStates.put(ActionNames.REDO, canRedo);
updateButtons(buttonStates);
}
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java b/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java
index e142186..d2dcfd6 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/PowerTableModel.java
@@ -40,9 +40,9 @@ public class PowerTableModel extends DefaultTableModel {
private Class<?>[] columnClasses;
- private static final List<Object> DEFAULT_ARGS = Collections.unmodifiableList(Arrays.asList("", Integer.valueOf(0),
- Long.valueOf(0L), Boolean.FALSE, Float.valueOf(0F), Double.valueOf(0D), Character.valueOf(' '),
- Byte.valueOf(Byte.MIN_VALUE), Short.valueOf(Short.MIN_VALUE)));
+ private static final List<Object> DEFAULT_ARGS = Collections.unmodifiableList(Arrays.asList("", 0,
+ 0L, Boolean.FALSE, 0F, 0D, ' ',
+ Byte.MIN_VALUE, Short.MIN_VALUE));
public PowerTableModel(String[] headers, Class<?>[] classes) {
if (headers.length != classes.length){
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 78ac34b..d4bbb49 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
@@ -66,12 +66,12 @@ public class ReportGeneratorConfiguration {
// Apdex Satisfied Threshold
private static final String REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD = REPORT_GENERATOR_KEY_PREFIX
+ KEY_DELIMITER + "apdex_satisfied_threshold";
- private static final Long REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT = Long.valueOf(500L);
+ private static final Long REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT = 500L;
// Apdex Tolerated Threshold
private static final String REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD = REPORT_GENERATOR_KEY_PREFIX
+ KEY_DELIMITER + "apdex_tolerated_threshold";
- private static final Long REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT = Long.valueOf(1500L);
+ private static final Long REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT = 1500L;
// Apdex per transaction Thresholds
private static final String REPORT_GENERATOR_KEY_APDEX_PER_TRANSACTION = REPORT_GENERATOR_KEY_PREFIX
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/Converters.java b/src/core/src/main/java/org/apache/jmeter/report/core/Converters.java
index 96a8b7a..e1cf548 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/Converters.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/Converters.java
@@ -35,7 +35,7 @@ public final class Converters {
StringConverter<Character> characterConverter = value -> {
try {
- return Character.valueOf(value.charAt(0));
+ return value.charAt(0);
} catch (NumberFormatException ex) {
throw new ConvertException(value, Character.class.getName(), ex);
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
index 2fc18f1..309e106 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
@@ -200,7 +200,7 @@ public class CsvSampleReader implements Closeable{
if (data.length != columnCount + numberOfSampleVariablesInCsv) {
if (log.isWarnEnabled()) {
log.warn("Short CSV read around line {} of file '{}'. Could only read {} elements of {} expected. Data is [{}]",
- Long.valueOf(row + 2), file, Integer.valueOf(data.length), Integer.valueOf(columnCount),
+ row + 2, file, data.length, columnCount,
String.join(", ", data));
}
throw new SampleException(
diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
index 355e912..8d98b97 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/SampleMetadata.java
@@ -143,7 +143,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(), Integer.valueOf(i));
+ index.put(this.columns.get(i).trim(), i);
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
index 1c0b427..e58ba23 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
@@ -336,7 +336,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
final boolean filtersOnlySampleSeries = exportCfg.filtersOnlySampleSeries();
addToContext(
DATA_CTX_FILTERS_ONLY_SAMPLE_SERIES,
- Boolean.valueOf(filtersOnlySampleSeries),
+ filtersOnlySampleSeries,
dataContext);
// Add the series filter to the context
@@ -355,7 +355,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
final boolean showControllerSeriesOnly = exportCfg.showControllerSeriesOnly();
addToContext(
DATA_CTX_SHOW_CONTROLLERS_ONLY,
- Boolean.valueOf(showControllerSeriesOnly),
+ showControllerSeriesOnly,
dataContext);
JsonizerVisitor jsonizer = new JsonizerVisitor();
@@ -429,7 +429,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter {
TimeZone timezone = TimeZone.getDefault();
addToContext(
DATA_CTX_TIMEZONE_OFFSET,
- Integer.valueOf(timezone.getOffset(oldTimestamp)),
+ timezone.getOffset(oldTimestamp),
dataContext);
// Add report title to the context
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
index a7986e8..7819351 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/ReportGenerator.java
@@ -483,7 +483,7 @@ public class ReportGenerator {
*/
private AggregateConsumer createEndDateConsumer() {
AggregateConsumer endDateConsumer = new AggregateConsumer(
- new MaxAggregator(), sample -> Double.valueOf(sample.getEndTime()));
+ new MaxAggregator(), sample -> (double) sample.getEndTime());
endDateConsumer.setName(END_DATE_CONSUMER_NAME);
return endDateConsumer;
}
@@ -493,7 +493,7 @@ public class ReportGenerator {
*/
private AggregateConsumer createBeginDateConsumer() {
AggregateConsumer beginDateConsumer = new AggregateConsumer(
- new MinAggregator(), sample -> Double.valueOf(sample.getStartTime()));
+ new MinAggregator(), sample -> (double) sample.getStartTime());
beginDateConsumer.setName(BEGIN_DATE_CONSUMER_NAME);
return beginDateConsumer;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
index ea3dcff..d9b01e2 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSampleConsumer.java
@@ -158,11 +158,11 @@ public abstract class AbstractSampleConsumer extends AbstractSampleProcessor
@Override
public void setConsumedMetadata(SampleMetadata sampleMetadata, int channel) {
- consumedMetadata.put(Integer.valueOf(channel), sampleMetadata);
+ consumedMetadata.put(channel, sampleMetadata);
}
public SampleMetadata getConsumedMetadata(int channel) {
- return consumedMetadata.get(Integer.valueOf(channel));
+ return consumedMetadata.get(channel);
}
public int getConsumedChannelCount() {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
index 1e85b16..44b6123 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
@@ -197,7 +197,7 @@ public abstract class AbstractSummaryConsumer<TData> extends
if (data != null) {
result = new MapResultData();
result.setResult(RESULT_VALUE_IS_CONTROLLER, new ValueResultData(
- Boolean.valueOf(info.isController())));
+ info.isController()));
result.setResult(RESULT_VALUE_DATA, createDataResult(key, data));
}
return result;
@@ -252,7 +252,7 @@ public abstract class AbstractSummaryConsumer<TData> extends
// Push the support flag in the result
result.setResult(RESULT_VALUE_SUPPORTS_CONTROLLERS_DISCRIMINATION,
- new ValueResultData(Boolean.valueOf(supportsControllersDiscrimination)));
+ new ValueResultData(supportsControllersDiscrimination));
// Add headers
result.setResult(RESULT_VALUE_TITLES, createResultTitles());
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
index 3f20fd9..9f6b9ea 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/AggregateConsumer.java
@@ -109,7 +109,7 @@ public class AggregateConsumer extends AbstractSampleConsumer {
*/
@Override
public void stopConsuming() {
- setDataToContext(getName(), new ValueResultData(Double.valueOf(aggregator.getResult())));
+ setDataToContext(getName(), new ValueResultData(aggregator.getResult()));
super.stopProducing();
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
index 5059ba6..2b8b8a8 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java
@@ -54,10 +54,10 @@ public class ApdexSummaryConsumer extends
@Override
protected ListResultData createDataResult(String key, ApdexSummaryData data) {
- Double apdex = Double.valueOf(getApdex(data));
+ Double apdex = getApdex(data);
ApdexThresholdsInfo thresholdsInfo = data.getApdexThresholdInfo();
- Long satisfiedThreshold = Long.valueOf(thresholdsInfo.getSatisfiedThreshold());
- Long toleratedThreshold = Long.valueOf(thresholdsInfo.getToleratedThreshold());
+ Long satisfiedThreshold = thresholdsInfo.getSatisfiedThreshold();
+ Long toleratedThreshold = thresholdsInfo.getToleratedThreshold();
String keyOrDefault = ObjectUtils.defaultIfNull(
key, JMeterUtils.getResString("reportgenerator_summary_total"));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index f68e5bc..f722441 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -41,7 +41,7 @@ public class ErrorsSummaryConsumer extends AbstractSummaryConsumer<Long> {
SampleSaveConfiguration.ASSERTION_RESULTS_FAILURE_MESSAGE_PROP,
true);
- private static final Long ZERO = Long.valueOf(0);
+ private static final Long ZERO = 0L;
private long errorCount = 0L;
/**
@@ -64,9 +64,9 @@ public class ErrorsSummaryConsumer extends AbstractSummaryConsumer<Long> {
result.addResult(new ValueResultData(key != null ? key : JMeterUtils
.getResString("reportgenerator_summary_total")));
result.addResult(new ValueResultData(data));
- result.addResult(new ValueResultData(Double.valueOf((double) data.longValue() * 100 / errorCount)));
- result.addResult(new ValueResultData(Double.valueOf((double) data.longValue() * 100
- / getOverallInfo().getData().doubleValue())));
+ result.addResult(new ValueResultData((double) data.longValue() * 100 / errorCount));
+ result.addResult(new ValueResultData((double) data.longValue() * 100
+ / getOverallInfo().getData().doubleValue()));
return result;
}
@@ -120,7 +120,7 @@ public class ErrorsSummaryConsumer extends AbstractSummaryConsumer<Long> {
if (overallData == null) {
overallData = ZERO;
}
- overallInfo.setData(Long.valueOf(overallData.longValue() + 1));
+ overallInfo.setData(overallData.longValue() + 1);
// Process only failed samples
if (!sample.getSuccess()) {
@@ -130,7 +130,7 @@ public class ErrorsSummaryConsumer extends AbstractSummaryConsumer<Long> {
if (data == null) {
data = ZERO;
}
- info.setData(Long.valueOf(data.longValue() + 1));
+ info.setData(data.longValue() + 1);
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
index cd6c7b2..9f42a1f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java
@@ -72,10 +72,10 @@ public class RequestsSummaryConsumer extends AbstractSampleConsumer {
@Override
public void stopConsuming() {
MapResultData result = new MapResultData();
- result.setResult("KoPercent", new ValueResultData(Double.valueOf((double) errorCount
- * 100 / count)));
+ result.setResult("KoPercent", new ValueResultData((double) errorCount
+ * 100 / count));
result.setResult("OkPercent", new ValueResultData(
- Double.valueOf((double) (count - errorCount) * 100 / count)));
+ (double) (count - errorCount) * 100 / count));
setDataToContext(getName(), result);
super.stopProducing();
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
index 534547c..652917e 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
@@ -134,18 +134,18 @@ public class StatisticsSummaryConsumer extends
key != null ? key : JMeterUtils.getResString("reportgenerator_summary_total")));
long total = data.getTotal();
long errors = data.getErrors();
- 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.getMean().getResult())));
- result.addResult(new ValueResultData(Long.valueOf(data.getMin())));
- result.addResult(new ValueResultData(Long.valueOf(data.getMax())));
- 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(Double.valueOf(data.getSentKBytesPerSecond())));
+ result.addResult(new ValueResultData(total));
+ result.addResult(new ValueResultData(errors));
+ result.addResult(new ValueResultData((double) errors * 100 / total));
+ result.addResult(new ValueResultData(data.getMean().getResult()));
+ result.addResult(new ValueResultData(data.getMin()));
+ result.addResult(new ValueResultData(data.getMax()));
+ 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.getSentKBytesPerSecond()));
return result;
}
@@ -186,15 +186,15 @@ public class StatisticsSummaryConsumer extends
titles.addResult(new ValueResultData(
String.format(
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
- Integer.valueOf(PERCENTILE_INDEX1))));
+ PERCENTILE_INDEX1)));
titles.addResult(new ValueResultData(
String.format(
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
- Integer.valueOf(PERCENTILE_INDEX2))));
+ PERCENTILE_INDEX2)));
titles.addResult(new ValueResultData(
String.format(
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
- Integer.valueOf(PERCENTILE_INDEX3))));
+ 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_sent_kbytes")));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java
index df666c4..ff81006 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsBySamplerConsumer.java
@@ -93,8 +93,8 @@ public class Top5ErrorsBySamplerConsumer extends
key != null ? key : JMeterUtils.getResString("reportgenerator_top5_total")));
long total = data.getTotal();
- result.addResult(new ValueResultData(Long.valueOf(total)));
- result.addResult(new ValueResultData(Long.valueOf(errors)));
+ result.addResult(new ValueResultData(total));
+ result.addResult(new ValueResultData(errors));
Object[][] top5 = data.getTop5ErrorsMetrics();
int numberOfValues = 0;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
index c37232a..2e2a60f 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
@@ -29,7 +29,7 @@ import java.util.Map;
*/
public class Top5ErrorsSummaryData {
- private static final Long ONE = Long.valueOf(1L);
+ private static final Long ONE = 1L;
private Map<String, Long> countPerError;
private long total;
private long errors;
@@ -49,7 +49,7 @@ public class Top5ErrorsSummaryData {
if (value == null) {
countPerError.put(errorMessage, ONE);
} else {
- countPerError.put(errorMessage, Long.valueOf(value.longValue() + 1));
+ countPerError.put(errorMessage, value.longValue() + 1);
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
index 75d7fe2..0e1f6cc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
@@ -219,16 +219,14 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
private void setMinResult(MapResultData result, String name, Double value) {
ValueResultData valueResult = (ValueResultData) result.getResult(name);
- valueResult.setValue(Double.valueOf(
- Math.min(((Double) valueResult.getValue()).doubleValue(),
- value.doubleValue())));
+ valueResult.setValue(Math.min(((Double) valueResult.getValue()).doubleValue(),
+ value.doubleValue()));
}
private void setMaxResult(MapResultData result, String name, Double value) {
ValueResultData valueResult = (ValueResultData) result.getResult(name);
- valueResult.setValue(Double.valueOf(
- Math.max(((Double) valueResult.getValue()).doubleValue(),
- value.doubleValue())));
+ valueResult.setValue(Math.max(((Double) valueResult.getValue()).doubleValue(),
+ value.doubleValue()));
}
/**
@@ -280,7 +278,7 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
if (aggregated) {
aggInfo = new HashMap<>();
aggInfo.put(
- Double.valueOf(seriesData.getKeysAggregator().getResult()),
+ seriesData.getKeysAggregator().getResult(),
seriesData.getValuesAggregator());
} else {
aggInfo = seriesData.getAggregatorInfo();
@@ -289,10 +287,10 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
for (Map.Entry<Double, Aggregator> entry : aggInfo.entrySet()) {
// Init key and value depending on invertKeysAndValues property
Double key = entry.getKey();
- Double value = Double.valueOf(entry.getValue().getResult());
+ Double value = entry.getValue().getResult();
if (invertKeysAndValues) {
- key = Double.valueOf(entry.getValue().getResult());
+ key = entry.getValue().getResult();
value = entry.getKey();
}
@@ -321,7 +319,7 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
while (percentile < percent) {
ListResultData coordResult = new ListResultData();
coordResult.addResult(new ValueResultData(
- Double.valueOf(percentile)));
+ percentile));
coordResult.addResult(new ValueResultData(value));
dataResult.addResult(coordResult);
percentile = (double) ++rank / 10;
@@ -329,8 +327,8 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
setMinResult(result, RESULT_MIN_Y, value);
setMaxResult(result, RESULT_MAX_Y, value);
}
- setMinResult(result, RESULT_MIN_X, Double.valueOf(0d));
- setMaxResult(result, RESULT_MAX_X, Double.valueOf(100d));
+ setMinResult(result, RESULT_MIN_X, 0d);
+ setMaxResult(result, RESULT_MAX_X, 100d);
} else {
for (Map.Entry<Double, Aggregator> entry : sortedInfo
.entrySet()) {
@@ -342,15 +340,15 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
ListResultData coordResult = new ListResultData();
coordResult.addResult(new ValueResultData(value));
coordResult.addResult(new ValueResultData(
- Double.valueOf(percentile)));
+ percentile));
dataResult.addResult(coordResult);
percentile = (double) ++rank / 10;
}
setMinResult(result, RESULT_MIN_X, value);
setMaxResult(result, RESULT_MAX_X, value);
}
- setMinResult(result, RESULT_MIN_Y, Double.valueOf(0d));
- setMaxResult(result, RESULT_MAX_Y, Double.valueOf(100d));
+ setMinResult(result, RESULT_MIN_Y, 0d);
+ setMaxResult(result, RESULT_MAX_Y, 100d);
}
}
}
@@ -366,10 +364,10 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
new ValueResultData(series));
seriesResult.setResult(RESULT_SERIES_IS_CONTROLLER,
new ValueResultData(
- Boolean.valueOf(seriesData.isControllersSeries())));
+ seriesData.isControllersSeries()));
seriesResult.setResult(RESULT_SERIES_IS_OVERALL,
new ValueResultData(
- Boolean.valueOf(seriesData.isOverallSeries())));
+ seriesData.isOverallSeries()));
seriesResult.setResult(RESULT_SERIES_DATA, new ListResultData());
return seriesResult;
}
@@ -410,13 +408,13 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
private MapResultData createResult() {
MapResultData result = new MapResultData();
result.setResult(RESULT_MIN_X,
- new ValueResultData(Double.valueOf(Double.MAX_VALUE)));
+ new ValueResultData(Double.MAX_VALUE));
result.setResult(RESULT_MAX_X,
- new ValueResultData(Double.valueOf(Double.MIN_VALUE)));
+ new ValueResultData(Double.MIN_VALUE));
result.setResult(RESULT_MIN_Y,
- new ValueResultData(Double.valueOf(Double.MAX_VALUE)));
+ new ValueResultData(Double.MAX_VALUE));
result.setResult(RESULT_MAX_Y,
- new ValueResultData(Double.valueOf(Double.MIN_VALUE)));
+ new ValueResultData(Double.MIN_VALUE));
result.setResult(RESULT_TITLE, new ValueResultData(getTitle()));
result.setResult(RESULT_SERIES, new ListResultData());
@@ -427,7 +425,7 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer {
result.setResult(RESULT_SUPPORTS_CONTROLLERS_DISCRIMINATION,
new ValueResultData(
- Boolean.valueOf(supportsControllersDiscrimination)));
+ supportsControllersDiscrimination));
initializeExtraResults(result);
return result;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
index 7600277..c2b7c86 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java
@@ -99,7 +99,7 @@ public abstract class AbstractOverTimeGraphConsumer extends
@Override
protected void initializeExtraResults(MapResultData parentResult) {
parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(
- Long.valueOf(granularity)));
+ granularity));
}
@Override
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
index ad5946c..077e672 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class AbstractVersusRequestsGraphConsumer extends
AbstractGraphConsumer {
- private static final Long ONE = Long.valueOf(1L);
+ private static final Long ONE = 1L;
public static final String RESULT_CTX_GRANULARITY = "granularity";
public static final String TIME_INTERVAL_LABEL = "Interval";
@@ -164,7 +164,7 @@ public abstract class AbstractVersusRequestsGraphConsumer extends
@Override
protected void initializeExtraResults(MapResultData parentResult) {
parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(
- Long.valueOf(granularity)));
+ granularity));
}
private static class TimeCountConsumer extends AbstractSampleConsumer {
@@ -220,7 +220,7 @@ public abstract class AbstractVersusRequestsGraphConsumer extends
private Long getTimeInterval(Sample sample) {
long time = sample.getEndTime();
- return Long.valueOf(time - (time % parent.getGranularity()));
+ return time - (time % parent.getGranularity());
}
// Adds a new field in the sample metadata for each channel
@@ -290,7 +290,7 @@ public abstract class AbstractVersusRequestsGraphConsumer extends
fileInfos.add(new FileInfo(tmpFile, getConsumedMetadata(i)));
} catch (IOException ex) {
String message = String.format(
- "Cannot create temporary file for channel #%d", Integer.valueOf(i));
+ "Cannot create temporary file for channel #%d", i);
log.error(message, ex);
throw new SampleException(message, ex);
}
@@ -313,7 +313,7 @@ public abstract class AbstractVersusRequestsGraphConsumer extends
Long time = getTimeInterval(sample);
Long count = counts.get(time);
if (count != null) {
- counts.put(time, Long.valueOf(count.longValue() + 1));
+ counts.put(time, count.longValue() + 1);
} else {
counts.put(time, ONE);
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java
index 2b03236..f244b52 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ConnectTimeValueSelector.java
@@ -47,11 +47,11 @@ public class ConnectTimeValueSelector extends AbstractGraphValueSelector {
public Double select(String series, Sample sample) {
if(isIgnoreTransactionController()) {
if(!sample.isController()) {
- return Double.valueOf(sample.getConnectTime());
+ return (double) sample.getConnectTime();
}
} else {
if(!sample.isEmptyController()) {
- return Double.valueOf(sample.getConnectTime());
+ return (double) sample.getConnectTime();
}
}
return null;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CountValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CountValueSelector.java
index 2f136ff..0925bd4 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CountValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CountValueSelector.java
@@ -28,8 +28,8 @@ import org.apache.jmeter.samplers.SampleResult;
* @since 3.0
*/
public class CountValueSelector extends AbstractGraphValueSelector {
- private static final Double ONE = Double.valueOf(1.0d);
- private static final Double ZERO = Double.valueOf(0.0d);
+ private static final Double ONE = 1.0d;
+ private static final Double ZERO = 0.0d;
/**
*
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java
index 30953f8..ac62885 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java
@@ -46,11 +46,11 @@ public class ElapsedTimeValueSelector extends AbstractGraphValueSelector {
public Double select(String series, Sample sample) {
if(isIgnoreTransactionController()) {
if(!sample.isController()) {
- return Double.valueOf(sample.getElapsedTime());
+ return (double) sample.getElapsedTime();
}
} else {
if(!sample.isEmptyController()) {
- return Double.valueOf(sample.getElapsedTime());
+ return (double) sample.getElapsedTime();
}
}
return null;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
index 2413ac7..b1a3dde 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java
@@ -58,7 +58,7 @@ public class IndexedNameSelector implements GraphKeysSelector {
names.addLast(name);
index = names.size() - 1;
}
- return Double.valueOf(index);
+ return (double) index;
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java
index 59cb3e1..e9460af 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java
@@ -47,11 +47,11 @@ public class LatencyValueSelector extends AbstractGraphValueSelector {
public Double select(String series, Sample sample) {
if(isIgnoreTransactionController()) {
if(!sample.isController()) {
- return Double.valueOf(sample.getLatency());
+ return (double) sample.getLatency();
}
} else {
if(!sample.isEmptyController()) {
- return Double.valueOf(sample.getLatency());
+ return (double) sample.getLatency();
}
}
return null;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java
index f4ff0a1..66007dc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/SuccessfulElapsedTimeValueSelector.java
@@ -41,7 +41,7 @@ public class SuccessfulElapsedTimeValueSelector extends ElapsedTimeValueSelector
@Override
public Double select(String series, Sample sample) {
if(!sample.isController() && sample.getSuccess()) {
- return Double.valueOf(sample.getElapsedTime());
+ return (double) sample.getElapsedTime();
} else {
return null;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
index dbc6a3d..b07140c 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
@@ -81,7 +81,7 @@ public class TimeStampKeysSelector implements GraphKeysSelector {
@Override
public Double select(Sample sample) {
long time = selectBeginTime ? sample.getStartTime() : sample.getEndTime();
- return Double.valueOf((double) time - time % granularity);
+ return (double) time - time % granularity;
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
index 2ad660a..1e5c8b0 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java
@@ -78,7 +78,7 @@ public class ActiveThreadsGraphConsumer extends AbstractOverTimeGraphConsumer {
GraphValueSelector graphValueSelector = (series, sample) -> {
if (!sample.isEmptyController()) {
- return Double.valueOf(sample.getGroupThreads());
+ return (double) sample.getGroupThreads();
} else {
return null;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
index 9208b7b..70e27ac 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java
@@ -80,10 +80,9 @@ public class BytesThroughputGraphConsumer extends AbstractOverTimeGraphConsumer
if (sample.isController()) {
return null;
} else {
- return Double.valueOf(
- RECEIVED_BYTES_SERIES_LABEL.equals(series)
- ? sample.getReceivedBytes()
- : sample.getSentBytes());
+ return (double) (RECEIVED_BYTES_SERIES_LABEL.equals(series)
+ ? sample.getReceivedBytes()
+ : sample.getSentBytes());
}
};
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
index 2f7bf7a..0049e63 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
@@ -163,7 +163,7 @@ public class CustomGraphConsumer extends AbstractOverTimeGraphConsumer implement
@Override
protected void initializeExtraResults(MapResultData parentResult) {
- parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(Long.valueOf(getGranularity())));
+ parentResult.setResult(RESULT_CTX_GRANULARITY, new ValueResultData(getGranularity()));
parentResult.setResult(RESULT_Y_AXIS, new ValueResultData(getYAxis()));
parentResult.setResult(RESULT_X_AXIS, new ValueResultData(getXAxis()));
parentResult.setResult(RESULT_SAMPLE_VARIABLE_NAME, new ValueResultData(getSampleVariableName()));
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
index ca8764d..2c8f5d3 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java
@@ -68,7 +68,7 @@ public class ResponseTimeDistributionGraphConsumer extends
protected final GraphKeysSelector createKeysSelector() {
return sample -> {
long elapsed = sample.getElapsedTime();
- return Double.valueOf((double) elapsed - elapsed % granularity);
+ return (double) elapsed - elapsed % granularity;
};
}
@@ -98,6 +98,6 @@ public class ResponseTimeDistributionGraphConsumer extends
protected void initializeExtraResults(MapResultData parentResult) {
parentResult.setResult(
AbstractOverTimeGraphConsumer.RESULT_CTX_GRANULARITY,
- new ValueResultData(Long.valueOf(granularity)));
+ new ValueResultData(granularity));
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
index 37b5363..cd5f8cf 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java
@@ -81,7 +81,7 @@ public class ResponseTimePerSampleGraphConsumer extends AbstractGraphConsumer {
factory.setPercentileIndex(property);
StaticSeriesSelector seriesSelector = new StaticSeriesSelector();
seriesSelector.setSeriesName(String.format(
- RESPONSE_TIME_PER_SAMPLE_SERIES_FORMAT, Integer.valueOf(property)));
+ RESPONSE_TIME_PER_SAMPLE_SERIES_FORMAT, property));
return new GroupInfo(factory, seriesSelector,
// We include Transaction Controller results
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
index 9bc4847..6545ccc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java
@@ -57,7 +57,7 @@ public class ResponseTimePercentilesGraphConsumer extends AbstractGraphConsumer
*/
@Override
protected final GraphKeysSelector createKeysSelector() {
- return sample -> Double.valueOf(sample.getElapsedTime());
+ return sample -> (double) sample.getElapsedTime();
}
/*
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
index aa9f1a1..6898986 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
@@ -68,7 +68,7 @@ public class ResponseTimePercentilesOverTimeGraphConsumer
}
private String formatPercentile(int percentile) {
- return String.format(PERCENTILE_FORMAT, Integer.valueOf(percentile));
+ return String.format(PERCENTILE_FORMAT, percentile);
}
private GroupInfo createMinGroupInfo() {
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java
index 16582f5..34a23e9 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java
@@ -93,14 +93,14 @@ public class SyntheticResponseTimeDistributionGraphConsumer extends
if (sample.getSuccess()) {
long elapsedTime = sample.getElapsedTime();
if (elapsedTime <= satisfiedThreshold) {
- return Double.valueOf(0);
+ return (double) 0;
} else if (elapsedTime <= toleratedThreshold) {
- return Double.valueOf(1);
+ return 1d;
} else {
- return Double.valueOf(2);
+ return 2d;
}
} else {
- return Double.valueOf(3);
+ return 3d;
}
};
}
@@ -125,9 +125,9 @@ public class SyntheticResponseTimeDistributionGraphConsumer extends
protected void initializeExtraResults(MapResultData parentResult) {
ListResultData listResultData = new ListResultData();
String[] seriesLabels = new String[]{
- SATISFIED_LABEL.format(new Object[]{Long.valueOf(getSatisfiedThreshold())}),
- TOLERATED_LABEL.format(new Object[]{Long.valueOf(getSatisfiedThreshold()), Long.valueOf(getToleratedThreshold())}),
- UNTOLERATED_LABEL.format(new Object[]{Long.valueOf(getToleratedThreshold())}),
+ SATISFIED_LABEL.format(new Object[]{getSatisfiedThreshold()}),
+ TOLERATED_LABEL.format(new Object[]{getSatisfiedThreshold(), getToleratedThreshold()}),
+ UNTOLERATED_LABEL.format(new Object[]{getToleratedThreshold()}),
FAILED_LABEL
};
String[] colors = new String[]{
@@ -135,7 +135,7 @@ public class SyntheticResponseTimeDistributionGraphConsumer extends
};
for (int i = 0; i < seriesLabels.length; i++) {
ListResultData array = new ListResultData();
- array.addResult(new ValueResultData(Integer.valueOf(i)));
+ array.addResult(new ValueResultData(i));
array.addResult(new ValueResultData(seriesLabels[i]));
listResultData.addResult(array);
}
@@ -192,10 +192,10 @@ public class SyntheticResponseTimeDistributionGraphConsumer extends
private void formatLabels() {
this.satisfiedLabels = Collections.singletonList(
- SATISFIED_LABEL.format(new Object[]{Long.valueOf(this.satisfiedThreshold)}));
+ SATISFIED_LABEL.format(new Object[]{this.satisfiedThreshold}));
this.toleratedLabels = Collections.singletonList(
- TOLERATED_LABEL.format(new Object[]{Long.valueOf(this.satisfiedThreshold), Long.valueOf(this.toleratedThreshold)}));
+ TOLERATED_LABEL.format(new Object[]{this.satisfiedThreshold, this.toleratedThreshold}));
this.untoleratedLabels = Collections.singletonList(
- UNTOLERATED_LABEL.format(new Object[]{Long.valueOf(this.toleratedThreshold)}));
+ UNTOLERATED_LABEL.format(new Object[]{this.toleratedThreshold}));
}
}
diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
index bd1c07e..c50c50c 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
@@ -45,7 +45,7 @@ public class TimeVSThreadGraphConsumer extends AbstractGraphConsumer {
*/
@Override
protected final GraphKeysSelector createKeysSelector() {
- return sample -> Double.valueOf(sample.getAllThreads());
+ return sample -> (double) sample.getAllThreads();
}
/*
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/BeanInfoSupport.java b/src/core/src/main/java/org/apache/jmeter/testbeans/BeanInfoSupport.java
index 44577c2..d334b59 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/BeanInfoSupport.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/BeanInfoSupport.java
@@ -251,10 +251,10 @@ public abstract class BeanInfoSupport extends SimpleBeanInfo {
log.debug("Getting property for: {}", name);
PropertyDescriptor p = property(name);
p.setValue(GenericTestBeanCustomizer.GROUP, group);
- p.setValue(GenericTestBeanCustomizer.ORDER, Integer.valueOf(i));
+ p.setValue(GenericTestBeanCustomizer.ORDER, i);
}
numCreatedGroups++;
- getBeanDescriptor().setValue(GenericTestBeanCustomizer.ORDER(group), Integer.valueOf(numCreatedGroups));
+ getBeanDescriptor().setValue(GenericTestBeanCustomizer.ORDER(group), numCreatedGroups);
}
/** {@inheritDoc} */
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
index a48759e..ad6340e 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/EnumEditor.java
@@ -72,7 +72,7 @@ class EnumEditor extends PropertyEditorSupport implements ClearGui {
@Override
public Object getValue() {
- return Integer.valueOf(combo.getSelectedIndex());
+ return combo.getSelectedIndex();
}
@Override
diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
index 2753171..3a2376e 100644
--- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
+++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
@@ -710,7 +710,7 @@ public class GenericTestBeanCustomizer extends JPanel implements SharedCustomize
private Integer groupOrder(String group) {
Integer order = (Integer) beanInfo.getBeanDescriptor().getValue(ORDER(group));
if (order == null) {
- order = Integer.valueOf(0);
+ order = 0;
}
return order;
}
@@ -724,7 +724,7 @@ public class GenericTestBeanCustomizer extends JPanel implements SharedCustomize
private Integer propertyOrder(PropertyDescriptor d) {
Integer order = (Integer) d.getValue(ORDER);
if (order == null) {
- order = Integer.valueOf(0);
+ order = 0;
}
return order;
}
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java
index 50e3c25..f7d8cbf 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/BooleanProperty.java
@@ -60,7 +60,7 @@ public class BooleanProperty extends AbstractProperty {
*/
@Override
public Object getObjectValue() {
- return Boolean.valueOf(value);
+ return value;
}
@Override
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/DoubleProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/DoubleProperty.java
index fdcaa74..d82ba51 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/DoubleProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/DoubleProperty.java
@@ -70,7 +70,7 @@ public class DoubleProperty extends NumberProperty {
*/
@Override
public Object getObjectValue() {
- return Double.valueOf(value);
+ return value;
}
/**
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/FloatProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/FloatProperty.java
index 45a22ce..50aa300 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/FloatProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/FloatProperty.java
@@ -87,7 +87,7 @@ public class FloatProperty extends NumberProperty {
*/
@Override
public Object getObjectValue() {
- return Float.valueOf(value);
+ return value;
}
/**
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/IntegerProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/IntegerProperty.java
index 688c0c4..737406a 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/IntegerProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/IntegerProperty.java
@@ -92,7 +92,7 @@ public class IntegerProperty extends NumberProperty {
*/
@Override
public Object getObjectValue() {
- return Integer.valueOf(value);
+ return value;
}
/**
diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/LongProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/LongProperty.java
index 49a6727..369001e 100644
--- a/src/core/src/main/java/org/apache/jmeter/testelement/property/LongProperty.java
+++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/LongProperty.java
@@ -88,7 +88,7 @@ public class LongProperty extends NumberProperty {
*/
@Override
public Object getObjectValue() {
- return Long.valueOf(value);
+ return value;
}
/**
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
index f6a8145..345da35 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellInterpreter.java
@@ -195,7 +195,7 @@ public class BeanShellInterpreter {
}
public Object set(String s, boolean b) throws JMeterException {
- return bshInvoke(bshSet, new Object[] { s, Boolean.valueOf(b) }, true);
+ return bshInvoke(bshSet, new Object[] { s, b}, true);
}
public Object source(String s) throws JMeterException {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java b/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java
index bddf172..27747b7 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/BeanShellServer.java
@@ -83,7 +83,7 @@ public class BeanShellServer implements Runnable {
Method source = interpreter.getMethod("source", string);//$NON-NLS-1$
setObj.invoke(instance, "t", this );//$NON-NLS-1$
- setInt.invoke(instance, "portnum", Integer.valueOf(serverport));//$NON-NLS-1$
+ setInt.invoke(instance, "portnum", serverport);//$NON-NLS-1$
if (serverfile.length() > 0) {
try {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/Calculator.java b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
index e0e5191..3ebf283 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/Calculator.java
@@ -151,7 +151,7 @@ public class Calculator {
}
public Number getMeanAsNumber() {
- return Long.valueOf((long) mean);
+ return (long) mean;
}
public double getStandardDeviation() {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
index 9fcc0b8..61d4d6f 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SSLManager.java
@@ -132,7 +132,7 @@ public abstract class SSLManager {
// https://docs.oracle.com/javase/8/docs/technotes/guides/security/p11guide.html#JSSE
if ("NONE".equalsIgnoreCase(fileName)) {
this.keyStore.load(null, Validate.notNull(getPassword(), "Password should not be null"));
- log.info("Total of {} aliases loaded OK from PKCS11", Integer.valueOf(keyStore.getAliasCount()));
+ log.info("Total of {} aliases loaded OK from PKCS11", keyStore.getAliasCount());
} else {
File initStore = new File(fileName);
if (fileName.length() > 0 && initStore.exists()) {
@@ -142,7 +142,7 @@ public abstract class SSLManager {
if (log.isInfoEnabled()) {
log.info(
"Total of {} aliases loaded OK from keystore",
- Integer.valueOf(keyStore.getAliasCount()));
+ keyStore.getAliasCount());
}
}
} else {
diff --git a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
index 9dd1366..a73bb31 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java
@@ -707,7 +707,7 @@ public class XPathUtil {
if (length == 0) {
resultOfEval = false;
} else if (xObject.getType() == XObject.CLASS_BOOLEAN) {
- resultOfEval = Boolean.valueOf(nodes.itemAt(0).getStringValue());
+ resultOfEval = Boolean.parseBoolean(nodes.itemAt(0).getStringValue());
}
result.setFailure(isNegated ? resultOfEval : !resultOfEval);
result.setFailureMessage(
diff --git a/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java b/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java
index cd7c418..aa8fe12 100644
--- a/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java
+++ b/src/core/src/main/java/org/apache/jmeter/visualizers/SamplingStatCalculator.java
@@ -290,7 +290,7 @@ public class SamplingStatCalculator {
}
public Number getMeanAsNumber() {
- return Long.valueOf((long) calculator.getMean());
+ return (long) calculator.getMean();
}
public Number getMedian() {
@@ -299,7 +299,7 @@ public class SamplingStatCalculator {
public Number getMin() {
if (calculator.getMin().longValue() < 0) {
- return Long.valueOf(0);
+ return 0L;
}
return calculator.getMin();
}
diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java
index 1ca6902..af499f13 100644
--- a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java
+++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestCase.java
@@ -153,7 +153,7 @@ public abstract class JMeterTestCase {
}
public static void assertPrimitiveEquals(boolean expected, boolean actual) {
- org.junit.Assert.assertEquals(Boolean.valueOf(expected), Boolean.valueOf(actual));
+ org.junit.Assert.assertEquals(expected, actual);
}
/**
diff --git a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
index 931ee01..4e75863 100644
--- a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
@@ -42,7 +42,7 @@ public class MapPropertyTest {
public void testGetPropertyTypeOfStringElements() {
Map<String, Integer> numberMap = new HashMap<>();
- numberMap.put("One", Integer.valueOf(1));
+ numberMap.put("One", 1);
MapProperty props = new MapProperty("foo", numberMap);
assertThat(props.getPropertyType(), CoreMatchers.equalTo(IntegerProperty.class));
}
diff --git a/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java
index 9a2388f..e80f527 100644
--- a/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java
+++ b/src/examples/src/main/java/org/apache/jmeter/examples/sampler/ExampleSampler.java
@@ -120,7 +120,7 @@ public class ExampleSampler extends AbstractSampler {
*/
private void trace(String s) {
if (log.isDebugEnabled()) {
- log.debug("{} ({}) {} {} {}", Thread.currentThread().getName(), Integer.valueOf(classCount.get()),
+ log.debug("{} ({}) {} {} {}", Thread.currentThread().getName(), classCount.get(),
getTitle(), s, this.toString());
}
}
diff --git a/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
index ab63865..3e5764b 100644
--- a/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
+++ b/src/examples/src/main/java/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
@@ -43,12 +43,12 @@ public class Example3BeanInfo extends BeanInfoSupport {
getprop("mybool", Boolean.TRUE); // Must use defaults for primitive types
getprop("myBoolean1");
getprop("myBoolean2", Boolean.TRUE);
- getprop("myInt", Integer.valueOf(77)); // Must use defaults for primitive types
+ getprop("myInt", 77); // Must use defaults for primitive types
getprop("myInteger1");
- getprop("myInteger2", Integer.valueOf(123));
- getprop("mylong", Long.valueOf(99)); // Must use defaults for primitive types
+ getprop("myInteger2", 123);
+ getprop("mylong", 99L); // Must use defaults for primitive types
getprop("myLong1");
- getprop("myLong2", Long.valueOf(456));
+ getprop("myLong2", 456L);
getprop("myString1");
getprop("myString2","abcd");
getprop("myFile1");
diff --git a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
index f8f5cca..c48cd4b 100644
--- a/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
+++ b/src/jorphan/src/main/java/org/apache/commons/cli/avalon/CLArgsParser.java
@@ -125,7 +125,7 @@ public final class CLArgsParser {
* @see CLOption
*/
public final CLOption getArgumentById(final int id) {
- return this.optionIndex.get(Integer.valueOf(id));
+ return this.optionIndex.get(id);
}
/**
@@ -662,7 +662,7 @@ public final class CLArgsParser {
for (final CLOption option : this.options) {
final CLOptionDescriptor optionDescriptor = getDescriptorFor(option.getDescriptor().getId());
- this.optionIndex.put(Integer.valueOf(option.getDescriptor().getId()), option);
+ this.optionIndex.put(option.getDescriptor().getId(), option);
if (null != optionDescriptor && null != optionDescriptor.getName()) {
this.optionIndex.put(optionDescriptor.getName(), option);
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorInteger.java b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorInteger.java
index 3e27725..e14a532 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorInteger.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorInteger.java
@@ -24,11 +24,11 @@ package org.apache.jorphan.math;
public class StatCalculatorInteger extends StatCalculator<Integer> {
public StatCalculatorInteger() {
- super(Integer.valueOf(0), Integer.valueOf(Integer.MIN_VALUE), Integer.valueOf(Integer.MAX_VALUE));
+ super(0, Integer.MIN_VALUE, Integer.MAX_VALUE);
}
public void addValue(int val){
- super.addValue(Integer.valueOf(val));
+ super.addValue(val);
}
/**
@@ -38,16 +38,16 @@ public class StatCalculatorInteger extends StatCalculator<Integer> {
* @param sampleCount the number of samples contributing to the aggregate value
*/
public void addValue(int val, int sampleCount){
- super.addValue(Integer.valueOf(val), sampleCount);
+ super.addValue(val, sampleCount);
}
@Override
protected Integer divide(Integer val, int n) {
- return Integer.valueOf(val.intValue() / n);
+ return val.intValue() / n;
}
@Override
protected Integer divide(Integer val, long n) {
- return Integer.valueOf((int) (val.intValue() / n));
+ return (int) (val.intValue() / n);
}
}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java
index d5b3fd7..daf6507 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/math/StatCalculatorLong.java
@@ -24,7 +24,7 @@ package org.apache.jorphan.math;
public class StatCalculatorLong extends StatCalculator<Long> {
public StatCalculatorLong() {
- super(Long.valueOf(0L), Long.valueOf(Long.MIN_VALUE), Long.valueOf(Long.MAX_VALUE));
+ super(0L, Long.MIN_VALUE, Long.MAX_VALUE);
}
/**
@@ -33,7 +33,7 @@ public class StatCalculatorLong extends StatCalculator<Long> {
* @param val the value to add, which should correspond with a single sample
*/
public void addValue(long val){
- super.addValue(Long.valueOf(val));
+ super.addValue(val);
}
/**
@@ -43,16 +43,16 @@ public class StatCalculatorLong extends StatCalculator<Long> {
* @param sampleCount the number of samples contributing to the aggregate value
*/
public void addValue(long val, int sampleCount){
- super.addValue(Long.valueOf(val), sampleCount);
+ super.addValue(val, sampleCount);
}
@Override
protected Long divide(Long val, int n) {
- return Long.valueOf(val.longValue() / n);
+ return val.longValue() / n;
}
@Override
protected Long divide(Long val, long n) {
- return Long.valueOf(val.longValue() / n);
+ return val.longValue() / n;
}
}
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java
index 17bb03a..60e914a 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/reflect/ClassTools.java
@@ -61,7 +61,7 @@ public class ClassTools {
try {
Class<?> clazz = ClassUtils.getClass(className);
Constructor<?> constructor = clazz.getConstructor(Integer.TYPE);
- instance = constructor.newInstance(Integer.valueOf(parameter));
+ instance = constructor.newInstance(parameter);
} catch (ClassNotFoundException | InvocationTargetException
| IllegalArgumentException | NoSuchMethodException
| SecurityException | IllegalAccessException
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
index a49e619..35b216f 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/Converter.java
@@ -48,19 +48,19 @@ public class Converter {
} else if (toType.isAssignableFrom(value.getClass())) {
convertedValue = value;
} else if (toType.equals(float.class) || toType.equals(Float.class)) {
- convertedValue = Float.valueOf(getFloat(value));
+ convertedValue = getFloat(value);
} else if (toType.equals(double.class) || toType.equals(Double.class)) {
- convertedValue = Double.valueOf(getDouble(value));
+ convertedValue = getDouble(value);
} else if (toType.equals(String.class)) {
convertedValue = getString(value);
} else if (toType.equals(int.class) || toType.equals(Integer.class)) {
- convertedValue = Integer.valueOf(getInt(value));
+ convertedValue = getInt(value);
} else if (toType.equals(char.class) || toType.equals(Character.class)) {
- convertedValue = Character.valueOf(getChar(value));
+ convertedValue = getChar(value);
} else if (toType.equals(long.class) || toType.equals(Long.class)) {
- convertedValue = Long.valueOf(getLong(value));
+ convertedValue = getLong(value);
} else if (toType.equals(boolean.class) || toType.equals(Boolean.class)) {
- convertedValue = Boolean.valueOf(getBoolean(value));
+ convertedValue = getBoolean(value);
} else if (toType.equals(java.util.Date.class)) {
convertedValue = getDate(value);
} else if (toType.equals(Calendar.class)) {
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
index 024f4cd..9bc59a3 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/HeapDumper.java
@@ -181,7 +181,7 @@ public class HeapDumper {
if (exception == null) {
server.invoke(hotspotDiagnosticBean,
"dumpHeap",
- new Object[]{fileName, Boolean.valueOf(live)},
+ new Object[]{fileName, live},
new String[]{"java.lang.String", "boolean"});
} else {
throw exception;
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java b/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java
index d8f6991..6634c19 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java
@@ -169,7 +169,7 @@ public class PackageTest {
SearchByClass<Integer> searcher = new SearchByClass<>(Integer.class);
String one = "one";
String two = "two";
- Integer o = Integer.valueOf(1);
+ Integer o = 1;
tree.add(one, o);
tree.getTree(one).add(o, two);
tree.traverse(searcher);
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java b/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java
index e0c29a7..89a70d00 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/gui/MinMaxLongRendererTest.java
@@ -35,9 +35,9 @@ public class MinMaxLongRendererTest {
@Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
- { Long.valueOf(Long.MAX_VALUE), "#N/A" },
- { Long.valueOf(Long.MIN_VALUE), "#N/A" },
- { Long.valueOf(0), "0" },
+ {Long.MAX_VALUE, "#N/A" },
+ {Long.MIN_VALUE, "#N/A" },
+ {0L, "0" },
{ null, "#N/A" },
{ "invalid", "#N/A" },
});
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java b/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java
index c22bb24..3430ca4 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/math/TestStatCalculator.java
@@ -108,8 +108,8 @@ public class TestStatCalculator {
calc.addValue(0L);
calc.addValue(2L);
calc.addValue(2L);
- final Long long0 = Long.valueOf(0);
- final Long long2 = Long.valueOf(2);
+ final Long long0 = 0L;
+ final Long long2 = 2L;
assertEquals(long2, calc.getMax());
assertEquals(long0, calc.getMin());
Map<Number, Number[]> map = calc.getDistribution();
@@ -128,8 +128,8 @@ public class TestStatCalculator {
assertEquals(Integer.valueOf(2), calci.getMax());
assertEquals(Integer.valueOf(0), calci.getMin());
Map<Number, Number[]> map = calci.getDistribution();
- assertTrue(map.containsKey(Integer.valueOf(0)));
- assertTrue(map.containsKey(Integer.valueOf(2)));
+ assertTrue(map.containsKey(0));
+ assertTrue(map.containsKey(2));
}
@Test
diff --git a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
index be30054..1306a8d 100644
--- a/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
+++ b/src/jorphan/src/test/java/org/apache/jorphan/util/TestJorphanUtils.java
@@ -371,15 +371,15 @@ public class TestJorphanUtils {
@Test
public void testReplaceValueWithNullValue() {
- Assert.assertThat(Integer.valueOf(JOrphanUtils.replaceValue(null, null, false, null, null)),
- CoreMatchers.is(Integer.valueOf(0)));
+ Assert.assertThat(JOrphanUtils.replaceValue(null, null, false, null, null),
+ CoreMatchers.is(0));
}
@Test
public void testReplaceValueWithValidValueAndValidSetter() {
Holder h = new Holder();
- Assert.assertThat(Integer.valueOf(JOrphanUtils.replaceValue("\\d+", "${port}", true, "80", s -> h.value = s)),
- CoreMatchers.is(Integer.valueOf(1)));
+ Assert.assertThat(JOrphanUtils.replaceValue("\\d+", "${port}", true, "80", s -> h.value = s),
+ CoreMatchers.is(1));
Assert.assertThat(h.value, CoreMatchers.is("${port}"));
}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
index 96bdaab..b0f74d4 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/AuthManager.java
@@ -485,7 +485,7 @@ public class AuthManager extends ConfigTestElement implements TestStateListener,
}
if(Mechanism.KERBEROS.equals(auth.getMechanism())) {
localContext.setAttribute(DynamicKerberosSchemeFactory.CONTEXT_ATTRIBUTE_STRIP_PORT,
- Boolean.valueOf(isStripPort(url)));
+ isStripPort(url));
credentialsProvider.setCredentials(new AuthScope(null, -1, null), USE_JAAS_CREDENTIALS);
} else {
credentialsProvider.setCredentials(
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 06982fa..c825a42 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -212,7 +212,7 @@ public class HeaderManager extends ConfigTestElement implements Serializable, Re
continue;
}
if (header.getName().equalsIgnoreCase(name)) {
- removeIndices.add(Integer.valueOf(i));
+ removeIndices.add(i);
}
}
for (Integer indice : removeIndices) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
index 40917d4..f4943d1 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/curl/BasicCurlParser.java
@@ -720,7 +720,7 @@ public class BasicCurlParser {
request.addHeader("Referer", option.getArgument(0));
} else if (option.getDescriptor().getId() == CONNECT_TIMEOUT_OPT) {
String value = option.getArgument(0);
- request.setConnectTimeout(Double.valueOf(value) * 1000);
+ request.setConnectTimeout(Double.parseDouble(value) * 1000);
} else if (option.getDescriptor().getId() == COOKIE_OPT) {
String value = option.getArgument(0);
if (isValidCookie(value)) {
@@ -754,7 +754,7 @@ public class BasicCurlParser {
setProxyServerUserInfo(request, value);
} else if (option.getDescriptor().getId() == MAX_TIME_OPT) {
String value = option.getArgument(0);
- request.setMaxTime(Double.valueOf(value) * 1000);
+ request.setMaxTime(Double.parseDouble(value) * 1000);
} else if (option.getDescriptor().getId() == HEAD_OPT) {
request.setMethod("HEAD");
} else if (option.getDescriptor().getId() == INTERFACE_OPT) {
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
index 591109e..30be389 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/CookiePanel.java
@@ -189,7 +189,7 @@ public class CookiePanel extends AbstractConfigGui implements ActionListener {
private void addCookieToTable(Cookie cookie) {
tableModel.addRow(new Object[] { cookie.getName(), cookie.getValue(), cookie.getDomain(), cookie.getPath(),
- Boolean.valueOf(cookie.getSecure()) });
+ cookie.getSecure()});
}
/**
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
index 313b7f4..6228187 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
@@ -188,8 +188,8 @@ public class LagartoBasedHtmlParser extends HTMLParser {
htmlCCommentExpressionMatcher = new HtmlCCommentExpressionMatcher();
}
String expressionString = expression.toString().trim();
- enabled.push(Boolean.valueOf(htmlCCommentExpressionMatcher.match(ieVersion.floatValue(),
- expressionString)));
+ enabled.push(htmlCCommentExpressionMatcher.match(ieVersion.floatValue(),
+ expressionString));
}
}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
index fc84fab..f00a105 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
@@ -358,7 +358,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
long duration = super.getKeepAliveDuration(response, context);
if (duration <= 0 && IDLE_TIMEOUT > 0) {// none found by the superclass
- log.debug("Setting keepalive to {}", Integer.valueOf(IDLE_TIMEOUT));
+ log.debug("Setting keepalive to {}", IDLE_TIMEOUT);
return IDLE_TIMEOUT;
}
return duration; // return the super-class value
@@ -380,9 +380,9 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
HttpConnectionMetrics metrics = conn.getMetrics();
long sentBytesCount = metrics.getSentBytesCount();
// We save to store sent bytes as we need to reset metrics for received bytes
- context.setAttribute(CONTEXT_ATTRIBUTE_SENT_BYTES, Long.valueOf(metrics.getSentBytesCount()));
+ context.setAttribute(CONTEXT_ATTRIBUTE_SENT_BYTES, metrics.getSentBytesCount());
context.setAttribute(CONTEXT_ATTRIBUTE_METRICS, metrics);
- log.debug("Sent {} bytes", Long.valueOf(sentBytesCount));
+ log.debug("Sent {} bytes", sentBytesCount);
metrics.reset();
return response;
}
@@ -451,11 +451,11 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
private static final ViewableFileBody[] EMPTY_FILE_BODIES = new ViewableFileBody[0];
static {
- log.info("HTTP request retry count = {}", Integer.valueOf(RETRY_COUNT));
+ log.info("HTTP request retry count = {}", RETRY_COUNT);
// Set up HTTP scheme override if necessary
if (CPS_HTTP > 0) {
- log.info("Setting up HTTP SlowProtocol, cps={}", Integer.valueOf(CPS_HTTP));
+ log.info("Setting up HTTP SlowProtocol, cps={}", CPS_HTTP);
CONNECTION_SOCKET_FACTORY = new SlowHCPlainConnectionSocketFactory(CPS_HTTP);
} else {
CONNECTION_SOCKET_FACTORY = PlainConnectionSocketFactory.getSocketFactory();
@@ -516,7 +516,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
if (log.isDebugEnabled()) {
log.debug("Start : sample {} method {} followingRedirect {} depth {}",
- url, method, Boolean.valueOf(areFollowingRedirect), Integer.valueOf(frameDepth));
+ url, method, areFollowingRedirect, frameDepth);
}
JMeterVariables jMeterVariables = JMeterContextService.getContext().getVariables();
@@ -621,7 +621,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
if (log.isDebugEnabled()) {
long total = res.getHeadersSize() + res.getBodySizeAsLong();
log.debug("ResponseHeadersSize={} Content-Length={} Total={}",
- Integer.valueOf(res.getHeadersSize()), Long.valueOf(res.getBodySizeAsLong()), Long.valueOf(total));
+ res.getHeadersSize(), res.getBodySizeAsLong(), total);
}
// If we redirected automatically, the URL may have changed
@@ -1069,13 +1069,13 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
}
httpClient = builder.build();
if (log.isDebugEnabled()) {
- log.debug("Created new HttpClient: @{} {}", Integer.valueOf(System.identityHashCode(httpClient)), key);
+ log.debug("Created new HttpClient: @{} {}", System.identityHashCode(httpClient), key);
}
triple = MutableTriple.of(httpClient, null, pHCCM);
mapHttpClientPerHttpClientKey.put(key, triple); // save the agent for next time round
} else {
if (log.isDebugEnabled()) {
- log.debug("Reusing the HttpClient: @{} {}", Integer.valueOf(System.identityHashCode(httpClient)),key);
+ log.debug("Reusing the HttpClient: @{} {}", System.identityHashCode(httpClient),key);
}
}
@@ -1451,7 +1451,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
if(log.isDebugEnabled()) {
log.debug("Building multipart with:getDoBrowserCompatibleMultipart(): {}, with charset:{}, haveContentEncoding:{}",
- Boolean.valueOf(getDoBrowserCompatibleMultipart()), charset, Boolean.valueOf(haveContentEncoding));
+ getDoBrowserCompatibleMultipart(), charset, haveContentEncoding);
}
// Write the request to our own stream
MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
@@ -1749,7 +1749,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
protected void notifyFirstSampleAfterLoopRestart() {
log.debug("notifyFirstSampleAfterLoopRestart called "
+ "with config(httpclient.reset_state_on_thread_group_iteration={})",
- Boolean.valueOf(RESET_STATE_ON_THREAD_GROUP_ITERATION));
+ RESET_STATE_ON_THREAD_GROUP_ITERATION);
JMeterVariables jMeterVariables = JMeterContextService.getContext().getVariables();
if (jMeterVariables.isSameUserOnNextIteration()) {
log.debug("Thread Group is configured to simulate a returning visitor on each iteration, ignoring property value {}",
@@ -1758,7 +1758,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl {
} else {
log.debug("Thread Group is configured to simulate a new visitor on each iteration, using property value {}",
RESET_STATE_ON_THREAD_GROUP_ITERATION);
- resetStateOnThreadGroupIteration.set(Boolean.valueOf(RESET_STATE_ON_THREAD_GROUP_ITERATION));
+ resetStateOnThreadGroupIteration.set(RESET_STATE_ON_THREAD_GROUP_ITERATION);
}
log.debug("Thread state will be reset ?: {}", RESET_STATE_ON_THREAD_GROUP_ITERATION);
}
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
index ffe44a5..7004635 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
@@ -197,7 +197,7 @@ public class RequestViewHTTP implements RequestView {
int port = hUrl.getPort() == -1 ? hUrl.getDefaultPort() : hUrl.getPort();
requestModel.addRow(new RowResult(
JMeterUtils.getResString("view_results_table_request_http_port"), //$NON-NLS-1$
- Integer.valueOf(port)));
+ port));
requestModel.addRow(new RowResult(
JMeterUtils.getResString("view_results_table_request_http_path"), //$NON-NLS-1$
hUrl.getPath()));
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 674bffd..85912a0 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -240,7 +240,7 @@ public class DataSourceElement extends AbstractTestElement
dataSource.setMaxTotal(poolSize);
dataSource.setMaxWaitMillis(Long.parseLong(getTimeout()));
- dataSource.setDefaultAutoCommit(Boolean.valueOf(isAutocommit()));
+ dataSource.setDefaultAutoCommit(isAutocommit());
if (log.isDebugEnabled()) {
StringBuilder sb = new StringBuilder(40);
diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
index 1902732..057e9c3 100644
--- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
+++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
@@ -37,12 +37,12 @@ public class DataSourceElementBeanInfo extends BeanInfoSupport {
private static final Map<String,Integer> TRANSACTION_ISOLATION_MAP = new HashMap<>(5);
static {
// Will use default isolation
- TRANSACTION_ISOLATION_MAP.put("DEFAULT", Integer.valueOf(-1));
- TRANSACTION_ISOLATION_MAP.put("TRANSACTION_NONE", Integer.valueOf(Connection.TRANSACTION_NONE));
- TRANSACTION_ISOLATION_MAP.put("TRANSACTION_READ_COMMITTED", Integer.valueOf(Connection.TRANSACTION_READ_COMMITTED));
- TRANSACTION_ISOLATION_MAP.put("TRANSACTION_READ_UNCOMMITTED", Integer.valueOf(Connection.TRANSACTION_READ_UNCOMMITTED));
- TRANSACTION_ISOLATION_MAP.put("TRANSACTION_REPEATABLE_READ", Integer.valueOf(Connection.TRANSACTION_REPEATABLE_READ));
- TRANSACTION_ISOLATION_MAP.put("TRANSACTION_SERIALIZABLE", Integer.valueOf(Connection.TRANSACTION_SERIALIZABLE));
+ TRANSACTION_ISOLATION_MAP.put("DEFAULT", -1);
+ TRANSACTION_ISOLATION_MAP.put("TRANSACTION_NONE", Connection.TRANSACTION_NONE);
+ TRANSACTION_ISOLATION_MAP.put("TRANSACTION_READ_COMMITTED", Connection.TRANSACTION_READ_COMMITTED);
+ TRANSACTION_ISOLATION_MAP.put("TRANSACTION_READ_UNCOMMITTED", Connection.TRANSACTION_READ_UNCOMMITTED);
+ TRANSACTION_ISOLATION_MAP.put("TRANSACTION_REPEATABLE_READ", Connection.TRANSACTION_REPEATABLE_READ);
+ TRANSACTION_ISOLATION_MAP.put("TRANSACTION_SERIALIZABLE", Connection.TRANSACTION_SERIALIZABLE);
}
public DataSourceElementBeanInfo() {
diff --git a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
index 3c514ce..5accb43 100644
--- a/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
+++ b/src/protocol/mail/src/main/java/org/apache/jmeter/protocol/mail/sampler/MailFileFolder.java
@@ -104,7 +104,7 @@ public class MailFileFolder extends Folder {
if (isFile) {
f = folderPath;
} else {
- f = new File(folderPath,String.format(FILENAME_FORMAT, Integer.valueOf(index)));
+ f = new File(folderPath,String.format(FILENAME_FORMAT, index));
}
try (InputStream fis = new FileInputStream(f);
InputStream bis = new BufferedInputStream(fis)) {
diff --git a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
index 7c01d03..96fe5c1 100644
--- a/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
+++ b/src/protocol/mongodb/src/main/java/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementBeanInfo.java
@@ -69,22 +69,22 @@ public class MongoSourceElementBeanInfo
p.setValue(DEFAULT, Boolean.FALSE);
p = property("connectionsPerHost");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(10));
+ p.setValue(DEFAULT, 10);
p = property("connectTimeout");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(0));
+ p.setValue(DEFAULT, 0);
p = property("threadsAllowedToBlockForConnectionMultiplier");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(5));
+ p.setValue(DEFAULT, 5);
p = property("maxAutoConnectRetryTime");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Long.valueOf(0));
+ p.setValue(DEFAULT, 0L);
p = property("maxWaitTime");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(120000));
+ p.setValue(DEFAULT, 120000);
p = property("socketTimeout");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(0));
+ p.setValue(DEFAULT, 0);
p = property("socketKeepAlive");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, Boolean.FALSE);
@@ -100,10 +100,10 @@ public class MongoSourceElementBeanInfo
p.setValue(DEFAULT, Boolean.FALSE);
p = property("writeOperationNumberOfServers");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(0));
+ p.setValue(DEFAULT, 0);
p = property("writeOperationTimeout");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
- p.setValue(DEFAULT, Integer.valueOf(0));
+ p.setValue(DEFAULT, 0);
p = property("continueOnInsertError");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, Boolean.FALSE);