From c671692cd0fd035daa490a317951dc0a03ef7680 Mon Sep 17 00:00:00 2001 From: Andreas Gudian Date: Mon, 7 Mar 2016 14:19:14 +0100 Subject: [PATCH] #770 Update retention-policy of custom qualifier annotations in docs and tests to `CLASS`. --- core-common/src/main/java/org/mapstruct/Qualifier.java | 6 ++++-- .../main/asciidoc/mapstruct-reference-guide.asciidoc | 10 +++++----- .../qualifier/annotation/CreateGermanRelease.java | 2 +- .../qualifier/annotation/EnglishToGerman.java | 2 +- .../qualifier/annotation/NonQualifierAnnotated.java | 2 +- .../qualifier/annotation/TitleTranslator.java | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/core-common/src/main/java/org/mapstruct/Qualifier.java b/core-common/src/main/java/org/mapstruct/Qualifier.java index 839b878aa..fdaaad1e3 100644 --- a/core-common/src/main/java/org/mapstruct/Qualifier.java +++ b/core-common/src/main/java/org/mapstruct/Qualifier.java @@ -35,11 +35,13 @@ import java.lang.annotation.Target; *
  • {@link MapMapping#valueQualifiedBy() }
  • * * Example: + * *
      * @Qualifier
      * @Target(ElementType.METHOD)
    - * @Retention(RetentionPolicy.SOURCE)
    - * public @interface EnglishToGerman {}
    + * @Retention(RetentionPolicy.CLASS)
    + * public @interface EnglishToGerman {
    + * }
      * 
    * * @author Sjaak Derksen diff --git a/documentation/src/main/asciidoc/mapstruct-reference-guide.asciidoc b/documentation/src/main/asciidoc/mapstruct-reference-guide.asciidoc index 9bc8b0eba..8cb7214cb 100644 --- a/documentation/src/main/asciidoc/mapstruct-reference-guide.asciidoc +++ b/documentation/src/main/asciidoc/mapstruct-reference-guide.asciidoc @@ -749,7 +749,7 @@ Enter the qualifier approach: ---- @Qualifier @Target(ElementType.TYPE) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface TitleTranslator { } ---- @@ -764,7 +764,7 @@ And, some qualifiers to indicate which translator to use to map from source lang ---- @Qualifier @Target(ElementType.METHOD) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface EnglishToGerman { } ---- @@ -773,7 +773,7 @@ public @interface EnglishToGerman { ---- @Qualifier @Target(ElementType.METHOD) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface GermanToEnglish { } ---- @@ -796,7 +796,7 @@ public interface MovieMapper { } ---- -==== +==== .Custom mapper qualifying the methods it provides ==== @@ -865,7 +865,7 @@ public interface MovieMapper { } ---- -==== +==== [WARNING] ==== diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java index eb330e8ea..0379760ac 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java +++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java @@ -31,6 +31,6 @@ import org.mapstruct.Qualifier; */ @Qualifier @Target(ElementType.METHOD) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface CreateGermanRelease { } diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java index 051f8a3f5..c04231b51 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java +++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java @@ -31,6 +31,6 @@ import org.mapstruct.Qualifier; */ @Qualifier @Target(ElementType.METHOD) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface EnglishToGerman { } diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/NonQualifierAnnotated.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/NonQualifierAnnotated.java index de65cbe83..ca639321b 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/NonQualifierAnnotated.java +++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/NonQualifierAnnotated.java @@ -28,6 +28,6 @@ import java.lang.annotation.Target; * @author Sjaak Derksen */ @Target(ElementType.METHOD) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface NonQualifierAnnotated { } diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java index 1424d1427..abc1a5f42 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java +++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java @@ -31,6 +31,6 @@ import org.mapstruct.Qualifier; */ @Qualifier @Target(ElementType.TYPE) -@Retention(RetentionPolicy.SOURCE) +@Retention(RetentionPolicy.CLASS) public @interface TitleTranslator { }