Use textual representation for targets to avoid missing enumeration elements.

raphw · raphw · commit 7f551736c093 · 2022-01-07T22:26:43.000+01:00
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java
@@ -110,15 +110,12 @@ public interface AnnotationDescription {
     Set<ElementType> getElementTypes();
 
     /**
-     * Checks if this annotation is supported on the supplied element type or returns {@code true}
-     * if {@code null} is supplied.
+     * Checks if this annotation is supported on the supplied element type.
      *
-     * @param elementType The element type to check or {@code null} to return {@code true}. This can be helpful
-     *                    to make this method robust for VMs that do not define {@link ElementType}s that are
-     *                    available on newer VMs.
-     * @return {@code true} if the supplied element type is supported by this annotation or is {@code null}
+     * @param elementType The element type to check.
+     * @return {@code true} if the supplied element type is supported by this annotation.
      */
-    boolean isSupportedOn(@MaybeNull ElementType elementType);
+    boolean isSupportedOn(ElementType elementType);
 
     /**
      * Checks if this annotation is supported on the supplied element type.
@@ -502,10 +499,8 @@ public Set<ElementType> getElementTypes() {
         /**
          * {@inheritDoc}
          */
-        public boolean isSupportedOn(@MaybeNull ElementType elementType) {
-            return elementType == null
-                    ? true
-                    : isSupportedOn(elementType.name());
+        public boolean isSupportedOn(ElementType elementType) {
+            return isSupportedOn(elementType.name());
         }
 
         /**
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
@@ -1550,33 +1550,14 @@ public enum ForTypeAnnotations implements Visitor<Boolean> {
                     INSTANCE;
 
                     /**
-                     * The {@link ElementType}'s {@code TYPE_USE} constant.
+                     * The name of the {@code ElementType#TYPE_USE} element.
                      */
-                    @MaybeNull
-                    private final ElementType typeUse;
-
-                    /**
-                     * The {@link ElementType}'s {@code TYPE_PARAMETER} constant.
-                     */
-                    @MaybeNull
-                    private final ElementType typeParameter;
+                    private static final String TYPE_USE = "TYPE_USE";
 
                     /**
-                     * Creates a new type annotation validator.
+                     * The name of the {@code ElementType#TYPE_PARAMETER} element.
                      */
-                    ForTypeAnnotations() {
-                        ElementType typeUse, typeParameter;
-                        try {
-                            typeUse = Enum.valueOf(ElementType.class, "TYPE_USE");
-                            typeParameter = Enum.valueOf(ElementType.class, "TYPE_PARAMETER");
-                        } catch (IllegalArgumentException ignored) {
-                            // Setting these values null results in this validator always failing for pre Java-8 VMs.
-                            typeUse = null;
-                            typeParameter = null;
-                        }
-                        this.typeUse = typeUse;
-                        this.typeParameter = typeParameter;
-                    }
+                    private static final String TYPE_PARAMETER = "TYPE_PARAMETER";
 
                     /**
                      * Validates the type annotations on a formal type variable but not on its bounds..
@@ -1587,7 +1568,7 @@ public enum ForTypeAnnotations implements Visitor<Boolean> {
                     public static boolean ofFormalTypeVariable(Generic typeVariable) {
                         Set<TypeDescription> annotationTypes = new HashSet<TypeDescription>();
                         for (AnnotationDescription annotationDescription : typeVariable.getDeclaredAnnotations()) {
-                            if (!annotationDescription.isSupportedOn(INSTANCE.typeParameter) || !annotationTypes.add(annotationDescription.getAnnotationType())) {
+                            if (!annotationDescription.isSupportedOn(TYPE_PARAMETER) || !annotationTypes.add(annotationDescription.getAnnotationType())) {
                                 return false;
                             }
                         }
@@ -1658,7 +1639,7 @@ public Boolean onNonGenericType(Generic typeDescription) {
                     private boolean isValid(Generic typeDescription) {
                         Set<TypeDescription> annotationTypes = new HashSet<TypeDescription>();
                         for (AnnotationDescription annotationDescription : typeDescription.getDeclaredAnnotations()) {
-                            if (!annotationDescription.isSupportedOn(typeUse) || !annotationTypes.add(annotationDescription.getAnnotationType())) {
+                            if (!annotationDescription.isSupportedOn(TYPE_USE) || !annotationTypes.add(annotationDescription.getAnnotationType())) {
                                 return false;
                             }
                         }
