From ddc7230a0a1ff7530c07c202fd48f666aad2f49d Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Fri, 12 Apr 2024 15:10:50 +0100
Subject: [PATCH 1/7] #1032 Inherited test methods don't support their
 annotations.

---
 .../AllureJunitPlatformUtils.java             | 12 ++++-
 .../AllureJunitPlatformTest.java              | 40 ++++++++++++++
 .../features/InheritedTests.java              | 54 +++++++++++++++++++
 3 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java

diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
index 14769ed2..4703a5b4 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -86,12 +86,20 @@ public static Optional<Method> getTestMethod(final TestSource source) {
     public static Optional<Method> getTestMethod(final MethodSource source) {
         try {
             final Class<?> aClass = Class.forName(source.getClassName());
-            return Stream.of(aClass.getDeclaredMethods())
-                    .filter(method -> MethodSource.from(method).equals(source))
+
+            return Stream.of(aClass.getMethods())
+                    // The filter ignores the class name, as the methods are already defined in an inherited class.
+                    .filter(method -> equalsWithoutClassName(MethodSource.from(method), source))
                     .findAny();
         } catch (ClassNotFoundException e) {
             LOGGER.trace("Could not get test method from method source {}", source, e);
         }
         return Optional.empty();
     }
+
+    private static boolean equalsWithoutClassName(MethodSource a, MethodSource b) {
+        return a.getMethodName().equals(b.getMethodName())
+                && a.getMethodParameterTypes().equals(b.getMethodParameterTypes());
+
+    }
 }
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 9e9c1b82..73ee6547 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -26,6 +26,7 @@
 import io.qameta.allure.junitplatform.features.DisabledTests;
 import io.qameta.allure.junitplatform.features.DynamicTests;
 import io.qameta.allure.junitplatform.features.FailedTests;
+import io.qameta.allure.junitplatform.features.InheritedTests;
 import io.qameta.allure.junitplatform.features.JupiterUniqueIdTest;
 import io.qameta.allure.junitplatform.features.MarkerAnnotationSupport;
 import io.qameta.allure.junitplatform.features.NestedTests;
@@ -75,6 +76,7 @@
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
 
+import java.lang.annotation.Inherited;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
@@ -874,6 +876,44 @@ void shouldSetDifferentUuidsInDifferentRuns() {
 
     }
 
+    @Test
+    void shouldInheritedTestAnnotations() {
+        final AllureResults allureResults = runClasses(InheritedTests.class);
+
+        TestResult grandparentTest = allureResults.getTestResultByName("grandparentTest()");
+        assertThat(grandparentTest.getLabels())
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", InheritedTests.INHERITED_TEST_EPIC),
+                        tuple("feature", InheritedTests.INHERITED_TEST_FUTURE),
+                        tuple("story", InheritedTests.INHERITED_TEST_GRANDPARENT_STORY)
+                );
+        assertThat(grandparentTest.getDescription()).isEqualTo(InheritedTests.TEST_DESCRIPTION);
+        assertThat(grandparentTest.getLinks()).extracting(Link::getName).contains(InheritedTests.TEST_LINK);
+
+        TestResult parentTest = allureResults.getTestResultByName("parentTest()");
+        assertThat(parentTest.getLabels())
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", InheritedTests.INHERITED_TEST_EPIC),
+                        tuple("feature", InheritedTests.INHERITED_TEST_FUTURE),
+                        tuple("story", InheritedTests.INHERITED_TEST_PARENT_STORY)
+                );
+        assertThat(parentTest.getDescription()).isEqualTo(InheritedTests.TEST_DESCRIPTION);
+        assertThat(parentTest.getLinks()).extracting(Link::getName).contains(InheritedTests.TEST_LINK);
+
+        TestResult childTest = allureResults.getTestResultByName("childTest()");
+        assertThat(childTest.getLabels())
+                .extracting(Label::getName, Label::getValue)
+                .contains(
+                        tuple("epic", InheritedTests.INHERITED_TEST_EPIC),
+                        tuple("feature", InheritedTests.INHERITED_TEST_FUTURE),
+                        tuple("story", InheritedTests.INHERITED_TEST_CHILD_STORY)
+                );
+        assertThat(childTest.getDescription()).isEqualTo(InheritedTests.TEST_DESCRIPTION);
+        assertThat(childTest.getLinks()).extracting(Link::getName).contains(InheritedTests.TEST_LINK);
+    }
+
     @Test
     void shouldSupportNestedClasses() {
         final AllureResults allureResults = runClasses(NestedTests.class);
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
new file mode 100644
index 00000000..4f7e1281
--- /dev/null
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
@@ -0,0 +1,54 @@
+package io.qameta.allure.junitplatform.features;
+
+import io.qameta.allure.Description;
+import io.qameta.allure.Epic;
+import io.qameta.allure.Feature;
+import io.qameta.allure.Link;
+import io.qameta.allure.Story;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+public class InheritedTests {
+    public static final String INHERITED_TEST_EPIC = "Inherited epic";
+    public static final String INHERITED_TEST_FUTURE = "Inherited future";
+    public static final String INHERITED_TEST_GRANDPARENT_STORY = "Inherited grandparent story";
+
+    public static final String INHERITED_TEST_PARENT_STORY = "Inherited parent story";
+
+    public static final String INHERITED_TEST_CHILD_STORY = "Inherited child story";
+
+    public static final String TEST_DESCRIPTION = "Test description";
+
+    public static final String TEST_LINK = "Test link";
+
+    @Epic(INHERITED_TEST_EPIC)
+    @Feature(INHERITED_TEST_FUTURE)
+    public abstract static class GrandparentTest {
+        @Test
+        @Description(TEST_DESCRIPTION)
+        @Story(INHERITED_TEST_GRANDPARENT_STORY)
+        @Link(TEST_LINK)
+        public void grandparentTest() {
+        }
+    }
+
+    public abstract static class ParentTest extends GrandparentTest {
+        @Test
+        @Description(TEST_DESCRIPTION)
+        @Story(INHERITED_TEST_PARENT_STORY)
+        @Link(TEST_LINK)
+        public void parentTest() {
+        }
+
+    }
+
+    @Nested
+    class ChildTest extends ParentTest {
+        @Test
+        @Description(TEST_DESCRIPTION)
+        @Story(INHERITED_TEST_CHILD_STORY)
+        @Link(TEST_LINK)
+        public void childTest() {
+        }
+    }
+}

From eafa3fb1966c2de811b06f120db038b7f42a27fc Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Fri, 12 Apr 2024 15:39:28 +0100
Subject: [PATCH 2/7] spotlessApply

---
 .../junitplatform/AllureJunitPlatformTest.java    |  1 -
 .../junitplatform/features/InheritedTests.java    | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
index 73ee6547..03954676 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/AllureJunitPlatformTest.java
@@ -76,7 +76,6 @@
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
 
-import java.lang.annotation.Inherited;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
index 4f7e1281..2324b6bd 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package io.qameta.allure.junitplatform.features;
 
 import io.qameta.allure.Description;

From 0c8d4583a89b77148d779a9288381b742956c103 Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Fri, 12 Apr 2024 17:50:29 +0100
Subject: [PATCH 3/7] More deeps introspect.

---
 .../qameta/allure/util/AnnotationUtils.java   |   3 +-
 .../qameta/allure/util/ReflectionUtils.java   | 102 ++++++++++++++++++
 .../AllureJunitPlatformUtils.java             |   5 +-
 .../features/InheritedTests.java              |  10 +-
 4 files changed, 112 insertions(+), 8 deletions(-)
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index d241a468..dc0b10a0 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -37,6 +37,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static io.qameta.allure.util.ReflectionUtils.getAllClassAnnotations;
 import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLink;
 import static java.util.Arrays.asList;
@@ -116,7 +117,7 @@ public static Set<Link> getLinks(final Collection<Annotation> annotations) {
      * @return discovered labels.
      */
     public static Set<Label> getLabels(final AnnotatedElement annotatedElement) {
-        return getLabels(annotatedElement.getAnnotations());
+        return getLabels(getAllClassAnnotations(annotatedElement));
     }
 
     /**
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
new file mode 100644
index 00000000..0de3fcb7
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
@@ -0,0 +1,102 @@
+/*
+ *  Copyright 2016-2024 Qameta Software Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.qameta.allure.util;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+public class ReflectionUtils {
+    /**
+     * The function gives back all the methods that users have declared in subclasses and interfaces.
+     *
+     * @param clazz An introspecting class.
+     * @return All a user declared methods.
+     */
+    public static List<Method> getAllDeclaredMethods(final Class<?> clazz) {
+        List<Method> methods = new ArrayList<>();
+
+        doRecursivelyWith(
+                clazz,
+                ReflectionUtils::extractMethods,
+                methods::add
+        );
+
+        return methods;
+    }
+
+    public static List<Annotation> getAllClassAnnotations(AnnotatedElement annotatedElement) {
+        if (annotatedElement instanceof Class) {
+            List<Annotation> annotations = new ArrayList<>();
+
+            doRecursivelyWith(
+                    (Class<?>) annotatedElement,
+                    ReflectionUtils::extractAnnotations,
+                    annotations::add
+            );
+
+            return annotations;
+        } else {
+            return Arrays.asList(annotatedElement.getAnnotations());
+        }
+    }
+
+    private static void extractMethods(Class<?> clazz, Consumer<Method> callback) {
+        Arrays.stream(clazz.getDeclaredMethods())
+                .forEach(callback);
+
+        // The default methods might have test declarations, them are needed to introspect.
+        Arrays.stream(clazz.getInterfaces())
+                .flatMap(ifc -> Stream.of(ifc.getMethods()))
+                .filter(Method::isDefault)
+                .forEach(callback);
+    }
+
+    private static void extractAnnotations(Class<?> clazz, Consumer<Annotation> callback) {
+        Arrays.stream(clazz.getAnnotations())
+                .forEach(callback);
+
+        Arrays.stream(clazz.getInterfaces())
+                .flatMap(ifc -> Stream.of(ifc.getAnnotations()))
+                .forEach(callback);
+    }
+
+    private static <T> void doRecursivelyWith(
+            final Class<?> clazz,
+            final BiConsumer<Class<?>, Consumer<T>> introspector,
+            final Consumer<T> resultCallback
+    ) {
+        if (clazz == Object.class) {
+            return;
+        }
+
+        introspector.accept(clazz, resultCallback);
+
+        if (clazz.getSuperclass() != null && clazz.getSuperclass() != Object.class) {
+            doRecursivelyWith(clazz.getSuperclass(), introspector, resultCallback);
+        } else if (clazz.isInterface()) {
+            for (Class<?> superIfc : clazz.getInterfaces()) {
+                doRecursivelyWith(superIfc, introspector, resultCallback);
+            }
+        }
+    }
+}
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
index 4703a5b4..606ff8e5 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -24,7 +24,8 @@
 
 import java.lang.reflect.Method;
 import java.util.Optional;
-import java.util.stream.Stream;
+
+import static io.qameta.allure.util.ReflectionUtils.getAllDeclaredMethods;
 
 /**
  * @author charlie (Dmitry Baev).
@@ -87,7 +88,7 @@ public static Optional<Method> getTestMethod(final MethodSource source) {
         try {
             final Class<?> aClass = Class.forName(source.getClassName());
 
-            return Stream.of(aClass.getMethods())
+            return getAllDeclaredMethods(aClass).stream()
                     // The filter ignores the class name, as the methods are already defined in an inherited class.
                     .filter(method -> equalsWithoutClassName(MethodSource.from(method), source))
                     .findAny();
diff --git a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
index 2324b6bd..cd9f4423 100644
--- a/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
+++ b/allure-junit-platform/src/test/java/io/qameta/allure/junitplatform/features/InheritedTests.java
@@ -38,21 +38,21 @@ public class InheritedTests {
 
     @Epic(INHERITED_TEST_EPIC)
     @Feature(INHERITED_TEST_FUTURE)
-    public abstract static class GrandparentTest {
+    public interface GrandparentTest {
         @Test
         @Description(TEST_DESCRIPTION)
         @Story(INHERITED_TEST_GRANDPARENT_STORY)
         @Link(TEST_LINK)
-        public void grandparentTest() {
+        default void grandparentTest() {
         }
     }
 
-    public abstract static class ParentTest extends GrandparentTest {
+    public abstract static class ParentTest implements GrandparentTest {
         @Test
         @Description(TEST_DESCRIPTION)
         @Story(INHERITED_TEST_PARENT_STORY)
         @Link(TEST_LINK)
-        public void parentTest() {
+        void parentTest() {
         }
 
     }
@@ -63,7 +63,7 @@ class ChildTest extends ParentTest {
         @Description(TEST_DESCRIPTION)
         @Story(INHERITED_TEST_CHILD_STORY)
         @Link(TEST_LINK)
-        public void childTest() {
+        void childTest() {
         }
     }
 }

From 8c4f27f81a07dcdeadf7013096094472356c9c86 Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Fri, 12 Apr 2024 17:51:49 +0100
Subject: [PATCH 4/7] More deeps introspect.

---
 .../src/main/java/io/qameta/allure/util/AnnotationUtils.java  | 4 ++--
 .../src/main/java/io/qameta/allure/util/ReflectionUtils.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
index dc0b10a0..228b1aa2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/AnnotationUtils.java
@@ -37,7 +37,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static io.qameta.allure.util.ReflectionUtils.getAllClassAnnotations;
+import static io.qameta.allure.util.ReflectionUtils.getAllAnnotations;
 import static io.qameta.allure.util.ResultsUtils.createLabel;
 import static io.qameta.allure.util.ResultsUtils.createLink;
 import static java.util.Arrays.asList;
@@ -117,7 +117,7 @@ public static Set<Link> getLinks(final Collection<Annotation> annotations) {
      * @return discovered labels.
      */
     public static Set<Label> getLabels(final AnnotatedElement annotatedElement) {
-        return getLabels(getAllClassAnnotations(annotatedElement));
+        return getLabels(getAllAnnotations(annotatedElement));
     }
 
     /**
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
index 0de3fcb7..3fa53201 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
@@ -44,7 +44,7 @@ public static List<Method> getAllDeclaredMethods(final Class<?> clazz) {
         return methods;
     }
 
-    public static List<Annotation> getAllClassAnnotations(AnnotatedElement annotatedElement) {
+    public static List<Annotation> getAllAnnotations(AnnotatedElement annotatedElement) {
         if (annotatedElement instanceof Class) {
             List<Annotation> annotations = new ArrayList<>();
 

From 19efd399310ca9a6940f18e440709c71efdf4967 Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Fri, 12 Apr 2024 17:54:05 +0100
Subject: [PATCH 5/7] More deeps introspect.

---
 .../main/java/io/qameta/allure/util/ReflectionUtils.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
index 3fa53201..7ea60399 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
@@ -44,6 +44,12 @@ public static List<Method> getAllDeclaredMethods(final Class<?> clazz) {
         return methods;
     }
 
+    /**
+     * The function gives back all the annotations that users have declared in subclasses and interfaces.
+     *
+     * @param annotatedElement An introspecting element.
+     * @return All a user declared annotations.
+     */
     public static List<Annotation> getAllAnnotations(AnnotatedElement annotatedElement) {
         if (annotatedElement instanceof Class) {
             List<Annotation> annotations = new ArrayList<>();

From 504d8e8f4a6866e957d4b8c0300d1c46b9e44f25 Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Fri, 12 Apr 2024 17:57:02 +0100
Subject: [PATCH 6/7] More deeps introspect.

---
 .../main/java/io/qameta/allure/util/ReflectionUtils.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
index 7ea60399..45cec9d2 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
@@ -50,7 +50,7 @@ public static List<Method> getAllDeclaredMethods(final Class<?> clazz) {
      * @param annotatedElement An introspecting element.
      * @return All a user declared annotations.
      */
-    public static List<Annotation> getAllAnnotations(AnnotatedElement annotatedElement) {
+    public static List<Annotation> getAllAnnotations(final AnnotatedElement annotatedElement) {
         if (annotatedElement instanceof Class) {
             List<Annotation> annotations = new ArrayList<>();
 
@@ -66,7 +66,7 @@ public static List<Annotation> getAllAnnotations(AnnotatedElement annotatedEleme
         }
     }
 
-    private static void extractMethods(Class<?> clazz, Consumer<Method> callback) {
+    private static void extractMethods(final Class<?> clazz, final Consumer<Method> callback) {
         Arrays.stream(clazz.getDeclaredMethods())
                 .forEach(callback);
 
@@ -77,7 +77,7 @@ private static void extractMethods(Class<?> clazz, Consumer<Method> callback) {
                 .forEach(callback);
     }
 
-    private static void extractAnnotations(Class<?> clazz, Consumer<Annotation> callback) {
+    private static void extractAnnotations(final Class<?> clazz, final Consumer<Annotation> callback) {
         Arrays.stream(clazz.getAnnotations())
                 .forEach(callback);
 

From cf187d7e2ab114b6717b0ec4ac9b3716dac57f09 Mon Sep 17 00:00:00 2001
From: mstepachev <maksim.stepachev@gmail.com>
Date: Mon, 22 Apr 2024 14:23:25 +0100
Subject: [PATCH 7/7] Codestyle fixes.

---
 .../main/java/io/qameta/allure/util/ReflectionUtils.java | 9 ++++++---
 .../allure/junitplatform/AllureJunitPlatformUtils.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
index 45cec9d2..dee3a2c6 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ReflectionUtils.java
@@ -25,7 +25,10 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-public class ReflectionUtils {
+public final class ReflectionUtils {
+    private ReflectionUtils() {
+    }
+
     /**
      * The function gives back all the methods that users have declared in subclasses and interfaces.
      *
@@ -33,7 +36,7 @@ public class ReflectionUtils {
      * @return All a user declared methods.
      */
     public static List<Method> getAllDeclaredMethods(final Class<?> clazz) {
-        List<Method> methods = new ArrayList<>();
+        final List<Method> methods = new ArrayList<>();
 
         doRecursivelyWith(
                 clazz,
@@ -52,7 +55,7 @@ public static List<Method> getAllDeclaredMethods(final Class<?> clazz) {
      */
     public static List<Annotation> getAllAnnotations(final AnnotatedElement annotatedElement) {
         if (annotatedElement instanceof Class) {
-            List<Annotation> annotations = new ArrayList<>();
+            final List<Annotation> annotations = new ArrayList<>();
 
             doRecursivelyWith(
                     (Class<?>) annotatedElement,
diff --git a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
index 606ff8e5..2601e055 100644
--- a/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
+++ b/allure-junit-platform/src/main/java/io/qameta/allure/junitplatform/AllureJunitPlatformUtils.java
@@ -98,7 +98,7 @@ public static Optional<Method> getTestMethod(final MethodSource source) {
         return Optional.empty();
     }
 
-    private static boolean equalsWithoutClassName(MethodSource a, MethodSource b) {
+    private static boolean equalsWithoutClassName(final MethodSource a, final MethodSource b) {
         return a.getMethodName().equals(b.getMethodName())
                 && a.getMethodParameterTypes().equals(b.getMethodParameterTypes());