OKTA-678098: Fix UserProfile equals() (#967)

okta · Jan 2, 2024 · 536699d · 536699d
1 parent bf1a6d6
commit 536699d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api/src/main/resources/custom_templates/pojo.mustache b/api/src/main/resources/custom_templates/pojo.mustache
@@ -293,8 +293,9 @@ public boolean equals(Object o) {
     }{{#hasVars}}
         {{classname}} {{classVarName}} = ({{classname}}) o;
         return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} &&
-        {{/-last}}{{/vars}}{{#parent}} &&
-        super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
+        {{/-last}}{{/vars}};
+        //{{#parent}} && super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
+        {{/hasVars}}{{^hasVars}}
         return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}}
 {{/useReflectionEqualsHashCode}}
 }{{#vendorExtensions.x-jackson-optional-nullable-helpers}}

diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/UsersIT.groovy
@@ -682,6 +682,7 @@ class UsersIT extends ITSupport {
         User updatedUser = userApi.getUser(user.getId())
 
         assertThat(updatedUser.lastUpdated, greaterThan(originalLastUpdated))
+        assertThat(updatedUser.getProfile(), not(user.getProfile()))
         assertThat(updatedUser.getProfile().getProperties().get("nickName"), equalTo("Batman"))
         //assertThat(userProfile.getAdditionalProperties().get("foo"), equalTo("bar"))
     }