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 f55fd3a61398ee12ca5fd63aed2e5bab84321945 Author: Mend Renovate <[email protected]> AuthorDate: Thu Jun 29 05:14:49 2023 +0000 fix(deps): update com.google.errorprone to v2.20.0 Fixes https://github.com/apache/jmeter/pull/6020 --- .../main/kotlin/build-logic.errorprone.gradle.kts | 2 +- checksum.xml | 3 +++ .../46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc | 16 ++++++++++++++++ .../46/ee92349ad86de446.fingerprints | 1 + .../62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc | 21 +++++++++++++++++++++ .../62/d945e643368fef62.fingerprints | 1 + .../64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc | 21 +++++++++++++++++++++ .../64/9987b20c8f6a3064.fingerprints | 1 + .../69/e68665c8f91bde69.fingerprints | 1 + .../ad/a8d88140c35897ad.fingerprints | 1 + .../c3/80cfa7c482552dc3.fingerprints | 1 + src/bom-thirdparty/build.gradle.kts | 2 +- .../graphite/PickleGraphiteMetricsSender.java | 7 +------ .../backend/graphite/TextGraphiteMetricsSender.java | 7 +------ .../apache/jmeter/engine/ClientJMeterEngine.java | 3 ++- .../apache/jmeter/engine/RemoteJMeterEngine.java | 1 + .../jmeter/engine/RemoteJMeterEngineImpl.java | 1 + .../apache/jmeter/engine/util/FunctionParser.java | 2 ++ .../processor/graph/AbstractGraphConsumer.java | 1 + .../jmeter/report/processor/graph/GroupData.java | 1 + .../org/apache/jmeter/threads/TestCompiler.java | 1 + .../java/org/apache/jmeter/util/JMeterUtils.java | 1 + .../protocol/http/parser/HtmlParsingUtils.java | 2 +- .../protocol/http/visualizers/RequestViewHTTP.java | 2 +- 24 files changed, 83 insertions(+), 17 deletions(-) diff --git a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts index f7f0061fb1..be71ef36e8 100644 --- a/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts +++ b/build-logic/verification/src/main/kotlin/build-logic.errorprone.gradle.kts @@ -29,7 +29,7 @@ if (buildParameters.enableErrorprone) { apply(plugin = "net.ltgt.errorprone") dependencies { - "errorprone"("com.google.errorprone:error_prone_core:2.19.1") + "errorprone"("com.google.errorprone:error_prone_core:2.20.0") "annotationProcessor"("com.google.guava:guava-beta-checker:1.0") } diff --git a/checksum.xml b/checksum.xml index 98e95987c1..8ac0c33425 100644 --- a/checksum.xml +++ b/checksum.xml @@ -37,6 +37,7 @@ <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' /> <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' /> <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' /> + <trusted-key id='187366a3ffe6bf8f94b9136a9987b20c8f6a3064' group='com.google.errorprone' /> <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' /> <trusted-key id='e77417ac194160a3fabd04969a259c7ee636c5ed' group='com.google.errorprone' /> <trusted-key id='ee0ca873074092f806f59b65d364abaa39a47320' group='com.google.errorprone' /> @@ -47,6 +48,7 @@ <trusted-key id='d5f46bc0b86af5dc56df58f05e975cb00c643dbf' group='com.google.inject' /> <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' /> <trusted-key id='eb1b3de71713c9ec2e87cc26ee92349ad86de446' group='com.google.j2objc' /> + <trusted-key id='187366a3ffe6bf8f94b9136a9987b20c8f6a3064' group='com.google.protobuf' /> <trusted-key id='d75e25b78ebb19e47c0a99bca7764f502a938c99' group='com.google.protobuf' /> <trusted-key id='f1a51e051f527e0c8e24d54d4b1e11d5a4b91e89' group='com.google.protobuf' /> <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' /> @@ -85,6 +87,7 @@ <trusted-key id='aa417737bd805456db3cbdde6601e5c08dccbb96' group='info.picocli' /> <trusted-key id='c62c0ce2e5c346b2d9bf2d8bb2ca0dfe9ed21c6e' group='io.burt' /> <trusted-key id='1ab9bdf40ed49debb5caaded5b30d3b10694f057' group='io.codearte.gradle.nexus' /> + <trusted-key id='7186bbf993566d8c2f4f7ed7d945e643368fef62' group='io.github.eisop' /> <trusted-key id='d477d51812e692011db11e66a6ea2e2bf22e0543' group='io.github.java-diff-utils' /> <trusted-key id='e52567d2589415bd74eb4c2867631bc0568801c3' group='io.github.microutils' /> <trusted-key id='050a37a2e0577f4baa095b52602ec18d20c4661c' group='io.github.x-stream' /> diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc new file mode 100644 index 0000000000..f97a22c518 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/eb1b3de71713c9ec2e87cc26ee92349ad86de446.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo +P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2 +SC9GkBMgagbCScP1xE45q5FO+z4kwmcERIKOQ687VAk64QM6hJCupfAd6SqS/X0Q +SGttTNtmj7YBpfnU5iFX05Hj8Zkk7CX439xltO8uJNyBlDVbuUZc3/kRowKPVuuo +TK2mzllVPzE/YT6NUY04wQPmRJx0uWZQUyDBZeckdurpSImdd7sik6Wf6zVGvxvg +MC4oMufZ3EM8R4dssRSIUfnBaQ2o1LS+GVxjABEBAAG5AQ0EY73VqQEIANJPIYj9 +IsxKKOWLOkWvxAg9o9krIkohBMaOGRsx4RxQyArOCUoaG/qsG3aVOi8wML8hQK6q +oXADJ6FBGxQ67G8pperzRSj1O3BJILB6Fd1X8w40S6hSvUAZs+DM1FMuD4mf6ydu +yZUVIghGRExNeSb/vfn4KVPqdSAD7uWeQiIUYveaXrwot8+U8tRNgv+LQpCjhm5h +vWyIuxxpI+k5N07V9y0yRGWiBbgqdmfHVwdEbUSM0sMYUJUZKW+iwf5tZig9LZu3 +HAf/vyXjBWG6zkkjwO8onKFLuhL4jkygHGSawJHwYRgtlknUZ0DMVc451bbhuFHE +0dcgQCdAYJsI66MAEQEAAQ== +=EMGn +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints new file mode 100644 index 0000000000..9b688ce838 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/46/ee92349ad86de446.fingerprints @@ -0,0 +1 @@ +eb1b3de71713c9ec2e87cc26ee92349ad86de446 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc new file mode 100644 index 0000000000..e06fcadb8d --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/7186bbf993566d8c2f4f7ed7d945e643368fef62.asc @@ -0,0 +1,21 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGNBFzJyTIBDADO8siKg1NQb8jNPo2DPC5CpPwYDPUjlX7Nq/FMBYeY51JlxKLD +jmH/R5u6LuY0v7gSodrJqE0FUjz8LgN9+Yp1f1szqxeYHLsAVahO4cafG/sITYvr +vscz83dU6wpXxhFgTryUclqj0Nf6xZ9kxGAbMgP4JUZGkME/q3e6gOnwfLvbM4/t +M8XcjLLJNKdBHQGAcuQJxTp0db4ets+VgleqQKOPP2g+oeF92uiAZ5Wz3AEMRvnH +9TjGwXxiHv4gganqbaBq4cPH+bqoi1xxqSnj6qctbZxkfsICW03MF7Ydf16vbzzH +48KxYkBN83M2jOIptrZVsP3vLJzelsZTI/rkmgyfigEsog+JD/1Za3+L7x8hWhY5 +arQ+QmSLJ7wyqccFexZO8gdtXkmfNQsIf/kFe1vifdRRYhuG0jrxXixa/zcj7VxZ +waFrCbh5SqNMqhUoTwvB9WrH3BPOQGmURynvXAeklE1kR18rxiAO6Bp3QV7BGXEX +ReYo+ITho5aGDhEAEQEAAbkBjQRcyckyAQwAwNKgqINPHy7O4nHdaaJxa6qNPBvD +fxHsWR4mDcWlWWVBA2pQyQnvLDuNQ+QXK/+MHeYhZtuiV+SzS51ohkk+X4hSbFFk +ngrgnY3gNJbeSNoaXIr4UgCNpBXGcUoS1pBo/XVMcgTSsmco+bH6D6152XdUEJEU +SlXc+hcEI3H2SZT+c+nlwSv6PMdIlDjbCY8JZ+FPJxbA+QqYMJIrOA8RoTD1FWb9 +2nUxnxdEKgr3LVvfxFUAjRfXmpXHOxysZD4phzGgiqyg/fvBXdAv1fJx+zAhQSK+ +ac6TNSN62pAfwOXP+PiYWC8/T3wDZDi6YiTDLml2K2iA/2vrKuAbtIAQR409s5VF +q9M41VbDdR/cjocNq199btp1nb9rbis6n27FGgCE7gj5IO2T3lmFnhwYIZNNhqfR +Tz5hSvDLidvEDGv3RnYCP3NibZX1lqljlDTk7Y0EQ0DFyahDuWREdVGJ3mnO6k6b +GMfZ4pgRyWkr4CLbD97W69aHbteZVOOS5HJRABEBAAE= +=D0Xc +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints new file mode 100644 index 0000000000..ecc6985d26 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/62/d945e643368fef62.fingerprints @@ -0,0 +1 @@ +7186bbf993566d8c2f4f7ed7d945e643368fef62 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc new file mode 100644 index 0000000000..1ceea50325 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/187366a3ffe6bf8f94b9136a9987b20c8f6a3064.asc @@ -0,0 +1,21 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGNBGJGMxoBDADF9xkWwxwN72wRh0al9ARzTTIHpcVBIjDij1Xr768zMMRdKOsQ +aEHRTBKArAfGl6Xt6CfYnu3wMgEDUfh50s9NPOKvhpKtqdIlUxZLEJ807ebW3MD+ +BnwoRUe0OsTItUQA+vLH8K2Uywd9f3OV9KQnqItUFMptaFhUC144hZhj3c0xhITS +k45zucoXLKO9yqA+tlqav7taAJMrWbhRcRWXizK1wOZLyhu8NdIMUSL4Ei0blR90 +uA9i62XlOhpyvfpaC7oRh+jXHOCFK9sXe2vnvnTtJ1yqdXH4EOCYLjoheQN1R0u4 +6f6XoAy9c3tOSOZM9vwE56iOZJwv0bca6ZENnhHnYwWhbQwrY0JMIon0sUpx9RB2 +w4E7AeU8/maQG9hdB7s7vrAJFarlFQvc7kJ5FMTKFmWPalUTcT6yXntIQ3+xiH9l +Oq0jGlAmQWYUvzHJ0SFjz1xJGBDM3GH9KfHbeoS3Xz5Emmw8YwEDUe9gt9po8bmw +8qnA85uMZY2puh0AEQEAAbkBjQRiRjMaAQwAtcqYEeHIX/zszjNyKDyLONoZphIy +efYlWpbrbAFgwgJVEWiIWGo1Du0f5P6g3p29QD9wSJrZ2pz8TUwUIhwpCxA50ceT +PzEXi523znqWlXmOwdBuV6XjD7Bi0ZELg+QrumZfSDlAGb7fU6O39To1mDqg3SI1 +jybBk6OOlPYfdfII72z+1smEaUikOpXeJbnXwqkAaB8jQBgGikciACVruP8jMRwE +Op1JcMj1hTOMjsbNYYx6s3NY8OPJvg9RqWfWAC1V6fsEBESlYVnw3IU5sMJzw949 +h60btqFFjgg6GDjD9Xk6RJQjIZti9XQVsIOAswQ2tUHYj7KmjX/5h6U+xmZtFRYS +kPXMAjj7q31t3+Lj7Vhcm4FZGidY0AwwZAQLP6tiR2rcEtJ2E1xXqmAM9nT15eyW +wfOVh/VVuU/DDaOlbBQyqwlTuKYxCj4UyWGVVqgSwByFzYpaKkWw91RX008eT94j +9sj+m3Vqe5Q8VT3lRwju+TBaQz0V6Z/kKgJjABEBAAE= +=eVjF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints new file mode 100644 index 0000000000..883e787903 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/64/9987b20c8f6a3064.fingerprints @@ -0,0 +1 @@ +187366a3ffe6bf8f94b9136a9987b20c8f6a3064 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints new file mode 100644 index 0000000000..9b688ce838 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/69/e68665c8f91bde69.fingerprints @@ -0,0 +1 @@ +eb1b3de71713c9ec2e87cc26ee92349ad86de446 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints new file mode 100644 index 0000000000..ecc6985d26 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/a8d88140c35897ad.fingerprints @@ -0,0 +1 @@ +7186bbf993566d8c2f4f7ed7d945e643368fef62 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints new file mode 100644 index 0000000000..883e787903 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c3/80cfa7c482552dc3.fingerprints @@ -0,0 +1 @@ +187366a3ffe6bf8f94b9136a9987b20c8f6a3064 diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index c5b6a7a576..98867e132e 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { api("com.github.weisj:darklaf-theme:2.7.3") api("com.google.auto.service:auto-service-annotations:1.1.1") api("com.google.auto.service:auto-service:1.1.1") - api("com.google.errorprone:error_prone_annotations:2.19.1") + api("com.google.errorprone:error_prone_annotations:2.20.0") api("com.helger.commons:ph-commons:10.2.5") api("com.helger:ph-css:6.5.0") api("com.jayway.jsonpath:json-path:2.8.0") diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java index b0e450452f..0f6ae38d5e 100644 --- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java +++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSender.java @@ -95,12 +95,7 @@ class PickleGraphiteMetricsSender extends AbstractGraphiteMetricsSender { */ @Override public void addMetric(long timestamp, String contextName, String metricName, String metricValue) { - String name = new StringBuilder(50) - .append(prefix) - .append(contextName) - .append(".") - .append(metricName) - .toString(); + String name = prefix + contextName + "." + metricName; synchronized (lock) { metrics.add(new MetricTuple(name, timestamp, metricValue)); } 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 e72a2531bf..e24bb68693 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 @@ -75,12 +75,7 @@ class TextGraphiteMetricsSender extends AbstractGraphiteMetricsSender { */ @Override public void addMetric(long timestamp, String contextName, String metricName, String metricValue) { - String name = new StringBuilder(50) - .append(prefix) - .append(contextName) - .append(".") - .append(metricName) - .toString(); + String name = prefix + contextName + "." + metricName; synchronized (lock) { metrics.add(new MetricTuple(name, timestamp, metricValue)); } diff --git a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java index 44a8d51294..030be3b94e 100644 --- a/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java +++ b/src/core/src/main/java/org/apache/jmeter/engine/ClientJMeterEngine.java @@ -177,7 +177,8 @@ public class ClientJMeterEngine implements JMeterEngine { } } - private static final HashMap<String, String> toHashMapOfString(Properties properties) { + @SuppressWarnings("NonApiType") + private static HashMap<String, String> toHashMapOfString(Properties properties) { return new HashMap<>( properties.entrySet().stream().collect(Collectors.toMap( e -> e.getKey().toString(), diff --git a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java index 5bb052a097..05b7d8a12b 100644 --- a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java +++ b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngine.java @@ -36,6 +36,7 @@ public interface RemoteJMeterEngine extends Remote { void rreset() throws RemoteException; + @SuppressWarnings("NonApiType") void rsetProperties(HashMap<String,String> p) throws RemoteException; void rexit() throws RemoteException; diff --git a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java index 087130cafe..89feca7539 100644 --- a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java +++ b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java @@ -220,6 +220,7 @@ public final class RemoteJMeterEngineImpl extends java.rmi.server.UnicastRemoteO } @Override + @SuppressWarnings("NonApiType") public void rsetProperties(HashMap<String, String> map) throws RemoteException { // NOSONAR checkOwner("setProperties"); if(remotelySetProperties != null) { diff --git a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java index eeea474a5e..d4a00763d6 100644 --- a/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java +++ b/src/core/src/main/java/org/apache/jmeter/engine/util/FunctionParser.java @@ -49,6 +49,7 @@ class FunctionParser { * @return list of Strings or Objects representing functions * @throws InvalidVariableException when evaluation of variables fail */ + @SuppressWarnings("NonApiType") ArrayList<Object> compileString(String value) throws InvalidVariableException { StringReader reader = new StringReader(value); ArrayList<Object> result = new ArrayList<>(); @@ -186,6 +187,7 @@ class FunctionParser { * @return a list of CompoundVariable elements * @throws InvalidVariableException when evaluation of variables fail */ + @SuppressWarnings("NonApiType") ArrayList<CompoundVariable> parseParams(StringReader reader) throws InvalidVariableException { ArrayList<CompoundVariable> result = new ArrayList<>(); StringBuilder buffer = new StringBuilder(); 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 0938510f48..673722df7e 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 @@ -105,6 +105,7 @@ public abstract class AbstractGraphConsumer extends AbstractSampleConsumer { * * @return the group information */ + @SuppressWarnings("NonApiType") protected final HashMap<String, GroupInfo> getGroupInfos() { return groupInfos; } diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java index 2028af4c9d..b27a423a00 100644 --- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java +++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/GroupData.java @@ -33,6 +33,7 @@ public class GroupData { * * @return the series data map */ + @SuppressWarnings("NonApiType") public final HashMap<String, SeriesData> getSeriesInfo() { return seriesData; } diff --git a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java index b2c1d7330b..f212dda90a 100644 --- a/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java +++ b/src/core/src/main/java/org/apache/jmeter/threads/TestCompiler.java @@ -171,6 +171,7 @@ public class TestCompiler implements HashTreeTraverser { } } + @SuppressWarnings("NonApiType") private static void trackIterationListeners(LinkedList<TestElement> pStack) { TestElement child = pStack.getLast(); if (child instanceof LoopIterationListener) { diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java index 380b68a480..32f8f2be71 100644 --- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java +++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java @@ -1243,6 +1243,7 @@ public class JMeterUtils implements UnitTestManager { * multi-line string headers * @return a map name/value for each header */ + @SuppressWarnings("NonApiType") public static LinkedHashMap<String, String> parseHeaders(String headers) { LinkedHashMap<String, String> linkedHeaders = new LinkedHashMap<>(); String[] list = headers.split("\n"); // $NON-NLS-1$ diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java index bd914405c2..8521315d5f 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java @@ -355,7 +355,7 @@ public final class HtmlParsingUtils { } // N.B. Since the tags are extracted from an HTML Form, any values must already have been encoded - @SuppressWarnings("JdkObsolete") + @SuppressWarnings({"JdkObsolete", "NonApiType"}) private static boolean recurseForm(Node tempNode, LinkedList<HTTPSamplerBase> urlConfigs, URL context, String selectName, boolean inForm) { NamedNodeMap nodeAtts = tempNode.getAttributes(); 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 5eb198062e..b71257e39f 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 @@ -274,7 +274,7 @@ public class RequestViewHTTP implements RequestView { * @param headers the http request headers * @return true if the request is multipart */ - private static boolean isMultipart(LinkedHashMap<String, String> headers) { + private static boolean isMultipart(Map<String, String> headers) { String contentType = headers.get(HTTPConstants.HEADER_CONTENT_TYPE); return contentType != null && contentType.startsWith(HTTPConstants.MULTIPART_FORM_DATA); }
