Skip to content

Commit ae40c68

Browse files
KroArtembaev
KroArtem
authored and
baev
committed
update pmd and replace deprecations (via allure-framework#372)
1 parent c0f95ef commit ae40c68

8 files changed

Lines changed: 25 additions & 17 deletions

File tree

‎allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* @param <T> the type of attachment data
2020
* @author charlie (Dmitry Baev).
2121
*/
22+
@SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")
2223
public interface AttachmentRenderer<T extends AttachmentData> {
2324

2425
AttachmentContent render(T attachmentData) throws AttachmentRenderException;

‎allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import cucumber.api.Result;
2121
import cucumber.api.TestCase;
2222
import cucumber.api.TestStep;
23+
import cucumber.api.event.EmbedEvent;
2324
import cucumber.api.event.EventHandler;
2425
import cucumber.api.event.EventPublisher;
2526
import cucumber.api.event.TestCaseFinished;
@@ -28,7 +29,6 @@
2829
import cucumber.api.event.TestStepFinished;
2930
import cucumber.api.event.TestStepStarted;
3031
import cucumber.api.event.WriteEvent;
31-
import cucumber.api.event.EmbedEvent;
3232
import cucumber.api.formatter.Formatter;
3333
import cucumber.runner.UnskipableStep;
3434
import gherkin.ast.Examples;
@@ -52,13 +52,14 @@
5252
import java.io.ByteArrayInputStream;
5353
import java.nio.charset.Charset;
5454
import java.nio.charset.StandardCharsets;
55-
import java.util.Objects;
5655
import java.util.ArrayList;
56+
import java.util.Collections;
5757
import java.util.Deque;
5858
import java.util.HashMap;
5959
import java.util.LinkedList;
6060
import java.util.List;
6161
import java.util.Map;
62+
import java.util.Objects;
6263
import java.util.Optional;
6364
import java.util.UUID;
6465
import java.util.stream.Collectors;
@@ -168,7 +169,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
168169
final TestResultContainer resultContainer = new TestResultContainer()
169170
.setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
170171
.setUuid(getTestContainerUuid())
171-
.setChildren(getTestCaseUuid(currentTestCase));
172+
.setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
172173

173174
lifecycle.scheduleTestCase(result);
174175
lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);

‎allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import cucumber.api.PickleStepTestStep;
2222
import cucumber.api.Result;
2323
import cucumber.api.TestCase;
24+
import cucumber.api.event.EmbedEvent;
2425
import cucumber.api.event.EventHandler;
2526
import cucumber.api.event.EventPublisher;
2627
import cucumber.api.event.TestCaseFinished;
@@ -29,7 +30,6 @@
2930
import cucumber.api.event.TestStepFinished;
3031
import cucumber.api.event.TestStepStarted;
3132
import cucumber.api.event.WriteEvent;
32-
import cucumber.api.event.EmbedEvent;
3333
import cucumber.api.formatter.Formatter;
3434
import gherkin.ast.Examples;
3535
import gherkin.ast.Feature;
@@ -53,13 +53,13 @@
5353
import java.io.ByteArrayInputStream;
5454
import java.nio.charset.Charset;
5555
import java.nio.charset.StandardCharsets;
56-
import java.util.Objects;
5756
import java.util.Collections;
5857
import java.util.Deque;
5958
import java.util.HashMap;
6059
import java.util.LinkedList;
6160
import java.util.List;
6261
import java.util.Map;
62+
import java.util.Objects;
6363
import java.util.Optional;
6464
import java.util.UUID;
6565
import java.util.stream.Collectors;
@@ -170,7 +170,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
170170
final TestResultContainer resultContainer = new TestResultContainer()
171171
.setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
172172
.setUuid(getTestContainerUuid())
173-
.setChildren(getTestCaseUuid(currentTestCase));
173+
.setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
174174

175175
lifecycle.scheduleTestCase(result);
176176
lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);

‎allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import cucumber.api.Result;
2323
import cucumber.api.TestCase;
2424
import cucumber.api.event.ConcurrentEventListener;
25+
import cucumber.api.event.EmbedEvent;
2526
import cucumber.api.event.EventHandler;
2627
import cucumber.api.event.EventPublisher;
2728
import cucumber.api.event.TestCaseFinished;
@@ -30,7 +31,6 @@
3031
import cucumber.api.event.TestStepFinished;
3132
import cucumber.api.event.TestStepStarted;
3233
import cucumber.api.event.WriteEvent;
33-
import cucumber.api.event.EmbedEvent;
3434
import cucumber.runtime.formatter.TestSourcesModelProxy;
3535
import gherkin.ast.Examples;
3636
import gherkin.ast.Feature;
@@ -58,9 +58,9 @@
5858
import java.util.Deque;
5959
import java.util.LinkedList;
6060
import java.util.List;
61+
import java.util.Objects;
6162
import java.util.Optional;
6263
import java.util.UUID;
63-
import java.util.Objects;
6464
import java.util.concurrent.ConcurrentHashMap;
6565
import java.util.stream.Collectors;
6666
import java.util.stream.IntStream;
@@ -169,7 +169,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
169169
final TestResultContainer resultContainer = new TestResultContainer()
170170
.setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
171171
.setUuid(getTestContainerUuid())
172-
.setChildren(getTestCaseUuid(currentTestCase.get()));
172+
.setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
173173

174174
lifecycle.scheduleTestCase(result);
175175
lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);

‎allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ private static Map<String, String> toMapConverter(final MultivaluedMap<String, O
105105
}
106106

107107
private String getBody(final ClientResponseContext responseContext) throws IOException {
108-
final InputStream stream = responseContext.getEntityStream();
109-
try (ByteArrayOutputStream result = new ByteArrayOutputStream()) {
108+
try (InputStream stream = responseContext.getEntityStream();
109+
ByteArrayOutputStream result = new ByteArrayOutputStream()) {
110110
final byte[] buffer = new byte[1024];
111111

112112
int length = stream.read(buffer);

‎allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import java.security.MessageDigest;
5858
import java.util.ArrayList;
5959
import java.util.Arrays;
60+
import java.util.Collections;
6061
import java.util.HashMap;
6162
import java.util.List;
6263
import java.util.Map;
@@ -445,7 +446,7 @@ private String createFakeContainer(final ITestNGMethod method, final Current cur
445446
.setName(getQualifiedName(method))
446447
.setStart(System.currentTimeMillis())
447448
.setDescription(method.getDescription())
448-
.setChildren(current.getUuid());
449+
.setChildren(Collections.singletonList(current.getUuid()));
449450
getLifecycle().startTestContainer(container);
450451
return parentUuid;
451452
}
@@ -478,11 +479,11 @@ public void afterInvocation(final IInvokedMethod method, final ITestResult testR
478479
final String executableUuid = currentExecutable.get();
479480
currentExecutable.remove();
480481
if (testResult.isSuccess()) {
481-
getLifecycle().updateFixture(executableUuid, result -> result.withStatus(Status.PASSED));
482+
getLifecycle().updateFixture(executableUuid, result -> result.setStatus(Status.PASSED));
482483
} else {
483484
getLifecycle().updateFixture(executableUuid, result -> result
484-
.withStatus(getStatus(testResult.getThrowable()))
485-
.withStatusDetails(getStatusDetails(testResult.getThrowable()).orElse(null)));
485+
.setStatus(getStatus(testResult.getThrowable()))
486+
.setStatusDetails(getStatusDetails(testResult.getThrowable()).orElse(null)));
486487
}
487488
getLifecycle().stopFixture(executableUuid);
488489

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ configure(subprojects) {
143143

144144
configure<QualityExtension> {
145145
configDir = qualityConfigsDir
146-
checkstyleVersion = "8.17"
147-
pmdVersion = "6.11.0"
146+
checkstyleVersion = "8.22"
147+
pmdVersion = "6.16.0"
148148
spotbugsVersion = "3.1.11"
149149
codenarcVersion = "1.3"
150150
enabled = !project.hasProperty("disableQuality")

‎gradle/quality-configs/pmd/pmd.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@
129129
<property name="skipAnnotations" value="true"/>
130130
</properties>
131131
</rule>
132+
<rule ref="category/java/errorprone.xml/CloseResource">
133+
<properties>
134+
<property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet" />
135+
</properties>
136+
</rule>
132137

133138

134139
<!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_multithreading.html) -->

0 commit comments

Comments
 (0)