[syncope] branch 2_0_X updated: White noise, minor formatting

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/2_0_X by this push:
     new 8755c55  White noise, minor formatting
8755c55 is described below

commit 8755c552dbba80d594e4ff477407aff31a6e59c0
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Mar 27 17:15:48 2019 +0100

    White noise, minor formatting
---
 .../core/provisioning/java/data/UserDataBinderImpl.java       |  8 +++-----
 .../syncope/core/provisioning/java/utils/MappingUtils.java    | 11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index e1a75da..593ff8c 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -350,11 +350,9 @@ public class UserDataBinderImpl extends 
AbstractAnyDataBinder implements UserDat
 
         if (userPatch.getMustChangePassword() != null) {
             
user.setMustChangePassword(userPatch.getMustChangePassword().getValue());
-            Set<ExternalResource> externalResources = 
anyUtils.getAllResources(toBeUpdated);
 
-            for (ExternalResource resource : externalResources) {
-                Provision provision = 
resource.getProvision(toBeUpdated.getType());
-                if (MappingUtils.hasMustChangePassword(provision)) {
+            for (ExternalResource resource : 
anyUtils.getAllResources(toBeUpdated)) {
+                if 
(MappingUtils.hasMustChangePassword(resource.getProvision(toBeUpdated.getType())))
 {
                     propByRes.add(ResourceOperation.UPDATE, resource.getKey());
                 }
             }
@@ -454,7 +452,7 @@ public class UserDataBinderImpl extends 
AbstractAnyDataBinder implements UserDat
                         if (attr.getSchema().isUniqueConstraint()) {
                             
plainAttrValueDAO.delete(attr.getUniqueValue().getKey(), 
anyUtils.plainAttrValueClass());
                         } else {
-                            Collection<String> valuesToBeRemoved = 
+                            Collection<String> valuesToBeRemoved =
                                     CollectionUtils.collect(attr.getValues(), 
EntityUtils.keyTransformer());
                             for (String attrValueKey : valuesToBeRemoved) {
                                 plainAttrValueDAO.delete(attrValueKey, 
anyUtils.plainAttrValueClass());
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/MappingUtils.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/MappingUtils.java
index 9f1028a..6f1dd33 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/MappingUtils.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/MappingUtils.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.collections4.Predicate;
@@ -250,11 +249,11 @@ public final class MappingUtils {
         return provision != null && provision.getMapping() != null
                 && IterableUtils.matchesAny(provision.getMapping().getItems(), 
new Predicate<MappingItem>() {
 
-            @Override
-            public boolean evaluate(final MappingItem mappingItem) {
-                return 
"mustChangePassword".equals(mappingItem.getIntAttrName());
-            }
-        });
+                    @Override
+                    public boolean evaluate(final MappingItem mappingItem) {
+                        return 
"mustChangePassword".equals(mappingItem.getIntAttrName());
+                    }
+                });
     }
 
     /**