From 5dc185e97f6caa041b3e0e07d5cf648e29280a44 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Fri, 29 Nov 2024 10:36:30 +0000 Subject: [PATCH 01/16] set next development version 2.30 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2fc004697..3d3a262a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.29.1 +version=2.30-SNAPSHOT org.gradle.daemon=true org.gradle.parallel=true From 893dd4dfd518a444285af75c01eb386a6b011551 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jul 2025 14:47:21 +0100 Subject: [PATCH 02/16] build(deps): bump net.sourceforge.pmd:pmd-java from 7.4.0 to 7.15.0 (via #1166) --- .../allure/attachment/AttachmentData.java | 1 + .../attachment/AttachmentProcessor.java | 1 + .../allure/attachment/AttachmentRenderer.java | 1 + .../http/HttpRequestAttachment.java | 1 - .../http/HttpResponseAttachment.java | 1 - .../cucumber4jvm/AllureCucumber4Jvm.java | 1 - .../allure/cucumber4jvm/LabelBuilder.java | 28 ++++---- .../cucumber5jvm/AllureCucumber5Jvm.java | 1 - .../allure/cucumber5jvm/LabelBuilder.java | 26 ++++---- .../cucumber6jvm/AllureCucumber6Jvm.java | 1 - .../allure/cucumber6jvm/LabelBuilder.java | 26 ++++---- .../cucumber7jvm/AllureCucumber7Jvm.java | 1 - .../allure/cucumber7jvm/LabelBuilder.java | 28 ++++---- .../io/qameta/allure/grpc/AllureGrpc.java | 3 - .../allure/grpc/GrpcRequestAttachment.java | 1 - .../allure/grpc/GrpcResponseAttachment.java | 1 - .../AllureHttpClient5Response.java | 1 + .../httpclient5/AllureHttpEntityUtils.java | 2 +- .../io/qameta/allure/test/AllureFeatures.java | 2 +- .../qameta/allure/test/AllurePredicates.java | 1 - .../main/java/io/qameta/allure/Allure.java | 2 - .../io/qameta/allure/AllureConstants.java | 2 +- .../io/qameta/allure/AllureLifecycle.java | 3 +- .../allure/internal/Allure2ModelJackson.java | 1 - .../qameta/allure/internal/AllureStorage.java | 6 +- .../allure/listener/LifecycleNotifier.java | 1 - .../qameta/allure/util/AnnotationUtils.java | 2 - .../io/qameta/allure/util/NamingUtils.java | 1 + .../io/qameta/allure/util/ObjectUtils.java | 2 - .../io/qameta/allure/util/ResultsUtils.java | 2 - .../junitplatform/AllureJunitPlatform.java | 6 +- .../aspect/AllureJunit4FilterAspect.java | 1 - .../io/qameta/allure/junit4/AllureJunit4.java | 2 +- .../io/qameta/allure/junit5/AllureJunit5.java | 2 +- .../io/qameta/allure/model/TestResult.java | 1 - .../allure/model/TestResultContainer.java | 1 - .../qameta/allure/model/WithAttachments.java | 1 + .../io/qameta/allure/model/WithLinks.java | 1 + .../qameta/allure/model/WithParameters.java | 1 + .../io/qameta/allure/model/WithStatus.java | 1 + .../io/qameta/allure/model/WithSteps.java | 1 + .../io/qameta/allure/okhttp/AllureOkHttp.java | 20 +++--- .../qameta/allure/okhttp3/AllureOkHttp3.java | 8 ++- .../HttpServletAttachmentBuilder.java | 2 - .../io/qameta/allure/spock/AllureSpock.java | 3 - .../io/qameta/allure/spock2/AllureSpock2.java | 3 - .../allure/testfilter/TestPlanV1_0.java | 2 +- .../io/qameta/allure/testng/AllureTestNg.java | 8 +-- build.gradle.kts | 2 +- gradle/quality-configs/pmd/pmd.xml | 64 ++++++------------- 50 files changed, 112 insertions(+), 168 deletions(-) diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java index e097b8815..5c6d09f34 100644 --- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java +++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java @@ -20,6 +20,7 @@ * * @author charlie (Dmitry Baev). */ +@FunctionalInterface public interface AttachmentData { String getName(); diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java index 467261139..99129f89a 100644 --- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java +++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java @@ -19,6 +19,7 @@ * @param the type of attachment data. * @author charlie (Dmitry Baev). */ +@FunctionalInterface public interface AttachmentProcessor { void addAttachment(T attachmentData, AttachmentRenderer renderer); 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 index 355f6d782..2b6f5b1a5 100644 --- a/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java +++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java @@ -20,6 +20,7 @@ * @author charlie (Dmitry Baev). */ @SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures") +@FunctionalInterface public interface AttachmentRenderer { AttachmentContent render(T attachmentData) throws AttachmentRenderException; diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java index 75cda2e96..a51052cf7 100644 --- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java +++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpRequestAttachment.java @@ -112,7 +112,6 @@ public String toString() { /** * Builder for HttpRequestAttachment. */ - @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") public static final class Builder { private final String name; diff --git a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java index 2369e10f8..d606af57e 100644 --- a/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java +++ b/allure-attachments/src/main/java/io/qameta/allure/attachment/http/HttpResponseAttachment.java @@ -90,7 +90,6 @@ public String toString() { /** * Builder for HttpRequestAttachment. */ - @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") public static final class Builder { private final String name; 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 index 8998226d8..b5a5d429d 100644 --- 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 @@ -82,7 +82,6 @@ "ClassDataAbstractionCoupling", "ClassFanOutComplexity", "MultipleStringLiterals", - "PMD.ExcessiveImports", }) public class AllureCucumber4Jvm implements ConcurrentEventListener { diff --git a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java index a0ed3c28b..fbcbb3f10 100644 --- a/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java +++ b/allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/LabelBuilder.java @@ -49,8 +49,8 @@ /** * Scenario labels and links builder. */ -@SuppressWarnings({"CyclomaticComplexity", "PMD.CyclomaticComplexity", "PMD.NcssCount", "MultipleStringLiterals"}) -class LabelBuilder { +@SuppressWarnings({"CyclomaticComplexity", "MultipleStringLiterals"}) +final class LabelBuilder { private static final Logger LOGGER = LoggerFactory.getLogger(LabelBuilder.class); private static final String COMPOSITE_TAG_DELIMITER = "="; @@ -89,34 +89,34 @@ class LabelBuilder { switch (tagKey) { case SEVERITY: - getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase())); + scenarioLabels.add(ResultsUtils.createSeverityLabel(tagValue.toLowerCase())); break; case TMS_LINK: - getScenarioLinks().add(ResultsUtils.createTmsLink(tagValue)); + scenarioLinks.add(ResultsUtils.createTmsLink(tagValue)); break; case ISSUE_LINK: - getScenarioLinks().add(ResultsUtils.createIssueLink(tagValue)); + scenarioLinks.add(ResultsUtils.createIssueLink(tagValue)); break; case PLAIN_LINK: - getScenarioLinks().add(ResultsUtils.createLink(null, tagValue, tagValue, null)); + scenarioLinks.add(ResultsUtils.createLink(null, tagValue, tagValue, null)); break; default: LOGGER.warn("Composite tag {} is not supported. adding it as RAW", tagKey); - getScenarioLabels().add(getTagLabel(tag)); + scenarioLabels.add(getTagLabel(tag)); break; } } else if (tagParser.isPureSeverityTag(tag)) { - getScenarioLabels().add(ResultsUtils.createSeverityLabel(tagString.substring(1))); + scenarioLabels.add(ResultsUtils.createSeverityLabel(tagString.substring(1))); } else if (!tagParser.isResultTag(tag)) { - getScenarioLabels().add(getTagLabel(tag)); + scenarioLabels.add(getTagLabel(tag)); } } final String featureName = feature.getName(); final String uri = scenario.getUri(); - getScenarioLabels().addAll(ResultsUtils.getProvidedLabels()); - getScenarioLabels().addAll(Arrays.asList( + scenarioLabels.addAll(ResultsUtils.getProvidedLabels()); + scenarioLabels.addAll(Arrays.asList( createHostLabel(), createThreadLabel(), createFeatureLabel(featureName), @@ -130,7 +130,7 @@ class LabelBuilder { featurePackage(uri, featureName) .map(ResultsUtils::createPackageLabel) - .ifPresent(getScenarioLabels()::add); + .ifPresent(scenarioLabels::add); } public List