Fix reported issues

wso2 · Jan 17, 2025 · b1d3858 · b1d3858
1 parent deaf832
commit b1d3858
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/...lication.common/src/main/java/org/wso2/carbon/identity/application/common/model/User.java b/...lication.common/src/main/java/org/wso2/carbon/identity/application/common/model/User.java
@@ -88,10 +88,8 @@ public static User build(OMElement userOM) {
                 user.setUserStoreDomain(member.getText());
             } else if ("UserName".equalsIgnoreCase(member.getLocalName())) {
                 user.setUserName(member.getText());
-            } else if ("UserId".equalsIgnoreCase(member.getLocalName())) {
-                if (StringUtils.isNotBlank(member.getText())) {
-                    user.setUserId(member.getText());
-                }
+            } else if ("UserId".equalsIgnoreCase(member.getLocalName()) && StringUtils.isNotBlank(member.getText())) {
+                user.setUserId(member.getText());
             }
         }
         return user;
@@ -223,11 +221,7 @@ public boolean equals(Object o) {
             return false;
         }
 
-        if (!Objects.equals(userId, user.userId)) {
-            return false;
-        }
-
-        return true;
+        return Objects.equals(userId, user.userId);
     }
 
     /**

diff --git a/...rg/wso2/carbon/identity/application/authentication/framework/model/AuthenticatedUser.java b/...rg/wso2/carbon/identity/application/authentication/framework/model/AuthenticatedUser.java
@@ -303,6 +303,7 @@ public void setAuthenticatedSubjectIdentifier(String authenticatedSubjectIdentif
         this.authenticatedSubjectIdentifier = authenticatedSubjectIdentifier;
     }
 
+    @Override
     public String getUserId() throws UserIdNotFoundException {
 
         if (this.userId != null) {