update pmd and replace deprecations (via #372)

KroArtem · baev · commit ae40c68d9297 · 2019-07-14T15:34:44.000+03:00
diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java
@@ -19,6 +19,7 @@
  * @param <T> the type of attachment data
  * @author charlie (Dmitry Baev).
  */
+@SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")
 public interface AttachmentRenderer<T extends AttachmentData> {
 
     AttachmentContent render(T attachmentData) throws AttachmentRenderException;
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
@@ -20,6 +20,7 @@
 import cucumber.api.Result;
 import cucumber.api.TestCase;
 import cucumber.api.TestStep;
+import cucumber.api.event.EmbedEvent;
 import cucumber.api.event.EventHandler;
 import cucumber.api.event.EventPublisher;
 import cucumber.api.event.TestCaseFinished;
@@ -28,7 +29,6 @@
 import cucumber.api.event.TestStepFinished;
 import cucumber.api.event.TestStepStarted;
 import cucumber.api.event.WriteEvent;
-import cucumber.api.event.EmbedEvent;
 import cucumber.api.formatter.Formatter;
 import cucumber.runner.UnskipableStep;
 import gherkin.ast.Examples;
@@ -52,13 +52,14 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Objects;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -168,7 +169,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(getTestCaseUuid(currentTestCase));
+                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
diff --git a/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java b/allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java
@@ -21,6 +21,7 @@
 import cucumber.api.PickleStepTestStep;
 import cucumber.api.Result;
 import cucumber.api.TestCase;
+import cucumber.api.event.EmbedEvent;
 import cucumber.api.event.EventHandler;
 import cucumber.api.event.EventPublisher;
 import cucumber.api.event.TestCaseFinished;
@@ -29,7 +30,6 @@
 import cucumber.api.event.TestStepFinished;
 import cucumber.api.event.TestStepStarted;
 import cucumber.api.event.WriteEvent;
-import cucumber.api.event.EmbedEvent;
 import cucumber.api.formatter.Formatter;
 import gherkin.ast.Examples;
 import gherkin.ast.Feature;
@@ -53,13 +53,13 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Objects;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -170,7 +170,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(getTestCaseUuid(currentTestCase));
+                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase)));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java
@@ -22,6 +22,7 @@
 import cucumber.api.Result;
 import cucumber.api.TestCase;
 import cucumber.api.event.ConcurrentEventListener;
+import cucumber.api.event.EmbedEvent;
 import cucumber.api.event.EventHandler;
 import cucumber.api.event.EventPublisher;
 import cucumber.api.event.TestCaseFinished;
@@ -30,7 +31,6 @@
 import cucumber.api.event.TestStepFinished;
 import cucumber.api.event.TestStepStarted;
 import cucumber.api.event.WriteEvent;
-import cucumber.api.event.EmbedEvent;
 import cucumber.runtime.formatter.TestSourcesModelProxy;
 import gherkin.ast.Examples;
 import gherkin.ast.Feature;
@@ -58,9 +58,9 @@
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -169,7 +169,7 @@ private void handleTestCaseStarted(final TestCaseStarted event) {
         final TestResultContainer resultContainer = new TestResultContainer()
                 .setName(String.format("%s: %s", scenarioDefinition.getKeyword(), scenarioDefinition.getName()))
                 .setUuid(getTestContainerUuid())
-                .setChildren(getTestCaseUuid(currentTestCase.get()));
+                .setChildren(Collections.singletonList(getTestCaseUuid(currentTestCase.get())));
 
         lifecycle.scheduleTestCase(result);
         lifecycle.startTestContainer(getTestContainerUuid(), resultContainer);
diff --git a/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java b/allure-jax-rs/src/main/java/io/qameta/allure/jaxrs/AllureJaxRs.java
@@ -105,8 +105,8 @@ private static Map<String, String> toMapConverter(final MultivaluedMap<String, O
     }
 
     private String getBody(final ClientResponseContext responseContext) throws IOException {
-        final InputStream stream = responseContext.getEntityStream();
-        try (ByteArrayOutputStream result = new ByteArrayOutputStream()) {
+        try (InputStream stream = responseContext.getEntityStream();
+             ByteArrayOutputStream result = new ByteArrayOutputStream()) {
             final byte[] buffer = new byte[1024];
 
             int length = stream.read(buffer);
diff --git a/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java b/allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
@@ -57,6 +57,7 @@
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -445,7 +446,7 @@ private String createFakeContainer(final ITestNGMethod method, final Current cur
                 .setName(getQualifiedName(method))
                 .setStart(System.currentTimeMillis())
                 .setDescription(method.getDescription())
-                .setChildren(current.getUuid());
+                .setChildren(Collections.singletonList(current.getUuid()));
         getLifecycle().startTestContainer(container);
         return parentUuid;
     }
@@ -478,11 +479,11 @@ public void afterInvocation(final IInvokedMethod method, final ITestResult testR
             final String executableUuid = currentExecutable.get();
             currentExecutable.remove();
             if (testResult.isSuccess()) {
-                getLifecycle().updateFixture(executableUuid, result -> result.withStatus(Status.PASSED));
+                getLifecycle().updateFixture(executableUuid, result -> result.setStatus(Status.PASSED));
             } else {
                 getLifecycle().updateFixture(executableUuid, result -> result
-                        .withStatus(getStatus(testResult.getThrowable()))
-                        .withStatusDetails(getStatusDetails(testResult.getThrowable()).orElse(null)));
+                        .setStatus(getStatus(testResult.getThrowable()))
+                        .setStatusDetails(getStatusDetails(testResult.getThrowable()).orElse(null)));
             }
             getLifecycle().stopFixture(executableUuid);
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -143,8 +143,8 @@ configure(subprojects) {
 
     configure<QualityExtension> {
         configDir = qualityConfigsDir
-        checkstyleVersion = "8.17"
-        pmdVersion = "6.11.0"
+        checkstyleVersion = "8.22"
+        pmdVersion = "6.16.0"
         spotbugsVersion = "3.1.11"
         codenarcVersion = "1.3"
         enabled = !project.hasProperty("disableQuality")
diff --git a/gradle/quality-configs/pmd/pmd.xml b/gradle/quality-configs/pmd/pmd.xml
@@ -129,6 +129,11 @@
             <property name="skipAnnotations" value="true"/>
         </properties>
     </rule>
+    <rule ref="category/java/errorprone.xml/CloseResource">
+        <properties>
+            <property name="types" value="java.sql.Connection,java.sql.Statement,java.sql.ResultSet" />
+        </properties>
+    </rule>
 
 
     <!-- Error prone (https://pmd.github.io/pmd-6.0.1/pmd_rules_java_multithreading.html) -->

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ private static Map<String, String> toMapConverter(final MultivaluedMap<String, O`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`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()) {`
`110`	`110`	`final byte[] buffer = new byte[1024];`
`111`	`111`
`112`	`112`	`int length = stream.read(buffer);`