[sling-org-apache-sling-committer-cli] 36/36: Merge branch 'master' into feature/SLING-8337

[ro...@apache.org]

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

rombert pushed a commit to branch feature/SLING-8337
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git

commit eb94e9a87c60ded98c4b7489eb49e3728875cc83
Merge: ea8878d d38cfe1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Apr 23 14:47:50 2019 +0300

    Merge branch 'master' into feature/SLING-8337

 pom.xml                                            | 10 +++
 .../java/org/apache/sling/cli/impl/mail/Email.java | 88 +++++++++++++++++++---
 .../apache/sling/cli/impl/mail/EmailThread.java    | 31 --------
 .../sling/cli/impl/mail/VoteThreadFinder.java      | 17 ++++-
 .../sling/cli/impl/people/MembersFinder.java       | 17 ++++-
 .../sling/cli/impl/release/TallyVotesCommand.java  | 33 ++++----
 6 files changed, 135 insertions(+), 61 deletions(-)

diff --cc src/main/java/org/apache/sling/cli/impl/people/MembersFinder.java
index fc15455,c26ab9a..b483f93
--- a/src/main/java/org/apache/sling/cli/impl/people/MembersFinder.java
+++ b/src/main/java/org/apache/sling/cli/impl/people/MembersFinder.java
@@@ -112,8 -114,19 +114,19 @@@ public class MembersFinder 
          return null;
      }
  
+     public Member findByNameOrEmail(String name, String email) {
+         Collator collator = Collator.getInstance(Locale.US);
+         collator.setDecomposition(Collator.NO_DECOMPOSITION);
+         for (Member member : findMembers()) {
+             if (email.equals(member.getEmail()) || collator.compare(name, member.getName()) == 0) {
+                 return member;
+             }
+         }
+         return null;
+     }
+ 
      public Member getCurrentMember() {
-          return getMemberById(credentialsService.getAsfCredentials().getUsername());
 -        return findById(credentialsService.getCredentials().getUsername());
++        return findById(credentialsService.getAsfCredentials().getUsername());
      }
  
  }