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 1da45dd12e7ace8275a01a79a6fdb165e45e5e0c Author: Vladimir Sitnikov <[email protected]> AuthorDate: Sat Oct 19 00:00:19 2019 +0300 Remove unnecessary unboxing --- .../org/apache/jmeter/config/RandomVariableConfig.java | 2 +- .../org/apache/jmeter/extractor/RegexExtractor.java | 2 +- .../org/apache/jmeter/modifiers/CounterConfig.java | 4 ++-- .../java/org/apache/jmeter/timers/BeanShellTimer.java | 2 +- .../jmeter/visualizers/RespTimeGraphVisualizer.java | 6 +++--- .../apache/jmeter/visualizers/StatGraphVisualizer.java | 8 ++++---- .../org/apache/jmeter/visualizers/TableVisualizer.java | 2 +- .../visualizers/backend/BackendListenerContext.java | 2 +- .../graphite/GraphiteBackendListenerClient.java | 6 +++--- .../org/apache/jmeter/timers/TimerServiceTest.java | 2 +- .../java/org/apache/jmeter/control/LoopController.java | 6 +++--- .../java/org/apache/jmeter/gui/SavePropertyDialog.java | 2 +- .../report/config/ReportGeneratorConfiguration.java | 12 ++++++------ .../java/org/apache/jmeter/report/core/Sample.java | 18 +++++++++--------- .../org/apache/jmeter/report/core/SampleMetadata.java | 4 ++-- .../jmeter/report/dashboard/HtmlTemplateExporter.java | 4 ++-- .../jmeter/report/processor/AggregateConsumer.java | 2 +- .../jmeter/report/processor/ErrorsSummaryConsumer.java | 8 ++++---- .../jmeter/report/processor/Top5ErrorsSummaryData.java | 2 +- .../report/processor/graph/AbstractGraphConsumer.java | 10 +++++----- .../graph/AbstractVersusRequestsGraphConsumer.java | 2 +- .../java/org/apache/jmeter/save/CSVSaveService.java | 2 +- .../save/converters/BooleanPropertyConverter.java | 2 +- .../jmeter/testbeans/gui/BooleanPropertyEditor.java | 2 +- .../org/apache/jmeter/testbeans/gui/EnumEditor.java | 4 ++-- .../jmeter/testelement/property/AbstractProperty.java | 10 +++++----- .../jmeter/testelement/property/BooleanProperty.java | 2 +- .../jmeter/visualizers/SamplingStatCalculator.java | 6 +++--- .../jmeter/samplers/TestDataStrippingSampleSender.java | 2 +- .../java/org/apache/jmeter/functions/CharFunction.java | 2 +- .../org/apache/jmeter/functions/RegexFunction.java | 2 +- .../org/apache/jorphan/gui/MinMaxLongRenderer.java | 2 +- .../main/java/org/apache/jorphan/gui/RateRenderer.java | 2 +- .../org/apache/jorphan/math/StatCalculatorInteger.java | 4 ++-- .../org/apache/jorphan/math/StatCalculatorLong.java | 4 ++-- .../main/java/org/apache/jorphan/util/Converter.java | 4 ++-- .../java/org/apache/jorphan/util/JOrphanUtils.java | 2 +- .../http/control/DynamicKerberosSchemeFactory.java | 2 +- .../http/control/DynamicSPNegoSchemeFactory.java | 2 +- .../jmeter/protocol/http/control/HeaderManager.java | 2 +- .../apache/jmeter/protocol/http/gui/CookiePanel.java | 2 +- .../jmeter/protocol/http/gui/HTTPArgumentsPanel.java | 2 +- .../apache/jmeter/protocol/http/parser/HTMLParser.java | 2 +- .../protocol/http/parser/LagartoBasedHtmlParser.java | 6 +++--- .../jmeter/protocol/http/sampler/HTTPHC4Impl.java | 2 +- .../jmeter/protocol/java/sampler/BeanShellSampler.java | 2 +- .../protocol/java/sampler/JavaSamplerContext.java | 8 ++++---- .../jmeter/protocol/jdbc/AbstractJDBCTestElement.java | 2 +- .../jdbc/config/DataSourceElementBeanInfo.java | 2 +- 49 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java index 76e0f18..3387686 100644 --- a/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java +++ b/src/components/src/main/java/org/apache/jmeter/config/RandomVariableConfig.java @@ -193,7 +193,7 @@ public class RandomVariableConfig extends ConfigTestElement if (randomSeed.length()>0){ Long seed = getRandomSeedAsLong(); if(seed != null) { - return new Random(seed.longValue()); + return new Random(seed); } } return new Random(); diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java index 37b65ae..33ad8d5 100644 --- a/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java +++ b/src/components/src/main/java/org/apache/jmeter/extractor/RegexExtractor.java @@ -295,7 +295,7 @@ public class RegexExtractor extends AbstractScopedTestElement implements PostPro log.debug("RegexExtractor: Template piece {} ({})", obj, obj.getClass()); } if (obj instanceof Integer) { - result.append(match.group(((Integer) obj).intValue())); + result.append(match.group((Integer) obj)); } else { result.append(obj); } 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 c6986c8..39a338a 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 @@ -102,11 +102,11 @@ public class CounterConfig extends AbstractTestElement globalCounter += increment; } } else { - long current = perTheadNumber.get().longValue(); + long current = perTheadNumber.get(); if(isResetOnThreadGroupIteration()) { int iteration = variables.getIteration(); Long lastIterationNumber = perTheadLastIterationNumber.get(); - if(iteration != lastIterationNumber.longValue()) { + if(iteration != lastIterationNumber) { // reset current = getStart(); } diff --git a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java index 4d920f4..3678c3f 100644 --- a/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java +++ b/src/components/src/main/java/org/apache/jmeter/timers/BeanShellTimer.java @@ -62,7 +62,7 @@ public class BeanShellTimer extends BeanShellTestElement implements Cloneable, T } } try { - return Long.decode(ret).longValue(); + return Long.decode(ret); } catch (NumberFormatException e){ log.warn("Number format exception while decoding number: '{}'", ret); return 0; 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 8515f65..cafa302 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 @@ -372,15 +372,15 @@ public class RespTimeGraphVisualizer extends AbstractVisualizer implements Actio graphPanel.setColor(getLinesColors()); graphPanel.setShowGrouping(numberShowGrouping.isSelected()); graphPanel.setLegendPlacement(StatGraphProperties.getPlacementNameMap() - .get(legendPlacementList.getSelectedItem()).intValue()); + .get(legendPlacementList.getSelectedItem())); graphPanel.setPointShape(StatGraphProperties.getPointShapeMap().get(pointShapeLine.getSelectedItem())); graphPanel.setStrokeWidth(Float.parseFloat((String) strokeWidthList.getSelectedItem())); graphPanel.setTitleFont(new Font(StatGraphProperties.getFontNameMap().get(titleFontNameList.getSelectedItem()), - StatGraphProperties.getFontStyleMap().get(titleFontStyleList.getSelectedItem()).intValue(), + StatGraphProperties.getFontStyleMap().get(titleFontStyleList.getSelectedItem()), Integer.parseInt((String) titleFontSizeList.getSelectedItem()))); graphPanel.setLegendFont(new Font(StatGraphProperties.getFontNameMap().get(fontNameList.getSelectedItem()), - StatGraphProperties.getFontStyleMap().get(fontStyleList.getSelectedItem()).intValue(), + StatGraphProperties.getFontStyleMap().get(fontStyleList.getSelectedItem()), Integer.parseInt((String) fontSizeList.getSelectedItem()))); graphPanel.setHeight(height); 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 168a252..279e996 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 @@ -623,16 +623,16 @@ public class StatGraphVisualizer extends AbstractVisualizer implements Clearable graphPanel.setShowGrouping(numberShowGrouping.isSelected()); graphPanel.setValueOrientation(valueLabelsVertical.isSelected()); graphPanel.setLegendPlacement(StatGraphProperties.getPlacementNameMap() - .get(legendPlacementList.getSelectedItem()).intValue()); + .get(legendPlacementList.getSelectedItem())); graphPanel.setTitleFont(new Font(StatGraphProperties.getFontNameMap().get(titleFontNameList.getSelectedItem()), - StatGraphProperties.getFontStyleMap().get(titleFontStyleList.getSelectedItem()).intValue(), + StatGraphProperties.getFontStyleMap().get(titleFontStyleList.getSelectedItem()), Integer.parseInt((String) titleFontSizeList.getSelectedItem()))); graphPanel.setLegendFont(new Font(StatGraphProperties.getFontNameMap().get(fontNameList.getSelectedItem()), - StatGraphProperties.getFontStyleMap().get(fontStyleList.getSelectedItem()).intValue(), + StatGraphProperties.getFontStyleMap().get(fontStyleList.getSelectedItem()), Integer.parseInt((String) fontSizeList.getSelectedItem()))); graphPanel.setValueFont(new Font(StatGraphProperties.getFontNameMap().get(valueFontNameList.getSelectedItem()), - StatGraphProperties.getFontStyleMap().get(valueFontStyleList.getSelectedItem()).intValue(), + StatGraphProperties.getFontStyleMap().get(valueFontStyleList.getSelectedItem()), Integer.parseInt((String) valueFontSizeList.getSelectedItem()))); graphPanel.setHeight(height); diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java index c874e8e..d5073e4 100644 --- a/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java +++ b/src/components/src/main/java/org/apache/jmeter/visualizers/TableVisualizer.java @@ -367,7 +367,7 @@ public class TableVisualizer extends AbstractVisualizer implements Clearable { Boolean success = (Boolean) super.invoke(pInvokee); if (success != null) { - if (success.booleanValue()) { + if (success) { return imageSuccess; } else { return imageFailure; diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerContext.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerContext.java index ae1438c..418d2eb 100644 --- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerContext.java +++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/BackendListenerContext.java @@ -185,7 +185,7 @@ public class BackendListenerContext { } final String valueString = params.get(name); try { - return Long.decode(valueString).longValue(); + return Long.decode(valueString); } catch (NumberFormatException e) { log.warn("Value for parameter '{}' not a long: '{}'. Using default: '{}'.", name, valueString, defaultValue, e); diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java index 615d29e..93132cd 100644 --- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java +++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java @@ -224,7 +224,7 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient for (Map.Entry<String, Float> entry : okPercentiles.entrySet()) { graphiteMetricsManager.addMetric(timestampInSeconds, contextName, entry.getKey(), - Double.toString(metric.getOkPercentile(entry.getValue().floatValue()))); + Double.toString(metric.getOkPercentile(entry.getValue()))); } } if (metric.getFailures() > 0) { @@ -240,7 +240,7 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient for (Map.Entry<String, Float> entry : koPercentiles.entrySet()) { graphiteMetricsManager.addMetric(timestampInSeconds, contextName, entry.getKey(), - Double.toString(metric.getKoPercentile(entry.getValue().floatValue()))); + Double.toString(metric.getKoPercentile(entry.getValue()))); } } graphiteMetricsManager.addMetric(timestampInSeconds, contextName, @@ -255,7 +255,7 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient for (Map.Entry<String, Float> entry : allPercentiles.entrySet()) { graphiteMetricsManager.addMetric(timestampInSeconds, contextName, entry.getKey(), - Double.toString(metric.getAllPercentile(entry.getValue().floatValue()))); + Double.toString(metric.getAllPercentile(entry.getValue()))); } } 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 9954962..f8c34fc 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 @@ -51,7 +51,7 @@ public class TimerServiceTest { public boolean matches(Object item) { if (item instanceof Long) { Long other = (Long) item; - return Math.abs(other.longValue() - value) < precision; + return Math.abs(other - value) < precision; } return false; } 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 ed67abd..32e16bd 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 @@ -81,10 +81,10 @@ public class LoopController extends GenericController implements Serializable, I // Evaluation occurs when nbLoops is not yet evaluated // or when nbLoops is equal to special value INFINITE_LOOP_COUNT if (nbLoops==null || // No evaluated yet - nbLoops.intValue()==0 || // Last iteration led to nbLoops == 0, + nbLoops ==0 || // Last iteration led to nbLoops == 0, // in this case as resetLoopCount will not be called, // it leads to no further evaluations if we don't evaluate, see BUG 56276 - nbLoops.intValue()==INFINITE_LOOP_COUNT // Number of iteration is set to infinite + nbLoops ==INFINITE_LOOP_COUNT // Number of iteration is set to infinite ) { try { JMeterProperty prop = getProperty(LOOPS); @@ -93,7 +93,7 @@ public class LoopController extends GenericController implements Serializable, I nbLoops = 0; } } - return nbLoops.intValue(); + return nbLoops; } public String getLoopString() { 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 f8a8d05..1c2b31b 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 @@ -139,7 +139,7 @@ public class SavePropertyDialog extends JDialog implements ActionListener { private boolean getSaveState(String methodName) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { Method method = SampleSaveConfiguration.class.getMethod(methodName); - return ((Boolean) method.invoke(saveConfig)).booleanValue(); + return (Boolean) method.invoke(saveConfig); } /** 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 d4bbb49..61889e5 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 @@ -161,7 +161,7 @@ public class ReportGeneratorConfiguration { getExporterPropertyKey(exportId, EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES), EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT, - Boolean.class).booleanValue(); + Boolean.class); exportConfiguration .filtersOnlySampleSeries(filtersOnlySampleSeries); @@ -181,7 +181,7 @@ public class ReportGeneratorConfiguration { getExporterPropertyKey(exportId, EXPORTER_KEY_SHOW_CONTROLLERS_ONLY), EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT, - Boolean.class).booleanValue(); + Boolean.class); exportConfiguration .showControllerSeriesOnly(showControllerSeriesOnly); @@ -238,7 +238,7 @@ public class ReportGeneratorConfiguration { getGraphPropertyKey(graphId, GRAPH_KEY_EXCLUDE_CONTROLLERS), GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT, - Boolean.class).booleanValue(); + Boolean.class); graphConfiguration .setExcludeControllers(excludeControllers); @@ -627,14 +627,14 @@ public class ReportGeneratorConfiguration { final long apdexSatisfiedThreshold = getRequiredProperty(props, REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD, REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT, - long.class).longValue(); + long.class); configuration.setApdexSatisfiedThreshold(apdexSatisfiedThreshold); // Load apdex tolerated threshold final long apdexToleratedThreshold = getRequiredProperty(props, REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD, REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT, - long.class).longValue(); + long.class); configuration.setApdexToleratedThreshold(apdexToleratedThreshold); // Load apdex per transactions, overridden by user @@ -647,7 +647,7 @@ public class ReportGeneratorConfiguration { props, REPORT_GENERATOR_KEY_EXCLUDE_TC_FROM_TOP5_ERRORS_BY_SAMPLER, Boolean.TRUE, - Boolean.class).booleanValue(); + Boolean.class); configuration.setIgnoreTCFromTop5ErrorsBySampler(ignoreTCFromTop5ErrorsBySampler); // Load sample filter diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java index cf66330..e16aca2 100644 --- a/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java +++ b/src/core/src/main/java/org/apache/jmeter/report/core/Sample.java @@ -149,7 +149,7 @@ public class Sample { * @return the time stamp */ public long getTimestamp() { - return getData(long.class, CSVSaveService.TIME_STAMP).longValue(); + return getData(long.class, CSVSaveService.TIME_STAMP); } /** @@ -158,7 +158,7 @@ public class Sample { * @return the elapsed time stored in the sample */ public long getElapsedTime() { - return getData(long.class, CSVSaveService.CSV_ELAPSED).longValue(); + return getData(long.class, CSVSaveService.CSV_ELAPSED); } /** @@ -243,7 +243,7 @@ public class Sample { * @return the latency stored in the sample */ public long getLatency() { - return getData(long.class, CSVSaveService.CSV_LATENCY).longValue(); + return getData(long.class, CSVSaveService.CSV_LATENCY); } /** @@ -253,7 +253,7 @@ public class Sample { */ public long getConnectTime() { if(metadata.indexOf(CSVSaveService.CSV_CONNECT_TIME) >= 0) { - return getData(long.class, CSVSaveService.CSV_CONNECT_TIME).longValue(); + return getData(long.class, CSVSaveService.CSV_CONNECT_TIME); } else { return 0L; } @@ -265,7 +265,7 @@ public class Sample { * @return the success status stored in the sample */ public boolean getSuccess() { - return getData(boolean.class, CSVSaveService.SUCCESSFUL).booleanValue(); + return getData(boolean.class, CSVSaveService.SUCCESSFUL); } /** @@ -274,7 +274,7 @@ public class Sample { * @return the number of received bytes stored in the sample */ public long getReceivedBytes() { - return getData(long.class, CSVSaveService.CSV_BYTES).longValue(); + return getData(long.class, CSVSaveService.CSV_BYTES); } /** @@ -284,7 +284,7 @@ public class Sample { */ public long getSentBytes() { if(metadata.indexOf(CSVSaveService.CSV_SENT_BYTES) >= 0) { - return getData(long.class, CSVSaveService.CSV_SENT_BYTES).longValue(); + return getData(long.class, CSVSaveService.CSV_SENT_BYTES); } else { return 0L; } @@ -296,7 +296,7 @@ public class Sample { * @return the number of threads in the group of this sample */ public int getGroupThreads() { - return getData(int.class, CSVSaveService.CSV_THREAD_COUNT1).intValue(); + return getData(int.class, CSVSaveService.CSV_THREAD_COUNT1); } /** @@ -305,7 +305,7 @@ public class Sample { * @return the overall number of threads */ public int getAllThreads() { - return getData(int.class, CSVSaveService.CSV_THREAD_COUNT2).intValue(); + return getData(int.class, CSVSaveService.CSV_THREAD_COUNT2); } /** 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 8d98b97..f33795c 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 @@ -188,7 +188,7 @@ public class SampleMetadata { * <code>getColumnCount()</code>) */ public String getColumnName(Integer i) { - return columns.get(i.intValue()); + return columns.get(i); } /** @@ -201,7 +201,7 @@ public class SampleMetadata { */ public int indexOf(String col) { Integer out = index.get(col); - return out == null ? -1 : out.intValue(); + return out == null ? -1 : out; } /** 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 e58ba23..019be8d 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 @@ -194,7 +194,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter { public boolean checkResult(DataContext dataContext, ResultData result) { boolean supportsControllerDiscrimination = findValue(Boolean.class, AbstractGraphConsumer.RESULT_SUPPORTS_CONTROLLERS_DISCRIMINATION, - result).booleanValue(); + result); if (supportsControllerDiscrimination && showControllerSeriesOnly @@ -233,7 +233,7 @@ public class HtmlTemplateExporter extends AbstractDataExporter { // Is the current series a controller series ? boolean isController = findValue(Boolean.class, AbstractGraphConsumer.RESULT_SERIES_IS_CONTROLLER, - seriesData).booleanValue(); + seriesData); matches = filterPattern.matcher(name).matches(); if (matches) { 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 9f6b9ea..032cbf9 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 @@ -98,7 +98,7 @@ public class AggregateConsumer extends AbstractSampleConsumer { */ @Override public void consume(Sample sample, int channel) { - aggregator.addValue(selector.select(sample).doubleValue()); + aggregator.addValue(selector.select(sample)); super.produce(sample, channel); } 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 f722441..7c18a69 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 @@ -64,8 +64,8 @@ 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) data.longValue() * 100 / errorCount)); - result.addResult(new ValueResultData((double) data.longValue() * 100 + result.addResult(new ValueResultData((double) data * 100 / errorCount)); + result.addResult(new ValueResultData((double) data * 100 / getOverallInfo().getData().doubleValue())); return result; } @@ -120,7 +120,7 @@ public class ErrorsSummaryConsumer extends AbstractSummaryConsumer<Long> { if (overallData == null) { overallData = ZERO; } - overallInfo.setData(overallData.longValue() + 1); + overallInfo.setData(overallData + 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(data.longValue() + 1); + info.setData(data + 1); } } 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 2e2a60f..960e2b5 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 @@ -49,7 +49,7 @@ public class Top5ErrorsSummaryData { if (value == null) { countPerError.put(errorMessage, ONE); } else { - countPerError.put(errorMessage, value.longValue() + 1); + countPerError.put(errorMessage, value + 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 0e1f6cc..757cb97 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,14 +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(Math.min(((Double) valueResult.getValue()).doubleValue(), - value.doubleValue())); + valueResult.setValue(Math.min((Double) valueResult.getValue(), + value)); } private void setMaxResult(MapResultData result, String name, Double value) { ValueResultData valueResult = (ValueResultData) result.getResult(name); - valueResult.setValue(Math.max(((Double) valueResult.getValue()).doubleValue(), - value.doubleValue())); + valueResult.setValue(Math.max((Double) valueResult.getValue(), + value)); } /** @@ -395,7 +395,7 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer { // Aggregate keys if needed (if aggregated keys series is set) Aggregator keysAgg = data.getKeysAggregator(); if (keysAgg != null) { - keysAgg.addValue(key.doubleValue()); + keysAgg.addValue(key); } // Aggregate values if needed (if aggregated keys series is set) 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 077e672..5cde8f9 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 @@ -313,7 +313,7 @@ public abstract class AbstractVersusRequestsGraphConsumer extends Long time = getTimeInterval(sample); Long count = counts.get(time); if (count != null) { - counts.put(time, count.longValue() + 1); + counts.put(time, count + 1); } else { counts.put(time, ONE); } diff --git a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java index c7a5bb5..a0e903c 100644 --- a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java +++ b/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java @@ -287,7 +287,7 @@ public final class CSVSaveService { if (saveConfig.saveSuccess()) { field = SUCCESSFUL; text = parts[i++]; - result.setSuccessful(Boolean.valueOf(text).booleanValue()); + result.setSuccessful(Boolean.valueOf(text)); } if (saveConfig.saveAssertionResultsFailureMessage()) { diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/BooleanPropertyConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/BooleanPropertyConverter.java index f1d3669..324b26f 100644 --- a/src/core/src/main/java/org/apache/jmeter/save/converters/BooleanPropertyConverter.java +++ b/src/core/src/main/java/org/apache/jmeter/save/converters/BooleanPropertyConverter.java @@ -60,7 +60,7 @@ public class BooleanPropertyConverter implements Converter { if (name == null) { return null; } - BooleanProperty prop = new BooleanProperty(name, Boolean.valueOf(reader.getValue()).booleanValue()); + BooleanProperty prop = new BooleanProperty(name, Boolean.valueOf(reader.getValue())); return prop; } } diff --git a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java index c2b8606..caafee6 100644 --- a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java +++ b/src/core/src/main/java/org/apache/jmeter/testbeans/gui/BooleanPropertyEditor.java @@ -40,7 +40,7 @@ public class BooleanPropertyEditor extends PropertyEditorSupport { } private String toString(Boolean value) { - return value.booleanValue() ? TRUE : FALSE; + return value ? TRUE : FALSE; } @Override 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 ad6340e..d4982f4 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 @@ -53,7 +53,7 @@ class EnumEditor extends PropertyEditorSupport implements ClearGui { } Object def = descriptor.getValue(GenericTestBeanCustomizer.DEFAULT); if (def instanceof Integer) { - defaultIndex = ((Integer) def).intValue(); + defaultIndex = (Integer) def; } else { defaultIndex = 0; } @@ -86,7 +86,7 @@ class EnumEditor extends PropertyEditorSupport implements ClearGui { if (value instanceof Enum<?>){ combo.setSelectedIndex(((Enum<?>) value).ordinal()); } else if (value instanceof Integer) { - combo.setSelectedIndex(((Integer) value).intValue()); + combo.setSelectedIndex((Integer) value); } else { combo.setSelectedItem(value); } diff --git a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java index ddb6db0..fdb208e 100644 --- a/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java +++ b/src/core/src/main/java/org/apache/jmeter/testelement/property/AbstractProperty.java @@ -272,15 +272,15 @@ public abstract class AbstractProperty implements JMeterProperty { if (item instanceof String) { return new StringProperty("", item.toString()); } else if (item instanceof Boolean) { - return new BooleanProperty("", ((Boolean) item).booleanValue()); + return new BooleanProperty("", (Boolean) item); } else if (item instanceof Float) { - return new FloatProperty("", ((Float) item).floatValue()); + return new FloatProperty("", (Float) item); } else if (item instanceof Double) { - return new DoubleProperty("", ((Double) item).doubleValue()); + return new DoubleProperty("", (Double) item); } else if (item instanceof Integer) { - return new IntegerProperty("", ((Integer) item).intValue()); + return new IntegerProperty("", (Integer) item); } else if (item instanceof Long) { - return new LongProperty("", ((Long) item).longValue()); + return new LongProperty("", (Long) item); } else { return new StringProperty("", item.toString()); } 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 f7d8cbf..cab273b 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 @@ -41,7 +41,7 @@ public class BooleanProperty extends AbstractProperty { @Override public void setObjectValue(Object v) { if (v instanceof Boolean) { - value = ((Boolean) v).booleanValue(); + value = (Boolean) v; } else { value = Boolean.parseBoolean(v.toString()); } 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 aa8fe12..4c2e799 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 @@ -199,8 +199,8 @@ public class SamplingStatCalculator { rtime = res.getTime(); cmean = (long)calculator.getMean(); cstdv = (long)calculator.getStandardDeviation(); - cmedian = calculator.getMedian().longValue(); - cpercent = calculator.getPercentPoint( 0.500 ).longValue(); + cmedian = calculator.getMedian(); + cpercent = calculator.getPercentPoint(0.500); // TODO cpercent is the same as cmedian here - why? and why pass it to "distributionLine"? rbool = res.isSuccessful(); } @@ -298,7 +298,7 @@ public class SamplingStatCalculator { } public Number getMin() { - if (calculator.getMin().longValue() < 0) { + if (calculator.getMin() < 0) { return 0L; } return calculator.getMin(); diff --git a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java index 8cef590..6eaf3fc 100644 --- a/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java +++ b/src/core/src/test/java/org/apache/jmeter/samplers/TestDataStrippingSampleSender.java @@ -67,7 +67,7 @@ public class TestDataStrippingSampleSender extends JMeterTestCase implements JMe SimpleSender nextSender = new SimpleSender(); DataStrippingSampleSender sut = new DataStrippingSampleSender(nextSender); sut.readResolve(); - SampleResult sample = result(successfulParent.booleanValue(), result(result(result()))); + SampleResult sample = result(successfulParent, result(result(result()))); sut.sampleOccurred(event(sample)); assertResultsHaveContent(content, sample); assertThat(sample, CoreMatchers.is(nextSender.getResult())); diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java index 69f5904..98f62cf 100644 --- a/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java +++ b/src/functions/src/main/java/org/apache/jmeter/functions/CharFunction.java @@ -59,7 +59,7 @@ public class CharFunction extends AbstractFunction { for (Object val : values) { String numberString = ((CompoundVariable) val).execute().trim(); try { - long value = Long.decode(numberString).longValue(); + long value = Long.decode(numberString); char ch = (char) value; sb.append(ch); } catch (NumberFormatException e) { diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java index 517711f..8fddbdf 100644 --- a/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java +++ b/src/functions/src/main/java/org/apache/jmeter/functions/RegexFunction.java @@ -224,7 +224,7 @@ public class RegexFunction extends AbstractFunction { if (t instanceof String) { result.append(t); } else { - result.append(match.group(((Integer) t).intValue())); + result.append(match.group((Integer) t)); } } if (namep.length() > 0){ diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java index 58878a8..8a1e165 100644 --- a/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java +++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/MinMaxLongRenderer.java @@ -38,7 +38,7 @@ public class MinMaxLongRenderer extends NumberRenderer { // NOSONAR @Override public void setValue(Object value) { if (value instanceof Long) { - long longValue = ((Long) value).longValue(); + long longValue = (Long) value; if (!(longValue == Long.MAX_VALUE || longValue == Long.MIN_VALUE)) { setText(formatter.format(longValue)); return; diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java index 5d71680..55ef700 100644 --- a/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java +++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/RateRenderer.java @@ -44,7 +44,7 @@ public class RateRenderer extends NumberRenderer{ // NOSONAR 7 parents is OK in setText("#N/A"); return; } - double rate = ((Double) value).doubleValue(); + double rate = (Double) value; if (Double.compare(rate,Double.MAX_VALUE)==0){ setText("#N/A"); return; 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 e14a532..d89ed7b 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 @@ -43,11 +43,11 @@ public class StatCalculatorInteger extends StatCalculator<Integer> { @Override protected Integer divide(Integer val, int n) { - return val.intValue() / n; + return val / n; } @Override protected Integer divide(Integer val, long n) { - return (int) (val.intValue() / n); + return (int) (val / 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 daf6507..69844b6 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 @@ -48,11 +48,11 @@ public class StatCalculatorLong extends StatCalculator<Long> { @Override protected Long divide(Long val, int n) { - return val.longValue() / n; + return val / n; } @Override protected Long divide(Long val, long n) { - return val.longValue() / n; + return val / n; } } 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 35b216f..bfec41a 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 @@ -271,7 +271,7 @@ public class Converter { if (o == null) { return defaultValue; } else if (o instanceof Boolean) { - return ((Boolean) o).booleanValue(); + return (Boolean) o; } return Boolean.parseBoolean(o.toString()); } @@ -328,7 +328,7 @@ public class Converter { return defaultValue; } if (o instanceof Character) { - return ((Character) o).charValue(); + return (Character) o; } else if (o instanceof Byte) { return (char) ((Byte) o).byteValue(); } else if (o instanceof Integer) { diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java index dc5aa0b..f1f9aa0 100644 --- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java +++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java @@ -720,7 +720,7 @@ public final class JOrphanUtils { return 0; } Object[] result = replaceAllWithRegex(value, regex, replaceBy, caseSensitive); - int nbReplaced = ((Integer) result[1]).intValue(); + int nbReplaced = (Integer) result[1]; if (nbReplaced <= 0) { return 0; } diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java index 62f8301..204ac53 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java @@ -60,7 +60,7 @@ public class DynamicKerberosSchemeFactory extends KerberosSchemeFactory { private boolean isEnabled(Object contextAttribute, boolean defaultValue) { if (contextAttribute instanceof Boolean) { - return ((Boolean) contextAttribute).booleanValue(); + return (Boolean) contextAttribute; } return defaultValue; } diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java index 79dfc15..afea068 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java @@ -60,7 +60,7 @@ public class DynamicSPNegoSchemeFactory extends SPNegoSchemeFactory { private boolean isEnabled(Object contextAttribute, boolean defaultValue) { if (contextAttribute instanceof Boolean) { - return ((Boolean) contextAttribute).booleanValue(); + return (Boolean) contextAttribute; } return defaultValue; } 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 c825a42..f2502cf 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 @@ -216,7 +216,7 @@ public class HeaderManager extends ConfigTestElement implements Serializable, Re } } for (Integer indice : removeIndices) { - getHeaders().remove(indice.intValue()); + getHeaders().remove(indice); } } 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 30be389..7bc995c 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 @@ -243,7 +243,7 @@ public class CookiePanel extends AbstractConfigGui implements ActionListener { (String) rowData[1], (String) rowData[2], (String) rowData[3], - ((Boolean) rowData[4]).booleanValue(), + (Boolean) rowData[4], 0); // Non-expiring return cookie; } diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java index 98e425f..d3682c4 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java @@ -172,7 +172,7 @@ public class HTTPArgumentsPanel extends ArgumentsPanel { if (clipboardCols.length > 3) { Boolean useEqual = BooleanUtils.toBooleanObject(clipboardCols[3].trim()); // default to true if the string is not a boolean - argument.setUseEquals(useEqual!=null?useEqual.booleanValue():true); + argument.setUseEquals(useEqual!=null? useEqual :true); } } } diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java index 77da895..7f30ae6 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java @@ -193,7 +193,7 @@ public abstract class HTMLParser extends BaseParser { protected final boolean isEnableConditionalComments(Float ieVersion) { // Conditional comment have been dropped in IE10 // http://msdn.microsoft.com/en-us/library/ie/hh801214%28v=vs.85%29.aspx - return ieVersion != null && ieVersion.floatValue() < IE_10; + return ieVersion != null && ieVersion < IE_10; } /** 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 6228187..946ac70 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 @@ -94,7 +94,7 @@ public class LagartoBasedHtmlParser extends HTMLParser { */ @Override public void script(Tag tag, CharSequence body) { - if (!enabled.peek().booleanValue()) { + if (!enabled.peek()) { return; } extractAttribute(tag, ATT_SRC); @@ -107,7 +107,7 @@ public class LagartoBasedHtmlParser extends HTMLParser { */ @Override public void tag(Tag tag) { - if (!enabled.peek().booleanValue()) { + if (!enabled.peek()) { return; } TagType tagType = tag.getType(); @@ -188,7 +188,7 @@ public class LagartoBasedHtmlParser extends HTMLParser { htmlCCommentExpressionMatcher = new HtmlCCommentExpressionMatcher(); } String expressionString = expression.toString().trim(); - enabled.push(htmlCCommentExpressionMatcher.match(ieVersion.floatValue(), + enabled.push(htmlCCommentExpressionMatcher.match(ieVersion, 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 f00a105..b0cc278 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 @@ -1133,7 +1133,7 @@ public class HTTPHC4Impl extends HTTPHCAbstractImpl { JMeterVariables jMeterVariables, HttpClientContext clientContext, Map<HttpClientKey, MutableTriple<CloseableHttpClient, AuthState, PoolingHttpClientConnectionManager>> mapHttpClientPerHttpClientKey) { - if (resetStateOnThreadGroupIteration.get().booleanValue()) { + if (resetStateOnThreadGroupIteration.get()) { closeCurrentConnections(mapHttpClientPerHttpClientKey); clientContext.removeAttribute(HttpClientContext.USER_TOKEN); clientContext.removeAttribute(HttpClientContext.PROXY_AUTH_STATE); diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java index 8cd7970..fbf0f68 100644 --- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java +++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java @@ -133,7 +133,7 @@ public class BeanShellSampler extends BeanShellTestElement implements Sampler, I res.setResponseCode(bshInterpreter.get("ResponseCode").toString());//$NON-NLS-1$ res.setResponseMessage(bshInterpreter.get("ResponseMessage").toString());//$NON-NLS-1$ isSuccessful = Boolean.valueOf(bshInterpreter.get("IsSuccess") //$NON-NLS-1$ - .toString()).booleanValue(); + .toString()); } /* * To avoid class loading problems when bsh,jar is missing, we don't try diff --git a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java index ddd0810..a476a0c 100644 --- a/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java +++ b/src/protocol/java/src/main/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java @@ -142,7 +142,7 @@ public class JavaSamplerContext { throw new NumberFormatException("No value for parameter named '" + name + "'."); } - return Integer.decode(params.get(name)).intValue(); + return Integer.decode(params.get(name)); } /** @@ -168,7 +168,7 @@ public class JavaSamplerContext { } try { - return Integer.decode(params.get(name)).intValue(); + return Integer.decode(params.get(name)); } catch (NumberFormatException e) { log.warn("Value for parameter '" + name + "' not an integer: '" + params.get(name) + "'. Using default: '" + defaultValue + "'.", e); @@ -196,7 +196,7 @@ public class JavaSamplerContext { throw new NumberFormatException("No value for parameter named '" + name + "'."); } - return Long.decode(params.get(name)).longValue(); + return Long.decode(params.get(name)); } /** @@ -220,7 +220,7 @@ public class JavaSamplerContext { return defaultValue; } try { - return Long.decode(params.get(name)).longValue(); + return Long.decode(params.get(name)); } catch (NumberFormatException e) { log.warn("Value for parameter '" + name + "' not a long: '" + params.get(name) + "'. Using default: '" + defaultValue + "'.", e); diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java index 04f5930..5eadf28 100644 --- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java +++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java @@ -485,7 +485,7 @@ public abstract class AbstractJDBCTestElement extends AbstractTestElement implem throw new SQLException("Invalid data type: "+jdbcType, e); } } - return entry.intValue(); + return entry; } 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 057e9c3..e1b95f3 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 @@ -134,7 +134,7 @@ public class DataSourceElementBeanInfo extends BeanInfoSupport { log.warn("Illegal transaction isolation configuration '" + tag + "'"); } } else { - return isolationMode.intValue(); + return isolationMode; } } return -1;
