Fix Equals generation for Java Protocol Classes (#3092)

finos · Sep 16, 2024 · deba37c · deba37c
1 parent d360a4f
commit deba37c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...gine-protocol-generation-pure/src/main/resources/core_protocol_generation/generation.pure b/...gine-protocol-generation-pure/src/main/resources/core_protocol_generation/generation.pure
@@ -518,7 +518,7 @@ function <<access.private>> meta::protocols::generation::java::generateEquals(ba
           j_declare($variable, $parameter->j_cast($base)),
           j_return($c->hierarchicalProperties()->fold({p,a| 
                                                 let propertyType = javaObject();//pureTypeToJavaType($conventions, $p);
-                                                let eq =if ($p->functionReturnType().rawType->isNotEmpty() && $p->functionReturnType().rawType->toOne()->instanceOf(meta::pure::metamodel::type::PrimitiveType) && $p->functionReturnMultiplicity()->isToOne(),
+                                                let eq =if(pureTypeToJavaType($conventions, $p->functionReturnType().rawType->toOne(), $p->functionReturnMultiplicity())->isPrimitive(),
                                                   |j_eq(
                                                               j_field(j_this($base), $p.name->toOne(), $propertyType),
                                                               j_field($variable, $p.name->toOne(), $propertyType)

diff --git a/...protocol-generation-pure/src/main/resources/core_protocol_generation/generation_test.pure b/...protocol-generation-pure/src/main/resources/core_protocol_generation/generation_test.pure
@@ -1580,7 +1580,7 @@ function <<test.Test>> meta::protocols::generation::java::tests::objectMethodsIm
                 '            return false;\n'+
                 '        }\n'+
                 '        SubType that = (SubType) obj;\n'+
-                '        return this.prop == that.prop && this.other == that.other;\n'+
+                '        return this.prop == that.prop && Objects.equals(this.other, that.other);\n'+
                 '    }\n'+
                 '\n'+
                 '    public String toString()\n'+