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 2023/05/05 10:09:21 UTC

[jmeter] branch master updated (b069225277 -> af92f07cc7)

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


    from b069225277 test: add @Isolated to JMeterSerialTest
     add f1d4844260 chore: fix condition for enableErrorprone so the verification is activated
     add df7c8bd15d chore: add explicit casts from long to double so data loss is visible in the source code
     add 5a993bf23b chore: remove use of deprecated Object#finalize
     add 0b371e0de2 chore: execute ErrorProne verifications when running with Java 11+ compiler only
     add 4a7057c994 style: remove redundant method overrides
     add 8b413c0e1e style: remove unnecessary default cases in enum switch
     add 11466eab44 style: replace iterator with enhanced for loop
     add 12aefb0c70 style: apply "private method can be static" inspection
     add 049cc3a694 style: run "field may be final" inspection
     add 6a0de9b700 style: run "field can be static"
     add af92f07cc7 style: prevent alignment of method parameters via .editorconfig

No new revisions were added by this update.

Summary of changes:
 .editorconfig                                      |  1 +
 build-logic/build-parameters/build.gradle.kts      |  3 +-
 .../main/kotlin/build-logic.errorprone.gradle.kts  | 20 +++++-
 .../src/main/kotlin/build-logic.style.gradle.kts   |  2 +-
 config/checkstyle/checkstyle.xml                   |  1 -
 .../org/apache/jmeter/assertions/BSFAssertion.java |  1 +
 .../apache/jmeter/assertions/CompareAssertion.java |  4 +-
 .../apache/jmeter/assertions/HTMLAssertion.java    |  2 +-
 .../jmeter/assertions/JSONPathAssertion.java       |  2 +-
 .../apache/jmeter/assertions/JSR223Assertion.java  |  1 +
 .../jmeter/assertions/XMLSchemaAssertion.java      |  2 +-
 .../apache/jmeter/assertions/gui/AssertionGui.java |  6 +-
 .../apache/jmeter/assertions/gui/XPath2Panel.java  |  4 +-
 .../assertions/jmespath/JMESPathAssertion.java     |  2 +-
 .../java/org/apache/jmeter/config/CSVDataSet.java  |  2 +-
 .../apache/jmeter/config/CSVDataSetBeanInfo.java   |  2 +-
 .../apache/jmeter/control/IncludeController.java   |  4 +-
 .../apache/jmeter/control/ModuleController.java    |  2 +-
 .../jmeter/control/gui/ModuleControllerGui.java    |  6 +-
 .../apache/jmeter/extractor/BSFPostProcessor.java  |  1 +
 .../jmeter/extractor/BeanShellPostProcessor.java   |  1 +
 .../apache/jmeter/extractor/BoundaryExtractor.java | 14 ++--
 .../jmeter/extractor/DebugPostProcessor.java       |  4 +-
 .../org/apache/jmeter/extractor/HtmlExtractor.java |  2 +-
 .../jmeter/extractor/JSR223PostProcessor.java      |  1 +
 .../apache/jmeter/extractor/JSoupExtractor.java    |  2 +-
 .../org/apache/jmeter/extractor/JoddExtractor.java |  2 +-
 .../apache/jmeter/extractor/RegexExtractor.java    | 18 ++---
 .../apache/jmeter/extractor/XPath2Extractor.java   |  4 +-
 .../apache/jmeter/extractor/XPathExtractor.java    |  4 +-
 .../jmeter/extractor/gui/BoundaryExtractorGui.java |  6 +-
 .../jmeter/extractor/gui/HtmlExtractorGui.java     |  6 +-
 .../jmeter/extractor/gui/RegexExtractorGui.java    |  6 +-
 .../jmeter/extractor/gui/XPathExtractorGui.java    |  6 +-
 .../extractor/json/jmespath/JMESPathExtractor.java |  8 +--
 .../json/jmespath/gui/JMESPathExtractorGui.java    |  6 +-
 .../extractor/json/jsonpath/JSONManager.java       |  2 +-
 .../extractor/json/jsonpath/JSONPostProcessor.java | 10 +--
 .../json/jsonpath/gui/JSONPostProcessorGui.java    |  8 +--
 .../json/render/RenderAsJsonRenderer.java          |  2 +-
 .../action/ExportTransactionAndSamplerNames.java   |  4 +-
 .../apache/jmeter/modifiers/BSFPreProcessor.java   |  1 +
 .../jmeter/modifiers/BeanShellPreProcessor.java    |  1 +
 .../jmeter/modifiers/JSR223PreProcessor.java       |  1 +
 .../org/apache/jmeter/modifiers/SampleTimeout.java |  4 +-
 .../jmeter/modifiers/gui/UserParametersGui.java    |  4 +-
 .../org/apache/jmeter/sampler/DebugSampler.java    |  2 +-
 .../java/org/apache/jmeter/timers/BSFTimer.java    |  1 +
 .../org/apache/jmeter/timers/BeanShellTimer.java   |  1 +
 .../jmeter/timers/ConstantThroughputTimer.java     |  2 +-
 .../java/org/apache/jmeter/timers/JSR223Timer.java |  1 +
 .../ConstantPoissonProcessGenerator.java           |  2 +-
 .../jmeter/visualizers/AssertionVisualizer.java    |  2 +-
 .../org/apache/jmeter/visualizers/AxisGraph.java   |  4 +-
 .../org/apache/jmeter/visualizers/BSFListener.java |  1 +
 .../jmeter/visualizers/BeanShellListener.java      |  1 +
 .../apache/jmeter/visualizers/GraphVisualizer.java |  6 +-
 .../apache/jmeter/visualizers/JSR223Listener.java  |  1 +
 .../jmeter/visualizers/MailerVisualizer.java       |  2 +-
 .../org/apache/jmeter/visualizers/RenderAsXML.java | 12 ++--
 .../apache/jmeter/visualizers/RenderAsXPath.java   |  2 +-
 .../apache/jmeter/visualizers/RenderAsXPath2.java  |  4 +-
 .../jmeter/visualizers/RespTimeGraphChart.java     |  4 +-
 .../visualizers/RespTimeGraphVisualizer.java       |  2 +-
 .../jmeter/visualizers/SamplerResultTab.java       |  2 +-
 .../jmeter/visualizers/SearchTextExtension.java    | 10 +--
 .../apache/jmeter/visualizers/SearchTreePanel.java |  4 +-
 .../jmeter/visualizers/SearchableTreeNode.java     |  2 +-
 .../jmeter/visualizers/StatGraphVisualizer.java    | 82 +++++++++++-----------
 .../apache/jmeter/visualizers/StatVisualizer.java  |  4 +-
 .../apache/jmeter/visualizers/SummaryReport.java   |  2 +-
 .../apache/jmeter/visualizers/TableVisualizer.java |  4 +-
 .../visualizers/ViewResultsFullVisualizer.java     | 14 ++--
 .../visualizers/XMLDefaultMutableTreeNode.java     | 12 ++--
 .../backend/AbstractBackendListenerClient.java     |  4 +-
 .../visualizers/backend/BackendListenerGui.java    |  6 +-
 .../jmeter/visualizers/backend/SamplerMetric.java  | 22 +++---
 .../jmeter/visualizers/backend/UserMetric.java     |  2 +-
 .../backend/influxdb/HttpMetricsSender.java        |  2 +-
 .../influxdb/InfluxDBRawBackendListenerClient.java |  4 +-
 .../influxdb/InfluxdbBackendListenerClient.java    |  2 +-
 .../src/main/java/org/apache/jmeter/JMeter.java    | 33 ++++-----
 .../java/org/apache/jmeter/ProxyAuthenticator.java |  2 -
 .../apache/jmeter/config/gui/ArgumentsPanel.java   |  4 +-
 .../org/apache/jmeter/control/IfController.java    |  2 +-
 .../apache/jmeter/engine/StandardJMeterEngine.java |  6 +-
 .../apache/jmeter/engine/util/FunctionParser.java  |  2 +-
 .../engine/util/ReplaceFunctionsWithStrings.java   |  2 +-
 .../apache/jmeter/engine/util/SimpleVariable.java  |  2 +-
 .../apache/jmeter/engine/util/ValueReplacer.java   |  4 +-
 .../jmeter/functions/gui/FunctionHelper.java       |  6 +-
 .../java/org/apache/jmeter/gui/GuiPackage.java     | 14 ++--
 .../org/apache/jmeter/gui/HtmlReportAction.java    |  2 +-
 .../java/org/apache/jmeter/gui/HtmlReportUI.java   |  4 +-
 .../main/java/org/apache/jmeter/gui/MainFrame.java | 18 ++---
 .../java/org/apache/jmeter/gui/OnErrorPanel.java   |  2 +-
 .../java/org/apache/jmeter/gui/UndoHistory.java    |  2 +-
 .../org/apache/jmeter/gui/action/AboutCommand.java |  6 +-
 .../apache/jmeter/gui/action/AbstractAction.java   |  3 +-
 .../org/apache/jmeter/gui/action/ActionRouter.java |  6 +-
 .../org/apache/jmeter/gui/action/AddParent.java    |  4 +-
 .../gui/action/AddThinkTimeBetweenEachStep.java    |  8 +--
 .../jmeter/gui/action/ApplyNamingConvention.java   |  2 +-
 .../org/apache/jmeter/gui/action/ChangeParent.java |  2 +-
 .../gui/action/CollapseExpandTreeBranch.java       |  2 +-
 .../apache/jmeter/gui/action/EnableComponent.java  |  4 +-
 .../jmeter/gui/action/HtmlReportGenerator.java     | 10 +--
 .../jmeter/gui/action/LoadRecentProject.java       |  2 +-
 .../java/org/apache/jmeter/gui/action/Move.java    |  2 +-
 .../apache/jmeter/gui/action/OpenLinkAction.java   |  2 +-
 .../java/org/apache/jmeter/gui/action/Paste.java   |  2 +-
 .../apache/jmeter/gui/action/RawTextSearcher.java  |  4 +-
 .../apache/jmeter/gui/action/RegexpSearcher.java   |  4 +-
 .../org/apache/jmeter/gui/action/RemoteStart.java  |  6 +-
 .../jmeter/gui/action/SSLManagerCommand.java       |  4 +-
 .../java/org/apache/jmeter/gui/action/Save.java    | 14 ++--
 .../org/apache/jmeter/gui/action/SaveGraphics.java |  2 +-
 .../jmeter/gui/action/SearchTreeCommand.java       |  2 +-
 .../apache/jmeter/gui/action/SearchTreeDialog.java |  8 +--
 .../jmeter/gui/action/SelectTemplatesDialog.java   | 10 +--
 .../java/org/apache/jmeter/gui/action/Start.java   |  9 ++-
 .../gui/action/template/TemplateManager.java       | 10 +--
 .../apache/jmeter/gui/logging/GuiLogEventBus.java  |  2 +-
 .../apache/jmeter/gui/logging/LogEventObject.java  |  2 +-
 .../jmeter/gui/menu/StaticJMeterGUIComponent.java  |  2 +-
 .../apache/jmeter/gui/tree/JMeterTreeListener.java |  2 +-
 .../apache/jmeter/gui/tree/JMeterTreeModel.java    |  8 +--
 .../org/apache/jmeter/gui/tree/JMeterTreeNode.java |  2 +-
 .../jmeter/gui/tree/JMeterTreeTransferHandler.java |  4 +-
 .../org/apache/jmeter/gui/util/FileListPanel.java  | 10 +--
 .../gui/util/HeaderAsPropertyRendererWrapper.java  |  2 +-
 .../org/apache/jmeter/gui/util/JMeterMenuBar.java  | 14 ++--
 .../jmeter/gui/util/JSyntaxSearchToolBar.java      |  4 +-
 .../java/org/apache/jmeter/gui/util/MenuInfo.java  |  2 +-
 .../jmeter/gui/util/TextAreaCellRenderer.java      |  2 +-
 .../apache/jmeter/gui/util/TristateCheckBox.java   |  4 +-
 .../org/apache/jmeter/plugin/PluginManager.java    |  6 +-
 .../config/ReportGeneratorConfiguration.java       |  4 +-
 .../jmeter/report/config/SubConfiguration.java     |  2 +-
 .../jmeter/report/core/AbstractSampleWriter.java   |  2 +-
 .../org/apache/jmeter/report/core/CsvFile.java     |  2 +-
 .../apache/jmeter/report/core/CsvSampleReader.java | 10 +--
 .../apache/jmeter/report/core/CsvSampleWriter.java |  4 +-
 .../apache/jmeter/report/core/SampleBuilder.java   |  4 +-
 .../apache/jmeter/report/core/SampleMetadata.java  |  2 +-
 .../report/dashboard/HtmlTemplateExporter.java     | 12 ++--
 .../jmeter/report/dashboard/JsonExporter.java      |  2 +-
 .../jmeter/report/dashboard/ReportGenerator.java   | 24 +++----
 .../report/processor/AbstractSampleConsumer.java   |  2 +-
 .../report/processor/AbstractSampleProcessor.java  |  2 +-
 .../jmeter/report/processor/AggregateConsumer.java |  4 +-
 .../report/processor/ApdexSummaryConsumer.java     |  2 +-
 .../report/processor/CsvFileSampleSource.java      | 10 +--
 .../report/processor/ExternalSampleSorter.java     |  4 +-
 .../jmeter/report/processor/ListResultData.java    |  2 +-
 .../jmeter/report/processor/MapResultData.java     |  2 +-
 .../jmeter/report/processor/MeanAggregator.java    |  2 +-
 .../jmeter/report/processor/SampleContext.java     |  2 +-
 .../processor/StatisticsSummaryConsumer.java       | 14 ++--
 .../jmeter/report/processor/TaggerConsumer.java    |  2 +-
 .../report/processor/Top5ErrorsSummaryData.java    |  2 +-
 .../processor/graph/AbstractGraphConsumer.java     |  8 +--
 .../graph/AbstractGraphValueSelector.java          |  2 +-
 .../graph/AbstractVersusRequestsGraphConsumer.java |  6 +-
 .../graph/impl/BytesThroughputGraphConsumer.java   | 12 ----
 .../graph/impl/CodesPerSecondGraphConsumer.java    | 12 ----
 .../graph/impl/HitsPerSecondGraphConsumer.java     | 25 -------
 .../impl/ResponseTimePerSampleGraphConsumer.java   |  2 +-
 ...sponseTimePercentilesOverTimeGraphConsumer.java | 12 ++--
 .../graph/impl/TotalTPSGraphConsumer.java          | 12 ----
 .../org/apache/jmeter/reporters/ResultSaver.java   | 18 +----
 .../org/apache/jmeter/reporters/Summariser.java    |  2 +-
 .../jmeter/reporters/gui/ResultSaverGui.java       |  8 +--
 .../apache/jmeter/reporters/gui/SummariserGui.java |  5 --
 .../jmeter/rmi/SSLRMIClientSocketFactory.java      |  2 +-
 .../jmeter/rmi/SSLRMIServerSocketFactory.java      |  2 +-
 .../jmeter/samplers/DataStrippingSampleSender.java |  4 +-
 .../java/org/apache/jmeter/samplers/Entry.java     |  6 +-
 .../jmeter/samplers/SampleSaveConfiguration.java   |  4 +-
 .../jmeter/samplers/StatisticalSampleSender.java   |  2 +-
 .../org/apache/jmeter/save/CSVSaveService.java     |  2 -
 .../apache/jmeter/save/SaveGraphicsService.java    |  2 +-
 .../apache/jmeter/save/ScriptWrapperConverter.java |  2 +-
 .../SampleSaveConfigurationConverter.java          |  2 +-
 .../org/apache/jmeter/services/FileServer.java     |  6 +-
 .../testbeans/gui/BooleanPropertyEditor.java       |  2 +-
 .../apache/jmeter/testbeans/gui/FileEditor.java    |  2 +-
 .../testbeans/gui/GenericTestBeanCustomizer.java   |  4 +-
 .../jmeter/testbeans/gui/PasswordEditor.java       |  2 +-
 .../apache/jmeter/testbeans/gui/TableEditor.java   |  8 +--
 .../apache/jmeter/testbeans/gui/TestBeanGUI.java   |  2 +-
 .../apache/jmeter/testbeans/gui/WrapperEditor.java | 10 +--
 .../testelement/AbstractScopedTestElement.java     |  4 +-
 .../jmeter/testelement/AbstractTestElement.java    |  2 +-
 .../org/apache/jmeter/threads/JMeterContext.java   |  2 +-
 .../org/apache/jmeter/threads/JMeterThread.java    | 16 ++---
 .../org/apache/jmeter/threads/SamplePackage.java   |  4 +-
 .../org/apache/jmeter/threads/TestCompiler.java    |  6 +-
 .../org/apache/jmeter/threads/ThreadGroup.java     |  8 +--
 .../threads/UnmodifiableJMeterVariables.java       |  2 +-
 .../jmeter/threads/gui/AbstractThreadGroupGui.java |  4 +-
 .../apache/jmeter/util/BSFJavaScriptEngine.java    |  2 +-
 .../jmeter/util/HttpSSLProtocolSocketFactory.java  |  6 +-
 .../PropertiesBasedPrefixResolverForXpath2.java    |  2 +-
 .../java/org/apache/jmeter/util/TemplateUtil.java  |  2 +-
 .../jmeter/util/keystore/JmeterKeyStore.java       | 14 ++--
 .../jmeter/visualizers/SamplingStatCalculator.java |  2 +-
 .../jmeter/examples/sampler/ExampleSampler.java    |  2 +-
 .../org/apache/jmeter/functions/ChangeCase.java    |  2 -
 .../jmeter/functions/DigestEncodeFunction.java     |  2 +-
 .../apache/jmeter/functions/IterationCounter.java  |  4 +-
 .../org/apache/jmeter/functions/JavaScript.java    |  4 +-
 .../org/apache/jmeter/functions/LogFunction.java   |  2 -
 .../org/apache/jmeter/functions/RandomDate.java    |  8 +--
 .../jmeter/functions/RandomFromMultipleVars.java   |  2 +-
 .../org/apache/jmeter/functions/RegexFunction.java | 14 ++--
 .../org/apache/jmeter/functions/TimeShift.java     | 10 +--
 .../apache/jmeter/visualizers/GenerateTreeGui.java | 15 ++--
 .../apache/commons/cli/avalon/CLArgsParser.java    |  8 +--
 .../org/apache/jorphan/exec/SystemCommand.java     |  2 +-
 .../org/apache/jorphan/gui/JLabeledTextField.java  |  4 +-
 .../org/apache/jorphan/gui/JMeterUIDefaults.java   |  8 +--
 .../java/org/apache/jorphan/gui/MenuScroller.java  | 17 +----
 .../org/apache/jorphan/gui/ObjectTableSorter.java  |  8 +--
 .../apache/jorphan/gui/layout/VerticalLayout.java  |  6 +-
 .../org/apache/jorphan/reflect/ClassFinder.java    |  4 +-
 .../java/org/apache/jorphan/reflect/Functor.java   |  8 +--
 .../jorphan/util/AlphaNumericComparator.java       |  6 +-
 .../jorphan/util/AlphaNumericKeyComparator.java    |  2 +-
 .../src/main/java/org/apache/log/ContextMap.java   |  2 +-
 .../jmeter/protocol/bolt/sampler/BoltSampler.java  |  2 +-
 .../sampler/BoltTestElementBeanInfoSupport.java    |  2 +-
 .../jmeter/protocol/ftp/sampler/FTPSampler.java    |  2 +-
 .../http/config/gui/GraphQLUrlConfigGui.java       |  2 +-
 .../protocol/http/config/gui/HttpDefaultsGui.java  |  6 +-
 .../protocol/http/config/gui/UrlConfigGui.java     |  4 +-
 .../jmeter/protocol/http/control/AuthManager.java  |  8 +--
 .../jmeter/protocol/http/control/CacheManager.java | 24 +++----
 .../protocol/http/control/CookieManager.java       |  4 +-
 .../protocol/http/control/DNSCacheManager.java     |  4 +-
 .../http/control/DynamicKerberosSchemeFactory.java |  2 +-
 .../http/control/DynamicSPNegoSchemeFactory.java   |  2 +-
 .../protocol/http/control/HC4CookieHandler.java    |  4 +-
 .../protocol/http/control/HttpMirrorServer.java    |  4 +-
 .../http/control/gui/HttpTestSampleGui.java        |  6 +-
 .../jmeter/protocol/http/curl/BasicCurlParser.java | 24 +++----
 .../protocol/http/curl/FileArgumentHolder.java     |  4 +-
 .../protocol/http/curl/StringArgumentHolder.java   |  4 +-
 .../apache/jmeter/protocol/http/gui/AuthPanel.java |  4 +-
 .../jmeter/protocol/http/gui/CookiePanel.java      |  2 +-
 .../jmeter/protocol/http/gui/DNSCachePanel.java    |  8 +--
 .../protocol/http/gui/HTTPFileArgsPanel.java       |  6 +-
 .../jmeter/protocol/http/gui/HeaderPanel.java      |  2 +-
 .../http/gui/action/ParseCurlCommandAction.java    | 26 +++----
 .../protocol/http/modifier/AnchorModifier.java     | 10 +--
 .../http/modifier/URLRewritingModifier.java        | 12 ++--
 .../http/modifier/gui/RegExUserParametersGui.java  |  6 +-
 .../jmeter/protocol/http/parser/CssParser.java     |  2 +-
 .../jmeter/protocol/http/parser/HTMLParser.java    |  2 +-
 .../protocol/http/parser/JTidyHTMLParser.java      |  4 +-
 .../protocol/http/parser/JsoupBasedHtmlParser.java |  4 +-
 .../http/parser/LagartoBasedHtmlParser.java        | 10 ++-
 .../protocol/http/parser/RegexpHTMLParser.java     | 10 +--
 .../http/proxy/AbstractSamplerCreator.java         |  2 +-
 .../protocol/http/proxy/DefaultSamplerCreator.java |  8 +--
 .../jmeter/protocol/http/proxy/HttpRequestHdr.java | 12 ++--
 .../apache/jmeter/protocol/http/proxy/Proxy.java   | 10 +--
 .../jmeter/protocol/http/proxy/ProxyControl.java   | 62 ++++++++--------
 .../protocol/http/proxy/gui/ProxyControlGui.java   |  6 +-
 .../jmeter/protocol/http/sampler/AjpSampler.java   |  4 +-
 .../protocol/http/sampler/HTTPAbstractImpl.java    |  5 +-
 .../jmeter/protocol/http/sampler/HTTPHC4Impl.java  | 46 ++++++------
 .../jmeter/protocol/http/sampler/HTTPJavaImpl.java | 16 ++---
 .../protocol/http/sampler/HTTPSamplerBase.java     | 16 ++---
 .../jmeter/protocol/http/sampler/PostWriter.java   |  8 +--
 .../http/sampler/hc/LaxDeflateInputStream.java     |  2 +-
 .../http/sampler/hc/LaxGZIPInputStream.java        |  2 +-
 .../jmeter/protocol/http/util/EncoderCache.java    |  2 +-
 .../jmeter/protocol/http/util/HTTPFileArg.java     |  4 +-
 .../protocol/http/util/HTTPResultConverter.java    |  2 +-
 .../protocol/http/util/LoopbackHTTPSocket.java     |  2 +-
 .../protocol/http/util/accesslog/LogFilter.java    |  4 +-
 .../http/util/accesslog/SessionFilter.java         |  6 +-
 .../protocol/http/visualizers/RequestViewHTTP.java |  6 +-
 .../protocol/java/sampler/JSR223Sampler.java       |  1 +
 .../protocol/java/sampler/JavaSamplerContext.java  |  4 +-
 .../apache/jmeter/protocol/java/test/JavaTest.java |  2 +-
 .../jmeter/protocol/java/test/SleepTest.java       |  2 +-
 .../protocol/jdbc/AbstractJDBCTestElement.java     |  6 +-
 .../jdbc/config/DataSourceElementBeanInfo.java     |  4 +-
 .../protocol/jms/client/ReceiveSubscriber.java     |  4 +-
 .../jms/control/gui/JMSPropertiesPanel.java        |  2 +-
 .../protocol/jms/control/gui/JMSSamplerGui.java    | 24 +++----
 .../jmeter/protocol/jms/sampler/JMSSampler.java    |  4 +-
 .../protocol/jms/sampler/SubscriberSampler.java    |  2 +-
 .../jms/sampler/TemporaryQueueExecutor.java        |  2 +-
 .../jms/sampler/TimeoutEnabledQueueRequestor.java  |  6 +-
 .../jms/sampler/render/BinaryMessageRenderer.java  |  2 +-
 .../jms/sampler/render/MapMessageRenderer.java     |  2 +-
 .../java/control/gui/JUnitTestSamplerGui.java      | 26 +++----
 .../jmeter/protocol/java/sampler/JUnitSampler.java |  4 +-
 .../ldap/config/gui/LDAPArgumentsPanel.java        |  4 +-
 .../protocol/ldap/config/gui/LdapConfigGui.java    | 34 ++++-----
 .../protocol/ldap/config/gui/LdapExtConfigGui.java | 74 +++++++++----------
 .../protocol/ldap/sampler/LDAPExtSampler.java      | 14 ++--
 .../jmeter/protocol/ldap/sampler/LDAPSampler.java  |  6 +-
 .../protocol/mail/sampler/MailReaderSampler.java   |  6 +-
 .../mail/sampler/gui/MailReaderSamplerGui.java     |  8 +--
 .../jmeter/protocol/smtp/sampler/SmtpSampler.java  | 18 ++---
 .../smtp/sampler/gui/SecuritySettingsPanel.java    |  1 +
 .../protocol/smtp/sampler/gui/SmtpPanel.java       |  4 +-
 .../jmeter/protocol/tcp/sampler/TCPClientImpl.java |  2 +-
 .../jmeter/protocol/tcp/sampler/TCPSampler.java    | 10 +--
 .../apache/jmeter/wiremock/WireMockExtension.java  |  4 +-
 314 files changed, 938 insertions(+), 1029 deletions(-)