Skip to content

Commit 302daee

Browse files
bump net.sourceforge.pmd:pmd-java from 7.1.0 to 7.11.0 (via #2903)
1 parent c886061 commit 302daee

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-16
lines changed

allure-generator/src/main/java/io/qameta/allure/history/HistoryPlugin.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
import java.nio.file.Files;
3434
import java.nio.file.Path;
3535
import java.util.ArrayList;
36-
import java.util.Arrays;
36+
import java.util.EnumSet;
3737
import java.util.HashMap;
38-
import java.util.HashSet;
3938
import java.util.List;
4039
import java.util.Map;
4140
import java.util.Objects;
@@ -52,9 +51,7 @@
5251
*/
5352
public class HistoryPlugin extends CommonJsonAggregator2 implements Reader {
5453

55-
private static final Set<Status> MARK_STATUSES = new HashSet<>(Arrays.asList(
56-
Status.FAILED, Status.BROKEN, Status.PASSED
57-
));
54+
private static final Set<Status> MARK_STATUSES = EnumSet.of(Status.FAILED, Status.BROKEN, Status.PASSED);
5855

5956
private static final String HISTORY_BLOCK_NAME = "history";
6057
private static final String HISTORY_FILE_NAME = "history.json";

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ subprojects {
9494
dependency("commons-beanutils:commons-beanutils:1.10.0")
9595
dependency("commons-io:commons-io:2.18.0")
9696
dependency("javax.xml.bind:jaxb-api:2.3.1")
97-
dependency("net.sourceforge.pmd:pmd-java:7.1.0")
97+
dependency("net.sourceforge.pmd:pmd-java:7.11.0")
9898
dependency("org.allurefw:allure1-model:1.0")
9999
dependency("org.apache.commons:commons-collections4:4.4")
100100
dependency("org.apache.commons:commons-lang3:3.17.0")

gradle/quality-configs/pmd/pmd.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
<exclude name="AccessorMethodGeneration"/>
1616
<exclude name="ArrayIsStoredDirectly"/>
1717
<exclude name="GuardLogStatement"/>
18-
<exclude name="JUnitAssertionsShouldIncludeMessage"/>
19-
<exclude name="JUnit4SuitesShouldUseSuiteAnnotation"/>
20-
<exclude name="JUnitTestsShouldIncludeAssert"/>
21-
<exclude name="JUnit4TestShouldUseBeforeAnnotation"/>
22-
<exclude name="JUnit4TestShouldUseAfterAnnotation"/>
23-
<exclude name="JUnit4TestShouldUseTestAnnotation"/>
18+
<!-- Doesn't work with Java 8 switch clause -->
19+
<exclude name="ExhaustiveSwitchHasDefault"/>
2420
</rule>
2521

2622

plugins/behaviors-plugin/src/main/java/io/qameta/allure/behaviors/BehaviorsPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.Arrays;
3434
import java.util.Collection;
3535
import java.util.Comparator;
36-
import java.util.HashMap;
36+
import java.util.EnumMap;
3737
import java.util.List;
3838
import java.util.Map;
3939
import java.util.Objects;
@@ -121,7 +121,7 @@ private static class CsvExportAggregator extends CommonCsvExportAggregator2<CsvE
121121
protected List<CsvExportBehavior> getData(final List<LaunchResults> launchesResults) {
122122
final List<CsvExportBehavior> exportBehaviors = new ArrayList<>();
123123
launchesResults.stream().flatMap(launch -> launch.getResults().stream()).forEach(result -> {
124-
final Map<LabelName, List<String>> epicFeatureStoryMap = new HashMap<>();
124+
final Map<LabelName, List<String>> epicFeatureStoryMap = new EnumMap<>(LabelName.class);
125125
Arrays.asList(LABEL_NAMES).forEach(
126126
label -> epicFeatureStoryMap.put(label, result.findAllLabels(label))
127127
);

plugins/xray-plugin/src/main/java/io/qameta/allure/xray/XrayTestRunExportPlugin.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.ArrayList;
3333
import java.util.Arrays;
3434
import java.util.Collection;
35+
import java.util.EnumMap;
3536
import java.util.HashMap;
3637
import java.util.List;
3738
import java.util.Map;
@@ -191,7 +192,7 @@ private void updateTestRunStatus(final JiraService jiraService,
191192
}
192193

193194
private static Map<Status, String> getEnvStatusesMap() {
194-
final Map<Status, String> statues = new HashMap<>();
195+
final Map<Status, String> statues = new EnumMap<>(Status.class);
195196
getProperty(ALLURE_XRAY_STATUS_PASSED).ifPresent(value -> statues.put(Status.PASSED, value));
196197
getProperty(ALLURE_XRAY_STATUS_FAILED).ifPresent(value -> statues.put(Status.FAILED, value));
197198
getProperty(ALLURE_XRAY_STATUS_BROKEN).ifPresent(value -> statues.put(Status.BROKEN, value));
@@ -201,7 +202,7 @@ private static Map<Status, String> getEnvStatusesMap() {
201202
}
202203

203204
private static Map<Status, String> getDefaultStatusesMap() {
204-
final Map<Status, String> statues = new HashMap<>();
205+
final Map<Status, String> statues = new EnumMap<>(Status.class);
205206
statues.put(Status.PASSED, XRAY_STATUS_PASS);
206207
statues.put(Status.FAILED, XRAY_STATUS_FAIL);
207208
statues.put(Status.BROKEN, XRAY_STATUS_FAIL);

0 commit comments

Comments
 (0)