Merge pull request #332 from Ladicek/2.4-fixes

[2.4] improve AnnotationInstance.hashCode()
smallrye · Sep 25, 2023 · 550eb3b · 550eb3b
2 parents 9553e50 + 64004ae
commit 550eb3b
Showing 1 changed file with 31 additions and 2 deletions.
diff --git a/src/main/java/org/jboss/jandex/AnnotationInstance.java b/src/main/java/org/jboss/jandex/AnnotationInstance.java
@@ -324,8 +324,7 @@ void setTarget(AnnotationTarget target) {
     /**
      * Returns whether or not this annotation instance is equivalent to another instance.
      * An annotation instance is equivalent if its name and values are equal, and it shares
-     * the exact same <code>AnnotationTarget</code> instance. The latter restriction
-     * may be softened in future versions.
+     * the exact same <code>AnnotationTarget</code> instance.
      *
      * @param o the annotation instance to compare to.
      * @return true if equal, false if not
@@ -353,6 +352,36 @@ public int hashCode() {
         int result = name.hashCode();
         result = 31 * result + Arrays.hashCode(values);
 
+        if (target != null) {
+            switch (target.kind()) {
+                case CLASS:
+                    result = 31 * result + target.asClass().name().hashCode();
+                    break;
+                case METHOD:
+                    result = 31 * result + target.asMethod().declaringClass().name().hashCode();
+                    result = 31 * result + target.asMethod().name().hashCode();
+                    break;
+                case FIELD:
+                    result = 31 * result + target.asField().declaringClass().name().hashCode();
+                    result = 31 * result + target.asField().name().hashCode();
+                    break;
+                case METHOD_PARAMETER:
+                    result = 31 * result + target.asMethodParameter().method().declaringClass().name().hashCode();
+                    result = 31 * result + target.asMethodParameter().method().name().hashCode();
+                    result = 31 * result + target.asMethodParameter().position();
+                    break;
+                case RECORD_COMPONENT:
+                    result = 31 * result + target.asRecordComponent().declaringClass().name().hashCode();
+                    result = 31 * result + target.asRecordComponent().name().hashCode();
+                    break;
+                case TYPE:
+                    if (target.asType().target() != null) {
+                        result = 31 * result + target.asType().target().name().hashCode();
+                    }
+                    break;
+            }
+        }
+
         return result;
     }
 }