[syncope] branch 2_1_X updated: Attempt to increase readability

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 2de3bc2  Attempt to increase readability
2de3bc2 is described below

commit 2de3bc29de75da530c799e98680fabf17e166047
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Thu Nov 22 15:32:13 2018 +0100

    Attempt to increase readability
---
 .../client/console/wizards/any/PlainAttrs.java     | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index b767910..a9e1f90 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -411,26 +411,23 @@ public class PlainAttrs extends 
AbstractAttrs<PlainSchemaTO> {
                     }
                     item.add(panel);
 
-                    Optional<AttrTO> previousPlainAttr = previousObject == null
+                    Optional<AttrTO> prevAttr = previousObject == null
                             ? Optional.empty()
                             : previousObject.getPlainAttr(attrTO.getSchema());
                     if (previousObject != null
-                            && ((!previousPlainAttr.isPresent() && 
isNotEmptyOrBlank(attrTO.getValues()))
-                            || (previousPlainAttr.isPresent() && 
!ListUtils.isEqualList(
-                            
ListUtils.select(previousPlainAttr.get().getValues(),
-                                    object -> StringUtils.isNotEmpty(object)),
-                            ListUtils.select(attrTO.getValues(), object -> 
StringUtils.isNotEmpty(object)))))) {
-
-                        List<String> oldValues = previousPlainAttr.isPresent()
-                                ? previousPlainAttr.get().getValues()
+                            && ((!prevAttr.isPresent() && 
attrTO.getValues().stream().anyMatch(StringUtils::isNotBlank))
+                            || (prevAttr.isPresent() && !ListUtils.isEqualList(
+                            prevAttr.get().getValues().stream().
+                                    
filter(StringUtils::isNotBlank).collect(Collectors.toList()),
+                            attrTO.getValues().stream().
+                                    
filter(StringUtils::isNotBlank).collect(Collectors.toList()))))) {
+
+                        List<String> oldValues = prevAttr.isPresent()
+                                ? prevAttr.get().getValues()
                                 : Collections.<String>emptyList();
                         panel.showExternAction(new LabelInfo("externalAction", 
oldValues));
                     }
                 }
-
-                protected boolean isNotEmptyOrBlank(final List<String> values) 
{
-                    return values.stream().anyMatch(value -> 
StringUtils.isNotBlank(value));
-                }
             });
         }
     }