[syncope] branch 3_0_X updated: [SYNCOPE-1751] Addressing CodeQL comments

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/3_0_X by this push:
     new c2e522ac5a [SYNCOPE-1751] Addressing CodeQL comments
c2e522ac5a is described below

commit c2e522ac5afcd8e22f2e158b5d433ba009dd0198
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Sat Apr 15 15:50:03 2023 +0200

    [SYNCOPE-1751] Addressing CodeQL comments
---
 .../syncope/core/provisioning/java/DefaultMappingManager.java      | 7 ++-----
 .../syncope/core/provisioning/java/DefaultMappingManagerTest.java  | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
index ee7c7ecadd..75fe33400d 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultMappingManager.java
@@ -507,9 +507,7 @@ public class DefaultMappingManager implements 
MappingManager {
         }
     }
 
-    protected String getPasswordAttrValue(
-            final ExternalResource resource, final Account account, final 
String defaultValue) {
-
+    protected String getPasswordAttrValue(final Account account, final String 
defaultValue) {
         String passwordAttrValue;
         if (account instanceof LinkedAccount) {
             if (account.getPassword() != null) {
@@ -595,8 +593,7 @@ public class DefaultMappingManager implements 
MappingManager {
             if (item.isConnObjectKey()) {
                 result = Pair.of(objValues.isEmpty() ? null : 
objValues.iterator().next().toString(), null);
             } else if (item.isPassword() && any instanceof User) {
-                String passwordAttrValue =
-                        getPasswordAttrValue(resource, 
passwordAccountGetter.apply((User) any), password);
+                String passwordAttrValue = 
getPasswordAttrValue(passwordAccountGetter.apply((User) any), password);
                 if (passwordAttrValue == null) {
                     result = null;
                 } else {
diff --git 
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
 
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
index 7c1ffc962b..0d0afb4d83 100644
--- 
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
+++ 
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/DefaultMappingManagerTest.java
@@ -127,7 +127,6 @@ public class DefaultMappingManagerTest extends AbstractTest 
{
         ldap = resourceDAO.save(ldap);
         entityManager().flush();
 
-        String encPassword = bellini.getPassword();
         attrs = mappingManager.prepareAttrsFromAny(
                 bellini,
                 null,
@@ -225,7 +224,6 @@ public class DefaultMappingManagerTest extends AbstractTest 
{
         ldap = resourceDAO.save(ldap);
         entityManager().flush();
 
-        String encPassword = vivaldi.getPassword();
         attrs = mappingManager.prepareAttrsFromLinkedAccount(
                 vivaldi,
                 account,