From d5ac146723c380bcfb3cdf59135c6474871a78ff Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Mon, 13 May 2019 17:25:02 +0300
Subject: [PATCH 01/13] add annotation label for link

---
 allure-attachments/build.gradle.kts           | 16 +++++++
 allure-java-commons/build.gradle.kts          | 18 ++++++++
 .../main/java/io/qameta/allure/Allure.java    |  2 +-
 .../src/main/java/io/qameta/allure/Link.java  |  1 +
 .../qameta/allure/util/AnnotationUtils.java   | 44 ++++++++++++++++++-
 .../allure/util/AnnotationUtilsTest.java      | 37 ++++++++++------
 allure-model/build.gradle.kts                 | 18 ++++++++
 7 files changed, 119 insertions(+), 17 deletions(-)

diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
index bfbe95e7c..52fb8446c 100644
--- a/allure-attachments/build.gradle.kts
+++ b/allure-attachments/build.gradle.kts
@@ -1,3 +1,11 @@
+plugins {
+    `maven-publish`
+}
+
+repositories {
+    mavenLocal()
+}
+
 description = "Allure Attachments"
 
 val agent: Configuration by configurations.creating
@@ -30,3 +38,11 @@ tasks.test {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
 }
+
+publishing {
+    publications {
+        register("mavenJava", MavenPublication::class) {
+            from(components["java"])
+        }
+    }
+}
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index 6886a31f5..d497ffca0 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -1,3 +1,13 @@
+import org.gradle.api.tasks.bundling.Jar
+
+plugins {
+    `maven-publish`
+}
+
+repositories {
+    mavenLocal()
+}
+
 description = "Allure Java Commons"
 
 val agent: Configuration by configurations.creating
@@ -36,3 +46,11 @@ tasks.test {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
 }
+
+publishing {
+    publications {
+        register("mavenJava", MavenPublication::class) {
+            from(components["java"])
+        }
+    }
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 842c690b1..540849bdc 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -286,7 +286,7 @@ public static void tms(final String name, final String url) {
      * @param url the link's url.
      */
     public static void link(final String url) {
-        link(null, url);
+        link("link", url);
     }
 
     /**
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index 2a7f15a02..eb2abbbaa 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -37,6 +37,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Repeatable(Links.class)
+@LabelAnnotation(name = "link")
 public @interface Link {
 
     /**
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 7f2d388c7..ef37586e0 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
@@ -15,7 +15,9 @@
  */
 package io.qameta.allure.util;
 
+import io.qameta.allure.Issue;
 import io.qameta.allure.LabelAnnotation;
+import io.qameta.allure.TmsLink;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import org.slf4j.Logger;
@@ -37,6 +39,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.util.Arrays.asList;
+
 /**
  * Collection of utils used by Allure integration to extract meta information from
  * test cases via reflection.
@@ -64,6 +68,10 @@ public static List<Link> getLinks(final AnnotatedElement annotatedElement) {
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.Link.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.Issue.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.TmsLink.class, ResultsUtils::createLink));
+        result.addAll(extractLinks(Arrays.asList(annotatedElement.getDeclaredAnnotations()),
+                Arrays.asList(io.qameta.allure.Link.class,
+                        io.qameta.allure.Issue.class,
+                        io.qameta.allure.TmsLink.class)));
         return result;
     }
 
@@ -74,7 +82,7 @@ public static List<Link> getLinks(final AnnotatedElement annotatedElement) {
      * @return discovered links.
      */
     public static List<Link> getLinks(final Annotation... annotations) {
-        return getLinks(Arrays.asList(annotations));
+        return getLinks(asList(annotations));
     }
 
     /**
@@ -88,6 +96,8 @@ public static List<Link> getLinks(final Collection<Annotation> annotations) {
         result.addAll(extractLinks(annotations, io.qameta.allure.Link.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotations, io.qameta.allure.Issue.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotations, io.qameta.allure.TmsLink.class, ResultsUtils::createLink));
+        result.addAll(extractLinks(annotations,
+                asList(io.qameta.allure.Link.class, io.qameta.allure.Issue.class, io.qameta.allure.TmsLink.class)));
         return result;
     }
 
@@ -109,7 +119,7 @@ public static Set<Label> getLabels(final AnnotatedElement annotatedElement) {
      * @return discovered labels.
      */
     public static Set<Label> getLabels(final Annotation... annotations) {
-        return getLabels(Arrays.asList(annotations));
+        return getLabels(asList(annotations));
     }
 
     /**
@@ -129,11 +139,41 @@ public static Set<Label> getLabels(final Collection<Annotation> annotations) {
     private static <T extends Annotation> Set<Link> extractLinks(final AnnotatedElement element,
                                                                  final Class<T> annotationType,
                                                                  final Function<T, Link> mapper) {
+
         return Stream.of(element.getAnnotationsByType(annotationType))
                 .map(mapper)
                 .collect(Collectors.toSet());
     }
 
+    private static Collection<? extends Link> extractLinks(Collection<Annotation> annotations,
+                                                           List<Class<? extends Annotation>> ignore) {
+        return annotations.stream()
+                .flatMap(AnnotationUtils::extractRepeatable)
+                .filter(annotation ->
+                        Stream.of(annotation.annotationType().getAnnotationsByType(LabelAnnotation.class))
+                                .anyMatch(it -> it.name().equals("link")) && !ignore.contains(annotation.annotationType())
+                )
+                .flatMap(annotation -> AnnotationUtils.toLink(annotation).stream())
+                .collect(Collectors.toSet());
+    }
+
+    private static Set<Link> toLink(Annotation annotation) {
+        try {
+            final Method method = annotation.annotationType().getMethod(VALUE_METHOD_NAME);
+            final Object object = method.invoke(annotation);
+            return objectToStringStream(object)
+                    .map(value -> ResultsUtils.createLink("", value, "", "custom"))
+                    .collect(Collectors.toSet());
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            LOGGER.error(
+                    "Invalid annotation {}: marker annotations without value should contains value() method",
+                    annotation
+            );
+        }
+        return Collections.emptySet();
+    }
+
+
     @SuppressWarnings("unchecked")
     private static <T extends Annotation> Set<Link> extractLinks(final Collection<Annotation> annotations,
                                                                  final Class<T> annotationType,
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index baf4f681d..1a7ef396e 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -16,17 +16,7 @@
 package io.qameta.allure.util;
 
 import io.github.glytching.junit.extension.system.SystemProperty;
-import io.qameta.allure.Epic;
-import io.qameta.allure.Epics;
-import io.qameta.allure.Feature;
-import io.qameta.allure.Issue;
-import io.qameta.allure.Issues;
-import io.qameta.allure.LabelAnnotation;
-import io.qameta.allure.Link;
-import io.qameta.allure.Links;
-import io.qameta.allure.Story;
-import io.qameta.allure.TmsLink;
-import io.qameta.allure.TmsLinks;
+import io.qameta.allure.*;
 import io.qameta.allure.model.Label;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -39,9 +29,7 @@
 
 import static io.qameta.allure.util.AnnotationUtils.getLabels;
 import static io.qameta.allure.util.AnnotationUtils.getLinks;
-import static io.qameta.allure.util.ResultsUtils.EPIC_LABEL_NAME;
-import static io.qameta.allure.util.ResultsUtils.FEATURE_LABEL_NAME;
-import static io.qameta.allure.util.ResultsUtils.STORY_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
@@ -192,6 +180,15 @@ void shouldExtractLinksFromAnnotationList() {
                 );
     }
 
+    @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+    @SystemProperty(name = "allure.link.custom.pattern", value = "https://example.org/custom/{}")
+    @Test
+    void shouldExtractCustomLinks() {
+        assertThat(getLinks(WithCustomLink.class.getDeclaredAnnotations()))
+                .extracting(io.qameta.allure.model.Link::getUrl)
+                .containsOnly("https://example.org/custom/LINK-2", "https://example.org/custom/LINK-1");
+    }
+
     @Epic("e1")
     @Feature("f1")
     @Story("s1")
@@ -277,4 +274,16 @@ class WithLinks {
     public @interface CustomMultiLabel {
     }
 
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.METHOD, ElementType.TYPE})
+    @LabelAnnotation(name = "link")
+    public @interface CustomLink {
+        String value() default "";
+    }
+
+    @CustomLink("LINK-2")
+    @Link("LINK-1")
+    class WithCustomLink {
+
+    }
 }
diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index 507dfdf45..cc359f1d4 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -1,3 +1,13 @@
+import org.gradle.api.tasks.bundling.Jar
+
+plugins {
+    `maven-publish`
+}
+
+repositories {
+    mavenLocal()
+}
+
 description = "Allure Model Integration"
 
 val agent: Configuration by configurations.creating
@@ -27,3 +37,11 @@ tasks.test {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
 }
+
+publishing {
+    publications {
+        register("mavenJava", MavenPublication::class) {
+            from(components["java"])
+        }
+    }
+}
\ No newline at end of file

From f9b676e082849473cf0d142282a70beeef697583 Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Mon, 13 May 2019 17:32:54 +0300
Subject: [PATCH 02/13] fix PMD

---
 .../qameta/allure/util/AnnotationUtils.java   | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 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 ef37586e0..48dd6a54c 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
@@ -15,9 +15,7 @@
  */
 package io.qameta.allure.util;
 
-import io.qameta.allure.Issue;
 import io.qameta.allure.LabelAnnotation;
-import io.qameta.allure.TmsLink;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import org.slf4j.Logger;
@@ -28,13 +26,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -68,8 +60,8 @@ public static List<Link> getLinks(final AnnotatedElement annotatedElement) {
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.Link.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.Issue.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.TmsLink.class, ResultsUtils::createLink));
-        result.addAll(extractLinks(Arrays.asList(annotatedElement.getDeclaredAnnotations()),
-                Arrays.asList(io.qameta.allure.Link.class,
+        result.addAll(extractLinks(asList(annotatedElement.getDeclaredAnnotations()),
+                asList(io.qameta.allure.Link.class,
                         io.qameta.allure.Issue.class,
                         io.qameta.allure.TmsLink.class)));
         return result;
@@ -145,19 +137,32 @@ private static <T extends Annotation> Set<Link> extractLinks(final AnnotatedElem
                 .collect(Collectors.toSet());
     }
 
-    private static Collection<? extends Link> extractLinks(Collection<Annotation> annotations,
-                                                           List<Class<? extends Annotation>> ignore) {
+    @SuppressWarnings("unchecked")
+    private static <T extends Annotation> Set<Link> extractLinks(final Collection<Annotation> annotations,
+                                                                 final Class<T> annotationType,
+                                                                 final Function<T, Link> mapper) {
+        return annotations.stream()
+                .flatMap(AnnotationUtils::extractRepeatable)
+                .filter(annotation -> annotationType.isAssignableFrom(annotation.annotationType()))
+                .map(annotation -> (T) annotation)
+                .map(mapper)
+                .collect(Collectors.toSet());
+    }
+
+    private static Collection<? extends Link> extractLinks(final Collection<Annotation> annotations,
+                                                           final List<Class<? extends Annotation>> ignore) {
         return annotations.stream()
                 .flatMap(AnnotationUtils::extractRepeatable)
                 .filter(annotation ->
                         Stream.of(annotation.annotationType().getAnnotationsByType(LabelAnnotation.class))
-                                .anyMatch(it -> it.name().equals("link")) && !ignore.contains(annotation.annotationType())
+                                .anyMatch(it -> it.name().equals("link"))
+                                && !ignore.contains(annotation.annotationType())
                 )
                 .flatMap(annotation -> AnnotationUtils.toLink(annotation).stream())
                 .collect(Collectors.toSet());
     }
 
-    private static Set<Link> toLink(Annotation annotation) {
+    private static Set<Link> toLink(final Annotation annotation) {
         try {
             final Method method = annotation.annotationType().getMethod(VALUE_METHOD_NAME);
             final Object object = method.invoke(annotation);
@@ -166,26 +171,13 @@ private static Set<Link> toLink(Annotation annotation) {
                     .collect(Collectors.toSet());
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             LOGGER.error(
-                    "Invalid annotation {}: marker annotations without value should contains value() method",
+                    "Invalid annotation {}: marker annotations should contains value() method",
                     annotation
             );
         }
         return Collections.emptySet();
     }
 
-
-    @SuppressWarnings("unchecked")
-    private static <T extends Annotation> Set<Link> extractLinks(final Collection<Annotation> annotations,
-                                                                 final Class<T> annotationType,
-                                                                 final Function<T, Link> mapper) {
-        return annotations.stream()
-                .flatMap(AnnotationUtils::extractRepeatable)
-                .filter(annotation -> annotationType.isAssignableFrom(annotation.annotationType()))
-                .map(annotation -> (T) annotation)
-                .map(mapper)
-                .collect(Collectors.toSet());
-    }
-
     private static Set<Label> getMarks(final Annotation annotation) {
         return Stream.of(annotation.annotationType().getAnnotationsByType(LabelAnnotation.class))
                 .map(marker -> getLabel(annotation, marker))

From 72f9f6d336e0f03447899720d04edd55340a7a56 Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 14:11:45 +0300
Subject: [PATCH 03/13] delete maven publish

---
 allure-attachments/build.gradle.kts  | 18 +-----------------
 allure-java-commons/build.gradle.kts | 20 +-------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
index 52fb8446c..71c782d2b 100644
--- a/allure-attachments/build.gradle.kts
+++ b/allure-attachments/build.gradle.kts
@@ -1,11 +1,3 @@
-plugins {
-    `maven-publish`
-}
-
-repositories {
-    mavenLocal()
-}
-
 description = "Allure Attachments"
 
 val agent: Configuration by configurations.creating
@@ -37,12 +29,4 @@ tasks.test {
     doFirst {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
-}
-
-publishing {
-    publications {
-        register("mavenJava", MavenPublication::class) {
-            from(components["java"])
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index d497ffca0..ae037595c 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -1,13 +1,3 @@
-import org.gradle.api.tasks.bundling.Jar
-
-plugins {
-    `maven-publish`
-}
-
-repositories {
-    mavenLocal()
-}
-
 description = "Allure Java Commons"
 
 val agent: Configuration by configurations.creating
@@ -45,12 +35,4 @@ tasks.test {
     doFirst {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
-}
-
-publishing {
-    publications {
-        register("mavenJava", MavenPublication::class) {
-            from(components["java"])
-        }
-    }
-}
+}
\ No newline at end of file

From 41da8b7a155ab3b9fd791b0fbd6773a32534d070 Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 14:15:09 +0300
Subject: [PATCH 04/13] delete maven publish

---
 allure-model/build.gradle.kts | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/allure-model/build.gradle.kts b/allure-model/build.gradle.kts
index cc359f1d4..507dfdf45 100644
--- a/allure-model/build.gradle.kts
+++ b/allure-model/build.gradle.kts
@@ -1,13 +1,3 @@
-import org.gradle.api.tasks.bundling.Jar
-
-plugins {
-    `maven-publish`
-}
-
-repositories {
-    mavenLocal()
-}
-
 description = "Allure Model Integration"
 
 val agent: Configuration by configurations.creating
@@ -37,11 +27,3 @@ tasks.test {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
 }
-
-publishing {
-    publications {
-        register("mavenJava", MavenPublication::class) {
-            from(components["java"])
-        }
-    }
-}
\ No newline at end of file

From 3798df629d4fdabd3cb190a811499ab2cb5a3a66 Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 14:15:59 +0300
Subject: [PATCH 05/13] delete maven publish

---
 allure-attachments/build.gradle.kts  | 2 +-
 allure-java-commons/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/allure-attachments/build.gradle.kts b/allure-attachments/build.gradle.kts
index 71c782d2b..bfbe95e7c 100644
--- a/allure-attachments/build.gradle.kts
+++ b/allure-attachments/build.gradle.kts
@@ -29,4 +29,4 @@ tasks.test {
     doFirst {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
-}
\ No newline at end of file
+}
diff --git a/allure-java-commons/build.gradle.kts b/allure-java-commons/build.gradle.kts
index ae037595c..6886a31f5 100644
--- a/allure-java-commons/build.gradle.kts
+++ b/allure-java-commons/build.gradle.kts
@@ -35,4 +35,4 @@ tasks.test {
     doFirst {
         jvmArgs("-javaagent:${agent.singleFile}")
     }
-}
\ No newline at end of file
+}

From cf775ebc99d4973e03bb16bb55ac68ae4fe7576b Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 15:16:34 +0300
Subject: [PATCH 06/13] add LinkAnnotation

---
 .../src/main/java/io/qameta/allure/Link.java   |  1 -
 .../java/io/qameta/allure/LinkAnnotation.java  | 14 ++++++++++++++
 .../java/io/qameta/allure/LinkAnnotations.java | 11 +++++++++++
 .../io/qameta/allure/util/AnnotationUtils.java | 18 +++++-------------
 .../allure/util/AnnotationUtilsTest.java       |  2 +-
 5 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
 create mode 100644 allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index eb2abbbaa..2a7f15a02 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -37,7 +37,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Repeatable(Links.class)
-@LabelAnnotation(name = "link")
 public @interface Link {
 
     /**
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
new file mode 100644
index 000000000..d21efac64
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -0,0 +1,14 @@
+package io.qameta.allure;
+
+import java.lang.annotation.*;
+
+@Documented
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.ANNOTATION_TYPE})
+@Repeatable(LinkAnnotations.class)
+public @interface LinkAnnotation {
+    String value() default "";
+
+    String type() default "link";
+}
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
new file mode 100644
index 000000000..8e3938562
--- /dev/null
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
@@ -0,0 +1,11 @@
+package io.qameta.allure;
+
+import java.lang.annotation.*;
+
+@Documented
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.ANNOTATION_TYPE})
+public @interface LinkAnnotations {
+    LinkAnnotation[] value();
+}
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 48dd6a54c..97e8281b8 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
@@ -16,6 +16,7 @@
 package io.qameta.allure.util;
 
 import io.qameta.allure.LabelAnnotation;
+import io.qameta.allure.LinkAnnotation;
 import io.qameta.allure.model.Label;
 import io.qameta.allure.model.Link;
 import org.slf4j.Logger;
@@ -60,10 +61,7 @@ public static List<Link> getLinks(final AnnotatedElement annotatedElement) {
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.Link.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.Issue.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotatedElement, io.qameta.allure.TmsLink.class, ResultsUtils::createLink));
-        result.addAll(extractLinks(asList(annotatedElement.getDeclaredAnnotations()),
-                asList(io.qameta.allure.Link.class,
-                        io.qameta.allure.Issue.class,
-                        io.qameta.allure.TmsLink.class)));
+        result.addAll(extractCustomLinks(asList(annotatedElement.getDeclaredAnnotations())));
         return result;
     }
 
@@ -88,8 +86,7 @@ public static List<Link> getLinks(final Collection<Annotation> annotations) {
         result.addAll(extractLinks(annotations, io.qameta.allure.Link.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotations, io.qameta.allure.Issue.class, ResultsUtils::createLink));
         result.addAll(extractLinks(annotations, io.qameta.allure.TmsLink.class, ResultsUtils::createLink));
-        result.addAll(extractLinks(annotations,
-                asList(io.qameta.allure.Link.class, io.qameta.allure.Issue.class, io.qameta.allure.TmsLink.class)));
+        result.addAll(extractCustomLinks(annotations));
         return result;
     }
 
@@ -149,15 +146,10 @@ private static <T extends Annotation> Set<Link> extractLinks(final Collection<An
                 .collect(Collectors.toSet());
     }
 
-    private static Collection<? extends Link> extractLinks(final Collection<Annotation> annotations,
-                                                           final List<Class<? extends Annotation>> ignore) {
+    private static Collection<? extends Link> extractCustomLinks(final Collection<Annotation> annotations) {
         return annotations.stream()
                 .flatMap(AnnotationUtils::extractRepeatable)
-                .filter(annotation ->
-                        Stream.of(annotation.annotationType().getAnnotationsByType(LabelAnnotation.class))
-                                .anyMatch(it -> it.name().equals("link"))
-                                && !ignore.contains(annotation.annotationType())
-                )
+                .filter(annotation -> annotation.annotationType().isAnnotationPresent(LinkAnnotation.class))
                 .flatMap(annotation -> AnnotationUtils.toLink(annotation).stream())
                 .collect(Collectors.toSet());
     }
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index 1a7ef396e..12f86c1ab 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -276,7 +276,7 @@ class WithLinks {
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
-    @LabelAnnotation(name = "link")
+    @LinkAnnotation
     public @interface CustomLink {
         String value() default "";
     }

From bb1c361d67377550e1eb97cc7a0b13b9ee768a9b Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 15:41:04 +0300
Subject: [PATCH 07/13] delete LinkAnnotations and pass type

---
 .../src/main/java/io/qameta/allure/Allure.java  |  2 +-
 .../src/main/java/io/qameta/allure/Link.java    |  4 +++-
 .../java/io/qameta/allure/LinkAnnotation.java   |  5 +++--
 .../java/io/qameta/allure/LinkAnnotations.java  | 11 -----------
 .../io/qameta/allure/util/AnnotationUtils.java  |  4 +++-
 .../io/qameta/allure/util/ResultsUtils.java     |  1 +
 .../qameta/allure/util/AnnotationUtilsTest.java | 17 +++++++++++++----
 7 files changed, 24 insertions(+), 20 deletions(-)
 delete mode 100644 allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
index 540849bdc..842c690b1 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Allure.java
@@ -286,7 +286,7 @@ public static void tms(final String name, final String url) {
      * @param url the link's url.
      */
     public static void link(final String url) {
-        link("link", url);
+        link(null, url);
     }
 
     /**
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index 2a7f15a02..85d4becc3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -15,6 +15,8 @@
  */
 package io.qameta.allure;
 
+import io.qameta.allure.util.ResultsUtils;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -66,5 +68,5 @@
      *
      * @return the link type.
      */
-    String type() default "custom";
+    String type() default ResultsUtils.LINK_TYPE;
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index d21efac64..886fea6e3 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -2,13 +2,14 @@
 
 import java.lang.annotation.*;
 
+import static io.qameta.allure.util.ResultsUtils.LINK_TYPE;
+
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.ANNOTATION_TYPE})
-@Repeatable(LinkAnnotations.class)
 public @interface LinkAnnotation {
     String value() default "";
 
-    String type() default "link";
+    String type() default LINK_TYPE;
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
deleted file mode 100644
index 8e3938562..000000000
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotations.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.qameta.allure;
-
-import java.lang.annotation.*;
-
-@Documented
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.ANNOTATION_TYPE})
-public @interface LinkAnnotations {
-    LinkAnnotation[] value();
-}
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 97e8281b8..24b59542e 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
@@ -155,11 +155,13 @@ private static Collection<? extends Link> extractCustomLinks(final Collection<An
     }
 
     private static Set<Link> toLink(final Annotation annotation) {
+        LinkAnnotation linkAnnotation = annotation.annotationType().getAnnotation(LinkAnnotation.class);
+
         try {
             final Method method = annotation.annotationType().getMethod(VALUE_METHOD_NAME);
             final Object object = method.invoke(annotation);
             return objectToStringStream(object)
-                    .map(value -> ResultsUtils.createLink("", value, "", "custom"))
+                    .map(value -> ResultsUtils.createLink("", value, "", linkAnnotation.type()))
                     .collect(Collectors.toSet());
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             LOGGER.error(
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index aad8bcc22..21af6d8df 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -75,6 +75,7 @@ public final class ResultsUtils {
 
     public static final String ISSUE_LINK_TYPE = "issue";
     public static final String TMS_LINK_TYPE = "tms";
+    public static final String LINK_TYPE = "custom";
 
     public static final String ALLURE_ID_LABEL_NAME = "AS_ID";
     public static final String SUITE_LABEL_NAME = "suite";
diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index 12f86c1ab..a78a75ea4 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -182,11 +182,14 @@ void shouldExtractLinksFromAnnotationList() {
 
     @ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
     @SystemProperty(name = "allure.link.custom.pattern", value = "https://example.org/custom/{}")
+    @SystemProperty(name = "allure.link.tms.pattern", value = "https://tms.com/custom/{}")
     @Test
     void shouldExtractCustomLinks() {
         assertThat(getLinks(WithCustomLink.class.getDeclaredAnnotations()))
                 .extracting(io.qameta.allure.model.Link::getUrl)
-                .containsOnly("https://example.org/custom/LINK-2", "https://example.org/custom/LINK-1");
+                .containsOnly("https://example.org/custom/LINK-2",
+                        "https://example.org/custom/LINK-1",
+                        "https://tms.com/custom/ISSUE-1");
     }
 
     @Epic("e1")
@@ -281,9 +284,15 @@ class WithLinks {
         String value() default "";
     }
 
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.METHOD, ElementType.TYPE})
+    @LinkAnnotation(type = "tms")
+    public @interface CustomIssue {
+        String value();
+    }
+
     @CustomLink("LINK-2")
     @Link("LINK-1")
-    class WithCustomLink {
-
-    }
+    @CustomIssue("ISSUE-1")
+    class WithCustomLink { }
 }

From 39a1f018fa3738ba8596580188039e026762ea70 Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 16:24:08 +0300
Subject: [PATCH 08/13] fix wildcard imports

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

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 24b59542e..20b882204 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
@@ -27,7 +27,12 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

From 5d01c783007d99c2d4b98b304268b9bf1bb94ddb Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 16:32:34 +0300
Subject: [PATCH 09/13] fix wildcard imports

---
 .../qameta/allure/util/AnnotationUtilsTest.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
index a78a75ea4..973ce6da6 100644
--- a/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
+++ b/allure-java-commons/src/test/java/io/qameta/allure/util/AnnotationUtilsTest.java
@@ -16,7 +16,18 @@
 package io.qameta.allure.util;
 
 import io.github.glytching.junit.extension.system.SystemProperty;
-import io.qameta.allure.*;
+import io.qameta.allure.Epic;
+import io.qameta.allure.Epics;
+import io.qameta.allure.Feature;
+import io.qameta.allure.Issue;
+import io.qameta.allure.Issues;
+import io.qameta.allure.LabelAnnotation;
+import io.qameta.allure.Link;
+import io.qameta.allure.LinkAnnotation;
+import io.qameta.allure.Links;
+import io.qameta.allure.Story;
+import io.qameta.allure.TmsLink;
+import io.qameta.allure.TmsLinks;
 import io.qameta.allure.model.Label;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceLock;
@@ -29,7 +40,9 @@
 
 import static io.qameta.allure.util.AnnotationUtils.getLabels;
 import static io.qameta.allure.util.AnnotationUtils.getLinks;
-import static io.qameta.allure.util.ResultsUtils.*;
+import static io.qameta.allure.util.ResultsUtils.EPIC_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.FEATURE_LABEL_NAME;
+import static io.qameta.allure.util.ResultsUtils.STORY_LABEL_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;

From ac73308624305751b9fff9a14a4be35d56028b5a Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 16:37:23 +0300
Subject: [PATCH 10/13] add licence for LinkAnnotation file

---
 .../java/io/qameta/allure/LinkAnnotation.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index 886fea6e3..bfe244aae 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -1,3 +1,18 @@
+/*
+ *  Copyright 2019 Qameta Software OÜ
+ *
+ *  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;
 
 import java.lang.annotation.*;

From 173a19bce5e757ab0041d0022fef14d889eb637e Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 16:43:50 +0300
Subject: [PATCH 11/13] add javadoc

---
 .../java/io/qameta/allure/LinkAnnotation.java | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index bfe244aae..034d09b35 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -19,12 +19,32 @@
 
 import static io.qameta.allure.util.ResultsUtils.LINK_TYPE;
 
+/**
+ * Marker annotation. Annotations marked by this annotation will be discovered
+ * by Allure and added to test results as a link.
+ *
+ * @see Link
+ * @see TmsLink
+ * @see Issue
+ */
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.ANNOTATION_TYPE})
 public @interface LinkAnnotation {
+
+    /**
+     * The value of link. In not specified will take value from <code>value()</code>
+     * method of target annotation.
+     *
+     * @return the value of the link to add.
+     */
     String value() default "";
 
+    /**
+     * This type is used for create an icon for link. Also there is few reserved types such as issue and tms.
+     *
+     * @return the link type.
+     */
     String type() default LINK_TYPE;
 }

From 281e085200933b91ba5fe40821a6f17026047124 Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Tue, 14 May 2019 16:56:28 +0300
Subject: [PATCH 12/13] fix checkstyle

---
 .../src/main/java/io/qameta/allure/util/AnnotationUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 20b882204..c547d44ca 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
@@ -160,7 +160,7 @@ private static Collection<? extends Link> extractCustomLinks(final Collection<An
     }
 
     private static Set<Link> toLink(final Annotation annotation) {
-        LinkAnnotation linkAnnotation = annotation.annotationType().getAnnotation(LinkAnnotation.class);
+        final LinkAnnotation linkAnnotation = annotation.annotationType().getAnnotation(LinkAnnotation.class);
 
         try {
             final Method method = annotation.annotationType().getMethod(VALUE_METHOD_NAME);

From d8cfd3eab1e0e11ca657a4c1d965d6cac11de5cb Mon Sep 17 00:00:00 2001
From: Serhii Pirohov <sergio_89@ukr.net>
Date: Thu, 16 May 2019 13:52:35 +0300
Subject: [PATCH 13/13] fix pro comments

---
 .../src/main/java/io/qameta/allure/Link.java          |  2 +-
 .../main/java/io/qameta/allure/LinkAnnotation.java    | 11 ++++++++---
 .../main/java/io/qameta/allure/util/ResultsUtils.java |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/allure-java-commons/src/main/java/io/qameta/allure/Link.java b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
index 85d4becc3..666da86a4 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/Link.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/Link.java
@@ -68,5 +68,5 @@
      *
      * @return the link type.
      */
-    String type() default ResultsUtils.LINK_TYPE;
+    String type() default ResultsUtils.CUSTOM_LINK_TYPE;
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
index 034d09b35..6b5ee1220 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/LinkAnnotation.java
@@ -15,9 +15,14 @@
  */
 package io.qameta.allure;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-import static io.qameta.allure.util.ResultsUtils.LINK_TYPE;
+import static io.qameta.allure.util.ResultsUtils.CUSTOM_LINK_TYPE;
 
 /**
  * Marker annotation. Annotations marked by this annotation will be discovered
@@ -46,5 +51,5 @@
      *
      * @return the link type.
      */
-    String type() default LINK_TYPE;
+    String type() default CUSTOM_LINK_TYPE;
 }
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
index 21af6d8df..c8e89ea91 100644
--- a/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
+++ b/allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java
@@ -75,7 +75,7 @@ public final class ResultsUtils {
 
     public static final String ISSUE_LINK_TYPE = "issue";
     public static final String TMS_LINK_TYPE = "tms";
-    public static final String LINK_TYPE = "custom";
+    public static final String CUSTOM_LINK_TYPE = "custom";
 
     public static final String ALLURE_ID_LABEL_NAME = "AS_ID";
     public static final String SUITE_LABEL_NAME = "suite";