MorphiaOrg · evanchooly · Jun 4, 2026 · Jun 14, 2026 · Jun 15, 2026 · Jun 15, 2026
diff --git a/build-plugins/src/main/java/util/AnnotationBuilders.java b/build-plugins/src/main/java/util/AnnotationBuilders.java
@@ -293,7 +293,7 @@ private void equals(JavaClassSource annotation, List<AnnotationElementSource> el
             } else {
                 comparator = "Objects";
             }
-            comparisons.add(format("%s.equals(%s, that.%s)", comparator, element.getName(),
+            comparisons.add(format("%s.equals(%s, that.%s())", comparator, element.getName(),
                     element.getName()));
         }
         annotation.addMethod()
@@ -303,10 +303,10 @@ private void equals(JavaClassSource annotation, List<AnnotationElementSource> el
                 .setBody("if (this == o) {\n"
                         + "   return true;\n"
                         + "}\n"
-                        + "if (!(o instanceof " + annotation.getName() + ")) {\n"
+                        + "if (!(o instanceof " + source.getName() + ")) {\n"
                         + "   return false;\n"
                         + "}\n"
-                        + "var that = (" + annotation.getName() + ") o;\n"
+                        + source.getName() + " that = (" + source.getName() + ") o;\n"
                         + comparisons)
                 .addParameter("Object", "o");
 

diff --git a/build-plugins/src/main/java/util/AsmBuilders.java b/build-plugins/src/main/java/util/AsmBuilders.java
diff --git a/build-plugins/src/main/java/util/KotlinAnnotationExtensions.java b/build-plugins/src/main/java/util/KotlinAnnotationExtensions.java